Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tootctl accounts cull #10460

Merged
merged 3 commits into from
Apr 4, 2019
Merged

Fix tootctl accounts cull #10460

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
046ab3e
List the actual accounts that would have been culled during a dry run.
BenLubar Apr 3, 2019
e2d246f
Prevent unreachable domains from inheriting the previous status code.
BenLubar Apr 3, 2019
0a14cad
Update CHANGELOG.md for #10460.
BenLubar Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/mastodon/accounts_cli.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,14 @@ def backup(username)
def cull
skip_threshold = 7.days.ago
culled = 0
dry_run_culled = []
skip_domains = Set.new
dry_run = options[:dry_run] ? ' (DRY RUN)' : ''

Account.remote.where(protocol: :activitypub).partitioned.find_each do |account|
next if account.updated_at >= skip_threshold || (account.last_webfingered_at.present? && account.last_webfingered_at >= skip_threshold)

code = 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would have put a next like in the other rescue instead of that, but LGTM

unless skip_domains.include?(account.domain)
begin
code = Request.new(:head, account.uri).perform(&:code)
Expand All @@ -236,7 +238,11 @@ def cull
end

if [404, 410].include?(code)
SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
if options[:dry_run]
dry_run_culled << account.acct
else
SuspendAccountService.new.call(account, destroy: true)
end
culled += 1
say('+', :green, false)
else
Expand All @@ -252,6 +258,11 @@ def cull
say('The following servers were not available during the check:', :yellow)
skip_domains.each { |domain| say(' ' + domain) }
end

unless dry_run_culled.empty?
say('The following accounts would have been deleted:', :green)
dry_run_culled.each { |account| say(' ' + account) }
end
end

option :all, type: :boolean
Expand Down