diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-30 18:34:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 18:34:51 +0200 |
| commit | f715e8b51612820a18fa307e4465eb0c1a088f86 (patch) | |
| tree | 8137b48a716e05424ca544210d86e91818085ba7 /app/controllers/activitypub/outboxes_controller.rb | |
| parent | 30632adf9eda6d83a9b4269f23f11ced5e09cd93 (diff) | |
| parent | a68ec50e4e38898e88a7dcc33bd0032adc946dda (diff) | |
Merge pull request #1411 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/activitypub/outboxes_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index e25a4bc07..c33c15255 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -50,8 +50,12 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController return unless page_requested? @statuses = @account.statuses.permitted_for(@account, signed_request_account) - @statuses = @statuses.paginate_by_id(LIMIT, params_slice(:max_id, :min_id, :since_id)) - @statuses = cache_collection(@statuses, Status) + @statuses = cache_collection_paginated_by_id( + @statuses, + Status, + LIMIT, + params_slice(:max_id, :min_id, :since_id) + ) end def page_requested? |