zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix serialization of boosts (#10129) 

The condition introduced by #9998 was wrong, serializing boosts
that weren't self-boosts, and not serializing self-boosts.
This commit is contained in:
ThibG 2019-02-28 21:35:16 +01:00 committed by Eugen Rochko
parent d8498b3983
commit ee7d79c0ce
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@
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, unless: :owned_announce? has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, if: :serialize_object?
attribute :proper_uri, key: :object, if: :owned_announce? attribute :proper_uri, key: :object, unless: :serialize_object?
attribute :atom_uri, if: :announce? attribute :atom_uri, if: :announce?
def id def id
@ -43,7 +43,9 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
object.reblog? object.reblog?
end end
def owned_announce? def serialize_object?
announce? && object.account == object.proper.account && object.proper.private_visibility? return true unless announce?
# Serialize private self-boosts of local toots
object.account == object.proper.account && object.proper.private_visibility? && object.local?
end end
end end