Simplify culling and fix race condition (#10440)

2019-04-02 02:17:21 +09:00 · 2019-04-02 02:17:21 +09:00 · 67eb47e25f
parent 2acd8940de
commit 67eb47e25f
1 changed files with 1 additions and 5 deletions
--- 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