diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-30 03:17:12 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-30 03:17:12 +0000 |
commit | ad46bc9772dfc52c7ed522658eda1a3ef608a7b3 (patch) | |
tree | 12be46cac80eadcddc3ab122f1bda36d9c67a07c /app/lib/activitypub/activity/delete.rb | |
parent | d020ed1e05278a4b3e5d1ed60ee03e511bb513e3 (diff) | |
parent | 4c6b5dbe96b565d3db3cbf0912f3b9911bc3922a (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib/activitypub/activity/delete.rb')
-rw-r--r-- | app/lib/activitypub/activity/delete.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 4c6afb090..d0fb49342 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -30,8 +30,11 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def forward_for_reblogs(status) return if @json['signature'].blank? - ActivityPub::RawDistributionWorker.push_bulk(status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)) do |account_id| - [payload, account_id] + 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| + [payload, rebloggers_ids.first, inbox_url] end end |