diff options
author | ThibG <thib@sitedethib.com> | 2019-02-28 22:02:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-28 22:02:36 +0100 |
commit | b969b150e8f095dc91c19c7381923c2c19edb968 (patch) | |
tree | 015d70b4b633fadf70cab9d0a0b0fbd55e6456ae /app/serializers/activitypub/activity_serializer.rb | |
parent | 76ed481aa7b67d624675cdaa85bac583853fd24d (diff) | |
parent | 2267eee356a3d2b8ebb20892c5182b6f8169403e (diff) |
Merge pull request #932 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/activitypub/activity_serializer.rb')
-rw-r--r-- | app/serializers/activitypub/activity_serializer.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb index b51e8c544..c001e28aa 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 |