about summary refs log tree commit diff
path: root/app/services/block_domain_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-11 16:32:44 +0200
committermultiple creatures <dev@multiple-creature.party>2020-02-27 13:55:39 -0600
commit3681f7dcce8f82d2a4377a051952159cd03919c0 (patch)
tree1e11fbf90b822450b0e736408cb17442babc54a6 /app/services/block_domain_service.rb
parent422b59808b4818171e057e1a459de153816bf505 (diff)
port tootsuite#11805 to monserfork: Change deletes to preserve soft-deleted statuses in unresolved reports
Change all account actions except "none" to resolve all unresolved reports

Refactor `SuspendAccountService` to be more readable
Diffstat (limited to 'app/services/block_domain_service.rb')
-rw-r--r--app/services/block_domain_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index 8ec77ce82..dde538f02 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -91,8 +91,8 @@ class BlockDomainService < BaseService
   end
 
   def suspend_accounts!
-    blocked_domain_accounts.without_suspended.find_each do |account|
-      SuspendAccountService.new.call(account, suspended_at: @domain_block.created_at)
+    blocked_domain_accounts.without_suspended.reorder(nil).find_each do |account|
+      SuspendAccountService.new.call(account, reserve_username: true, suspended_at: @domain_block.created_at)
     end
   end