about summary refs log tree commit diff
diff options
context:
space:
mode:
authortakayamaki <fsgiko@gmail.com>2018-02-22 00:30:46 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-02-21 16:30:46 +0100
commitf69d7cb43b3445d67a3549d87dd71dacf2b5be1e (patch)
treeb1ff413f95315d35319a9de43c4d225b1c32eb29
parenta7171af0a34f612d05667f1a5c35a4ca834da082 (diff)
fix purge_removed_accounts task should suspend account before delete it (#6521)
-rw-r--r--lib/tasks/mastodon.rake2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index e144621e5..d2e4f38a9 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -752,6 +752,7 @@ namespace :mastodon do
 
         if [404, 410].include?(res.code)
           if options[:force]
+            SuspendAccountService.new.call(account)
             account.destroy
           else
             progress_bar.pause
@@ -764,6 +765,7 @@ namespace :mastodon do
             if confirm.casecmp('n').zero?
               next
             else
+              SuspendAccountService.new.call(account)
               account.destroy
             end
           end