Skip to content

Commit

Permalink
Fix serialization of boosts (mastodon#10129)
Browse files Browse the repository at this point in the history
The condition introduced by mastodon#9998 was wrong, serializing boosts
that weren't self-boosts, and not serializing self-boosts.
  • Loading branch information
ClearlyClaire authored and Gargron committed Feb 28, 2019
1 parent 16e24b9 commit 0be3ac2
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions app/serializers/activitypub/activity_serializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -43,7 +43,9 @@ def announce?
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

0 comments on commit 0be3ac2

Please sign in to comment.