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

Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)

Browse Source
This commit is contained in:
Eugen Rochko
2017-10-08 14:41:59 +02:00
committed by GitHub
parent f0c939c431
commit 6e4046fc3f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/serializers/activitypub/activity_serializer.rb
View File

@@ -3,10 +3,11 @@
class ActivityPub::ActivitySerializer < ActiveModel::Serializer
attributes :id, :type, :actor, :published, :to, :cc
has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer
has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :announce?
attribute :proper_uri, key: :object, if: :announce?
def id
[ActivityPub::TagManager.instance.activity_uri_for(object)].join
ActivityPub::TagManager.instance.activity_uri_for(object)
end
def type
@@ -29,6 +30,10 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
ActivityPub::TagManager.instance.cc(object)
end
def proper_uri
ActivityPub::TagManager.instance.uri_for(object.proper)
end
def announce?
object.reblog?
end