tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-05-04 18:17:32 +00:00
parent b316d373ea 2c1f7b2ece
commit cb62935c0b
4 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/activitypub/collection_serializer.rb
View File

@ -7,12 +7,14 @@ class ActivityPub::CollectionSerializer < ActiveModel::Serializer
super
end
attributes :id, :type, :total_items
attributes :id, :type
attribute :total_items, if: -> { object.size.present? }
attribute :next, if: -> { object.next.present? }
attribute :prev, if: -> { object.prev.present? }
attribute :part_of, if: -> { object.part_of.present? }
has_one :first, if: -> { object.first.present? }
has_one :last, if: -> { object.last.present? }
has_many :items, key: :items, if: -> { (!object.items.nil? || page?) && !ordered? }
has_many :items, key: :ordered_items, if: -> { (!object.items.nil? || page?) && ordered? }