From: ThibG <thib@sitedethib.com>
Date: Thu, 21 Nov 2019 10:36:16 +0000 (+0100)
Subject: Change domain block behavior to update user records before deleting data (#12247)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c4d45765e373464381ef5817a960b247f148e896;p=mastodon.git

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.
---

diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index ae461abf2..9f0860674 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -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!