From 67eb47e25f1e7704dd9ecd32695ff3b53c807375 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Tue, 2 Apr 2019 02:17:21 +0900 Subject: [PATCH] Simplify culling and fix race condition (#10440) --- lib/mastodon/accounts_cli.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index dca31cdca3e..f02b2149b7f 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