diff options
author | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
commit | f95637178671b1aa0648fa506231717229a6cd8f (patch) | |
tree | fbaa725bcdb88220c5d1e299b338b196822460e5 /app/controllers/activitypub/outboxes_controller.rb | |
parent | 2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff) | |
parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) |
Merge branch 'glitch'
Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'app/controllers/activitypub/outboxes_controller.rb')
-rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index 111285036..4a52560ac 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -29,7 +29,7 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController ) else ActivityPub::CollectionPresenter.new( - id: account_outbox_url(@account), + id: outbox_url, type: :ordered, size: @account.statuses_count, first: outbox_url(page: true), @@ -47,11 +47,11 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController end def next_page - account_outbox_url(@account, page: true, max_id: @statuses.last.id) if @statuses.size == LIMIT + outbox_url(page: true, max_id: @statuses.last.id) if @statuses.size == LIMIT end def prev_page - account_outbox_url(@account, page: true, min_id: @statuses.first.id) unless @statuses.empty? + outbox_url(page: true, min_id: @statuses.first.id) unless @statuses.empty? end def set_statuses |