treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

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

lolsob-rspec
Eugen Rochko 2017-10-08 14:41:59 +02:00 committed by GitHub
parent d9e51960a2
commit 3d8b3bf9a0
1 changed files with 7 additions and 2 deletions
Show Stats 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 class ActivityPub::ActivitySerializer < ActiveModel::Serializer
attributes :id, :type, :actor, :published, :to, :cc 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 def id
[ActivityPub::TagManager.instance.activity_uri_for(object)].join ActivityPub::TagManager.instance.activity_uri_for(object)
end end
def type def type
@ -29,6 +30,10 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
ActivityPub::TagManager.instance.cc(object) ActivityPub::TagManager.instance.cc(object)
end end
def proper_uri
ActivityPub::TagManager.instance.uri_for(object.proper)
end
def announce? def announce?
object.reblog? object.reblog?
end end