|
|
@ -45,7 +45,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
|
|
|
rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(: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]
|
|
|
|
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]
|
|
|
|
[payload, rebloggers_ids.first, inbox_url]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -61,7 +61,12 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
|
|
|
|
|
|
|
|
|
|
|
def forward_for_reply
|
|
|
|
def forward_for_reply
|
|
|
|
return unless @json['signature'].present? && reply_to_local?
|
|
|
|
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
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def delete_now!
|
|
|
|
def delete_now!
|
|
|
|