From: Jeong Arm <kjwonmail@gmail.com>
Date: Sun, 21 Oct 2018 20:52:27 +0000 (+0900)
Subject: Fix tootctl cull on dead servers (#9041)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2e18ad74dcffb2e1aeec9f265becd3308c110a67;p=mastodon.git

Fix tootctl cull on dead servers (#9041)

* Delete first 9 accounts on dead servers

* Clean up code by moving dead server culling to the end
---

diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
index 704cf474b..829fab19e 100644
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -239,7 +239,7 @@ module Mastodon
           end
         end
 
-        if [404, 410].include?(code) || dead_servers.include?(account.domain)
+        if [404, 410].include?(code)
           unless options[:dry_run]
             SuspendAccountService.new.call(account)
             account.destroy
@@ -252,6 +252,18 @@ module Mastodon
         end
       end
 
+      # Remove dead servers
+      unless dead_servers.empty? || options[:dry_run]
+        dead_servers.each do |domain|
+          Account.where(domain: domain).find_each do |account|
+            SuspendAccountService.new.call(account)
+            account.destroy
+            culled += 1
+            say('.', :green, false)
+          end
+        end
+      end
+
       say
       say("Removed #{culled} accounts (#{dead_servers.size} dead servers)#{dry_run}", :green)