Skip to content
Snippets Groups Projects
Commit 2e18ad74 authored by Jeong Arm's avatar Jeong Arm Committed by Eugen Rochko
Browse files

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
parent 84cf78da
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment