]> cat aescling's git repositories - mastodon.git/commitdiff
Change domain block behavior to update user records before deleting data (#12247)
authorThibG <thib@sitedethib.com>
Thu, 21 Nov 2019 10:36:16 +0000 (11:36 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 21 Nov 2019 10:36:15 +0000 (11:36 +0100)
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.

app/services/block_domain_service.rb

index ae461abf248e89e5502ba5e5fc21d057f9223442..9f0860674760baaebf06a0b11dc33cd6de6ff22a 100644 (file)
@@ -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!