From f190e3c8c4840e6f92b90d913096e80eafc893eb Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Sat, 19 Sep 2020 16:56:21 -0500 Subject: [Federation] Add support for distributing ActivityPub events to all unsuspended inboxes --- app/workers/activitypub/raw_distribution_worker.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/workers/activitypub/raw_distribution_worker.rb') diff --git a/app/workers/activitypub/raw_distribution_worker.rb b/app/workers/activitypub/raw_distribution_worker.rb index 41e61132f..3c65e4cd0 100644 --- a/app/workers/activitypub/raw_distribution_worker.rb +++ b/app/workers/activitypub/raw_distribution_worker.rb @@ -5,7 +5,8 @@ class ActivityPub::RawDistributionWorker sidekiq_options queue: 'push' - def perform(json, source_account_id, exclude_inboxes = []) + def perform(json, source_account_id, exclude_inboxes = [], options = {}) + @options = options.with_indifferent_access @account = Account.find(source_account_id) ActivityPub::DeliveryWorker.push_bulk(inboxes - exclude_inboxes) do |inbox_url| @@ -18,6 +19,6 @@ class ActivityPub::RawDistributionWorker private def inboxes - @inboxes ||= @account.followers.inboxes + @inboxes ||= (@options[:all_servers] || @account.id == -99 ? Account.remote.without_suspended.inboxes : @account.followers.inboxes) end end -- cgit