diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
| commit | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (patch) | |
| tree | 4bb60f4493fb70cada728a373f74c18b87e8f95d /app/serializers | |
| parent | f72ad67a3967230afd63a9e2d84a2a69331c4787 (diff) | |
| parent | 894da3dcca781e27ce9c5130f1021526ac8a6887 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/activitypub/activity_serializer.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb index df399211c..50c4f6a04 100644 --- a/app/serializers/activitypub/activity_serializer.rb +++ b/app/serializers/activitypub/activity_serializer.rb @@ -5,6 +5,7 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :announce? attribute :proper_uri, key: :object, if: :announce? + attribute :atom_uri, if: :announce? def id ActivityPub::TagManager.instance.activity_uri_for(object) @@ -34,6 +35,10 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer ActivityPub::TagManager.instance.uri_for(object.proper) end + def atom_uri + OStatus::TagManager.instance.uri_for(object) + end + def announce? object.reblog? end |