From cd1e1f28b8174c03104dfae03784526d15593607 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 9 Jun 2019 12:47:33 +0200 Subject: Change priority of delete activity forwards for replies and reblogs (#11002) Fix #11001 --- app/lib/activitypub/activity/delete.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app/lib/activitypub/activity') diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index bf530ac49..b39c163f5 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -44,7 +44,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id) inboxes = Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes - [@account.preferred_inbox_url] - ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| + ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url| [payload, rebloggers_ids.first, inbox_url] end end @@ -60,7 +60,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def forward_for_reply return unless @json['signature'].present? && reply_to_local? - ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url]) + + inboxes = replied_to_status.account.followers.inboxes - [@account.preferred_inbox_url] + + ActivityPub::LowPriorityDeliveryWorker.push_bulk(inboxes) do |inbox_url| + [payload, replied_to_status.account_id, inbox_url] + end end def delete_now! -- cgit