diff options
author | ThibG <thib@sitedethib.com> | 2020-09-29 10:29:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-29 10:29:42 +0200 |
commit | 62e3f588dee75fc6a37457f8218630daad056cba (patch) | |
tree | 69439eebc4da7137206ee82e6ec3fa21cf8c7ed0 /app/controllers/activitypub | |
parent | 787d5d728923393f12421a480b3c7aee789a11fe (diff) | |
parent | ccfc2b6dce4bfda283bb6bc968a23fe4a76951d7 (diff) |
Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/activitypub')
-rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index e066860bf..5fd735ad6 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -57,9 +57,8 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController def set_statuses return unless page_requested? - @statuses = @account.statuses.permitted_for(@account, signed_request_account) @statuses = cache_collection_paginated_by_id( - @statuses, + @account.statuses.permitted_for(@account, signed_request_account), Status, LIMIT, params_slice(:max_id, :min_id, :since_id) |