diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-11-30 03:50:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 03:50:05 +0100 |
| commit | 85e97ecab6db67faefb64557af9b2271d2b23735 (patch) | |
| tree | 1cb8904147f87bcb567e77763e1c1541b1378d61 /app/workers/activitypub | |
| parent | dc1ebd45a30d806fcef2dc33679457285ba430b4 (diff) | |
Fix too many forwards (#5854)
* Avoid sending explicit Undo->Announce when original deleted * Do not forward a reply back to the server that sent it * Deduplicate inboxes of rebloggers' followers for delete forwarding * Adjust test * Fix wrong class, bad SQL, wrong variable, outdated comment
Diffstat (limited to 'app/workers/activitypub')
| -rw-r--r-- | app/workers/activitypub/raw_distribution_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/activitypub/raw_distribution_worker.rb b/app/workers/activitypub/raw_distribution_worker.rb index d73466f6e..41e61132f 100644 --- a/app/workers/activitypub/raw_distribution_worker.rb +++ b/app/workers/activitypub/raw_distribution_worker.rb @@ -5,10 +5,10 @@ class ActivityPub::RawDistributionWorker sidekiq_options queue: 'push' - def perform(json, source_account_id) + def perform(json, source_account_id, exclude_inboxes = []) @account = Account.find(source_account_id) - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| + ActivityPub::DeliveryWorker.push_bulk(inboxes - exclude_inboxes) do |inbox_url| [json, @account.id, inbox_url] end rescue ActiveRecord::RecordNotFound |