Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)
* Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors.
This commit is contained in:
parent
8b5179d006
commit
122d59ac41
14 changed files with 182 additions and 110 deletions
|
@ -1,5 +1,3 @@
|
|||
extends 'activitypub/intransient.activitystreams2.rabl'
|
||||
|
||||
node(:type) { 'Collection' }
|
||||
node(:items) { [] }
|
||||
node(:totalItems) { 0 }
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
extends 'activitypub/types/ordered_collection.activitystreams2.rabl'
|
||||
|
||||
node(:type) { 'OrderedCollectionPage' }
|
||||
node(:current) { request.original_url }
|
||||
|
|
|
@ -1,23 +1,12 @@
|
|||
if @paginated
|
||||
extends 'activitypub/types/ordered_collection_page.activitystreams2.rabl'
|
||||
else
|
||||
extends 'activitypub/types/ordered_collection.activitystreams2.rabl'
|
||||
end
|
||||
extends 'activitypub/types/ordered_collection.activitystreams2.rabl'
|
||||
|
||||
object @account
|
||||
|
||||
node(:items) do
|
||||
@statuses.map { |status| api_activitypub_status_url(status) }
|
||||
end
|
||||
|
||||
node(:totalItems) { @statuses.count }
|
||||
node(:next) { @next_path } if @next_path
|
||||
node(:prev) { @prev_path } if @prev_path
|
||||
node(:current) { @first_page_url } if @first_page_url
|
||||
node(:first) { @first_page_url } if @first_page_url
|
||||
node(:last) { @last_page_url } if @last_page_url
|
||||
|
||||
node(:name) { |account| t('activitypub.outbox.name', account_name: account_name(account)) }
|
||||
node(:summary) { |account| t('activitypub.outbox.summary', account_name: account_name(account)) }
|
||||
node(:updated) do |account|
|
||||
times = @statuses.map { |status| status.updated_at.to_time }
|
||||
times << account.created_at.to_time
|
||||
times.max.xmlschema
|
||||
end
|
||||
node(:updated) { |account| (@statuses.empty? ? account.created_at.to_time : @statuses.first.updated_at.to_time).xmlschema }
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
extends 'activitypub/types/ordered_collection_page.activitystreams2.rabl'
|
||||
|
||||
object @account
|
||||
|
||||
node(:items) do
|
||||
@statuses.map { |status| api_activitypub_status_url(status) }
|
||||
end
|
||||
|
||||
node(:next) { @next_page_url } if @next_page_url
|
||||
node(:prev) { @prev_page_url } if @prev_page_url
|
||||
node(:current) { @first_page_url } if @first_page_url
|
||||
node(:first) { @first_page_url } if @first_page_url
|
||||
node(:last) { @last_page_url } if @last_page_url
|
||||
node(:partOf) { @part_of_url } if @part_of_url
|
||||
|
||||
node(:updated) { |account| (@statuses.empty? ? account.created_at.to_time : @statuses.first.updated_at.to_time).xmlschema }
|
Loading…
Add table
Add a link
Reference in a new issue