Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 15:13:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2019-02-12 20:32:48 +01:00
parent a3ba28eb17 2f80a348c9
commit 0e34e91661
101 changed files with 2587 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/suspend_account_service.rb
View File

@@ -102,6 +102,10 @@ class SuspendAccountService < BaseService
ActivityPub::DeliveryWorker.push_bulk(delivery_inboxes) do |inbox_url|
[delete_actor_json, @account.id, inbox_url]
end
ActivityPub::LowPriorityDeliveryWorker.push_bulk(low_priority_delivery_inboxes) do |inbox_url|
[delete_actor_json, @account.id, inbox_url]
end
end
def delete_actor_json
@@ -117,7 +121,11 @@ class SuspendAccountService < BaseService
end
def delivery_inboxes
Account.inboxes + Relay.enabled.pluck(:inbox_url)
@delivery_inboxes ||= @account.followers.inboxes + Relay.enabled.pluck(:inbox_url)
end
def low_priority_delivery_inboxes
Account.inboxes - delivery_inboxes
end
def associations_for_destruction