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
This commit is contained in:
		| @ -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) | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user