diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-13 18:36:23 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-13 18:36:23 +0100 |
| commit | 6a5307a5733e7872e7827f32b27111434e0307c4 (patch) | |
| tree | 2980ccee1259a7a36b40ce86c3711eed676a0614 /app/serializers/activitypub | |
| parent | 169b9d4428d8e54d7bee365fd76be9a6e2a92da5 (diff) | |
Alternative handling of private self-boosts (#9998)
* When self-boosting, embed original toot into Announce serialization * Process unknown self-boosts from Announce object if it is more than an URI * Add some self-boost specs * Only serialize private toots in self-Announces
Diffstat (limited to 'app/serializers/activitypub')
| -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 |