diff options
author | Reverite <github@reverite.sh> | 2019-02-24 22:18:10 -0800 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-02-24 22:18:10 -0800 |
commit | 54e480ca0939ba737f5abdf4ee861cd63c025865 (patch) | |
tree | 760cdd75fd0922266b60e784c06db99902ef5692 /app/serializers/activitypub/activity_serializer.rb | |
parent | ff9a09a9a7f73b558c53f334573b94198eb8d08a (diff) | |
parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/serializers/activitypub/activity_serializer.rb')
-rw-r--r-- | app/serializers/activitypub/activity_serializer.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb index 50c4f6a04..b51e8c544 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: :announce? - attribute :proper_uri, key: :object, if: :announce? + has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :owned_announce? + attribute :proper_uri, key: :object, if: :owned_announce? attribute :atom_uri, if: :announce? def id @@ -42,4 +42,8 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer def announce? object.reblog? end + + def owned_announce? + announce? && object.account == object.proper.account && object.proper.private_visibility? + end end |