diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-11-18 21:03:32 -0600 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-11-18 21:03:32 -0600 |
commit | cfe8a3218addfd7e0cc82c6f0054572f3d8aa296 (patch) | |
tree | abe88187c10217321827913d2e21f6592659ea33 /app/serializers | |
parent | b767423188034031bc6c89f5a39f78687506a5ce (diff) |
Break up AP envelope addressing by domain
Diffstat (limited to 'app/serializers')
4 files changed, 6 insertions, 6 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index 0d3fe715d..29fec7e03 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -126,11 +126,11 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer end def to - ActivityPub::TagManager.instance.to(object, target_domain: instance_options[:target_domain]) + ActivityPub::TagManager.instance.to(object, instance_options[:domain]) end def cc - ActivityPub::TagManager.instance.cc(object, target_domain: instance_options[:target_domain]) + ActivityPub::TagManager.instance.cc(object, instance_options[:domain]) end def sensitive diff --git a/app/serializers/activitypub/outbox_serializer.rb b/app/serializers/activitypub/outbox_serializer.rb index 2692a1c42..d1708cc36 100644 --- a/app/serializers/activitypub/outbox_serializer.rb +++ b/app/serializers/activitypub/outbox_serializer.rb @@ -10,6 +10,6 @@ class ActivityPub::OutboxSerializer < ActivityPub::CollectionSerializer end def items - object.items.map { |status| ActivityPub::ActivityPresenter.from_status(status, embed: false) } + object.items.map { |status| ActivityPub::ActivityPresenter.from_status(status, instance_options[:domain], embed: false) } end end diff --git a/app/serializers/activitypub/undo_announce_serializer.rb b/app/serializers/activitypub/undo_announce_serializer.rb index a464517ca..d48fcff73 100644 --- a/app/serializers/activitypub/undo_announce_serializer.rb +++ b/app/serializers/activitypub/undo_announce_serializer.rb @@ -22,6 +22,6 @@ class ActivityPub::UndoAnnounceSerializer < ActivityPub::Serializer end def virtual_object - ActivityPub::ActivityPresenter.from_status(object, embed: false) + ActivityPub::ActivityPresenter.from_status(object, instance_options[:domain], embed: false) end end diff --git a/app/serializers/activitypub/update_poll_serializer.rb b/app/serializers/activitypub/update_poll_serializer.rb index 1d47b9764..a3ac028ec 100644 --- a/app/serializers/activitypub/update_poll_serializer.rb +++ b/app/serializers/activitypub/update_poll_serializer.rb @@ -18,10 +18,10 @@ class ActivityPub::UpdatePollSerializer < ActivityPub::Serializer end def to - ActivityPub::TagManager.instance.to(object) + ActivityPub::TagManager.instance.to(object, instance_options[:domain]) end def cc - ActivityPub::TagManager.instance.cc(object) + ActivityPub::TagManager.instance.cc(object, instance_options[:domain]) end end |