From: Jeong Arm <kjwonmail@gmail.com>
Date: Mon, 1 Apr 2019 17:17:21 +0000 (+0900)
Subject: Simplify culling and fix race condition (#10440)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=67eb47e25f1e7704dd9ecd32695ff3b53c807375;p=mastodon.git

Simplify culling and fix race condition (#10440)
---

diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index dca31cdca..f02b2149b 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -236,11 +236,7 @@ module Mastodon
         end
 
         if [404, 410].include?(code)
-          unless options[:dry_run]
-            SuspendAccountService.new.call(account)
-            account.destroy
-          end
-
+          SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
           culled += 1
           say('+', :green, false)
         else