From 6e4046fc3f3973ba0b6994930a8b58726e507003 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 8 Oct 2017 14:41:59 +0200 Subject: [PATCH] Fix #5178 - Use object URI only in Announce, instead of embedding (#5266) --- app/serializers/activitypub/activity_serializer.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb index b252e008..df399211 100644 --- a/app/serializers/activitypub/activity_serializer.rb +++ b/app/serializers/activitypub/activity_serializer.rb @@ -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