mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-26 10:36:34 +00:00
Change domain block behavior to update user records before deleting data (#12247)
When suspending or silencing a domain, one probably wants the silence or suspend parts to take effect as soon as possible. Deleting media files can take a while (possibly days), so perform silencing as soon as possible, and clean up media afterwards.
This commit is contained in:
parent
5bc4edd078
commit
c4d45765e3
|
@ -20,13 +20,13 @@ class BlockDomainService < BaseService
|
|||
end
|
||||
|
||||
def process_domain_block!
|
||||
clear_media! if domain_block.reject_media?
|
||||
|
||||
if domain_block.silence?
|
||||
silence_accounts!
|
||||
elsif domain_block.suspend?
|
||||
suspend_accounts!
|
||||
end
|
||||
|
||||
clear_media! if domain_block.reject_media?
|
||||
end
|
||||
|
||||
def invalidate_association_caches!
|
||||
|
|
Loading…
Reference in a new issue