nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
ThibG 2019-11-21 11:36:16 +01:00 committed by Eugen Rochko
parent 5bc4edd078
commit c4d45765e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/block_domain_service.rb
View File

@ -20,13 +20,13 @@ class BlockDomainService < BaseService
end end
def process_domain_block! def process_domain_block!
clear_media! if domain_block.reject_media?
if domain_block.silence? if domain_block.silence?
silence_accounts! silence_accounts!
elsif domain_block.suspend? elsif domain_block.suspend?
suspend_accounts! suspend_accounts!
end end
clear_media! if domain_block.reject_media?
end end
def invalidate_association_caches! def invalidate_association_caches!