diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-09 12:47:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-09 12:47:33 +0200 |
commit | 8746f4d17b2cfa364cbddd21c61ac06a645c4bc6 (patch) | |
tree | 4ffee0c7cf260e2a6deafa659bd0c15798c315cb /app/lib/activitypub | |
parent | 9add88a920200bc0610b25434ad056469f28eae5 (diff) |
Change priority of delete activity forwards for replies and reblogs (#11002)
Fix #11001
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r-- | app/lib/activitypub/activity/delete.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 4236af071..0eb14b89c 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -45,7 +45,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 @@ -61,7 +61,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! |