diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-16 10:28:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-16 10:28:55 +0200 |
| commit | a6328fc1b17984af71efb9a1214437c8cdc5dfea (patch) | |
| tree | 17fe12bf7a3c64c8e35bc86f72683b66cf364026 /app/serializers | |
| parent | 35b868eeca3f9000d9de0ec232ad93f430563448 (diff) | |
Minor ActivityPub JSON fixes (#4214)
- Objects must have attributedTo instead of actor - The current attribute belongs to CollectionPage, not Collection
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/activitypub/collection_serializer.rb | 3 | ||||
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/serializers/activitypub/collection_serializer.rb b/app/serializers/activitypub/collection_serializer.rb index baaba7654..d01dead28 100644 --- a/app/serializers/activitypub/collection_serializer.rb +++ b/app/serializers/activitypub/collection_serializer.rb @@ -6,8 +6,7 @@ class ActivityPub::CollectionSerializer < ActiveModel::Serializer super end - attributes :id, :type, :total_items, - :current + attributes :id, :type, :total_items has_many :items, key: :ordered_items diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index ffdc6175d..4c13f8e59 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -3,7 +3,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer attributes :id, :type, :summary, :content, :in_reply_to, :published, :url, - :actor, :to, :cc, :sensitive + :attributed_to, :to, :cc, :sensitive has_many :media_attachments, key: :attachment has_many :virtual_tags, key: :tag @@ -36,7 +36,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer ActivityPub::TagManager.instance.url_for(object) end - def actor + def attributed_to ActivityPub::TagManager.instance.uri_for(object.account) end |