Browse Source

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.
closed-social-v3
ThibG 5 years ago
committed by Eugen Rochko
parent
commit
c4d45765e3
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/services/block_domain_service.rb

+ 2
- 2
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!

Loading…
Cancel
Save