From ee7d79c0ce411ff7754e3ac31dbf27cb9e298f73 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 28 Feb 2019 21:35:16 +0100
Subject: [PATCH] Fix serialization of boosts (#10129)
The condition introduced by #9998 was wrong, serializing boosts
that weren't self-boosts, and not serializing self-boosts.
---
app/serializers/activitypub/activity_serializer.rb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb
index b51e8c5442..c001e28aae 100644
--- a/app/serializers/activitypub/activity_serializer.rb
+++ b/app/serializers/activitypub/activity_serializer.rb
@@ -3,8 +3,8 @@
class ActivityPub::ActivitySerializer < ActiveModel::Serializer
attributes :id, :type, :actor, :published, :to, :cc
- has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :owned_announce?
- attribute :proper_uri, key: :object, if: :owned_announce?
+ has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, if: :serialize_object?
+ attribute :proper_uri, key: :object, unless: :serialize_object?
attribute :atom_uri, if: :announce?
def id
@@ -43,7 +43,9 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
object.reblog?
end
- def owned_announce?
- announce? && object.account == object.proper.account && object.proper.private_visibility?
+ def serialize_object?
+ return true unless announce?
+ # Serialize private self-boosts of local toots
+ object.account == object.proper.account && object.proper.private_visibility? && object.local?
end
end
--
GitLab