diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-16 13:43:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 13:43:23 +0100 |
| commit | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (patch) | |
| tree | 7593823272a7b35bbb2ea41206349e107d31cd26 /app/serializers | |
| parent | 2769b5446681898e8332cb505f499dac2a6e5717 (diff) | |
| parent | 59fa38a4f6b9f19d674b3f9da97253b586814f94 (diff) | |
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -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 |