cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

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:
Jeong Arm 2018-10-22 05:52:27 +09:00 committed by Eugen Rochko
parent 84cf78da8a
commit 2e18ad74dc
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mastodon/accounts_cli.rb
View File

@ -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)