From: takayamaki <fsgiko@gmail.com>
Date: Wed, 21 Feb 2018 15:30:46 +0000 (+0900)
Subject: fix purge_removed_accounts task should suspend account before delete it (#6521)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f69d7cb43b3445d67a3549d87dd71dacf2b5be1e;p=mastodon.git

fix purge_removed_accounts task should suspend account before delete it (#6521)
---

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