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/workers/activitypub/distribution_worker.rb | |
parent | b767423188034031bc6c89f5a39f78687506a5ce (diff) |
Break up AP envelope addressing by domain
Diffstat (limited to 'app/workers/activitypub/distribution_worker.rb')
-rw-r--r-- | app/workers/activitypub/distribution_worker.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb index 1602c3e24..948393c12 100644 --- a/app/workers/activitypub/distribution_worker.rb +++ b/app/workers/activitypub/distribution_worker.rb @@ -15,7 +15,7 @@ class ActivityPub::DistributionWorker return if skip_distribution? ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| - [payload(Addressable::URI.parse(inbox_url).host), @account.id, inbox_url, { synchronize_followers: !@status.distributable? }] + [payload(inbox_url), @account.id, inbox_url, { synchronize_followers: !@status.distributable? }] end relay! if relayable? @@ -46,13 +46,14 @@ class ActivityPub::DistributionWorker end end - def payload(domain) - @payload[domain] ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status, update: true, embed: false), ActivityPub::ActivitySerializer, signer: @account, target_domain: domain)) + def payload(inbox_url) + domain = Addressable::URI.parse(inbox_url).normalized_host + @payload[domain] ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status, domain, update: true, embed: false), ActivityPub::ActivitySerializer, signer: @account, domain: domain)) end def relay! ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url| - [payload(Addressable::URI.parse(inbox_url).host), @account.id, inbox_url] + [payload(inbox_url), @account.id, inbox_url] end end end |