diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/accounts_cli.rb | 16 | ||||
| -rw-r--r-- | lib/mastodon/feeds_cli.rb | 5 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 4 |
3 files changed, 21 insertions, 4 deletions
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index 704cf474b..a32bc9533 100644 --- a/lib/mastodon/accounts_cli.rb +++ b/lib/mastodon/accounts_cli.rb @@ -223,7 +223,7 @@ module Mastodon 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 >= skip_threshold + next if account.updated_at >= skip_threshold || (account.last_webfingered_at.present? && account.last_webfingered_at >= skip_threshold) unless dead_servers.include?(account.domain) begin @@ -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) diff --git a/lib/mastodon/feeds_cli.rb b/lib/mastodon/feeds_cli.rb index c3fca723e..cca65cf87 100644 --- a/lib/mastodon/feeds_cli.rb +++ b/lib/mastodon/feeds_cli.rb @@ -54,6 +54,11 @@ module Mastodon elsif username.present? account = Account.find_local(username) + if account.nil? + say("Account #{username} is not found", :red) + exit(1) + end + if options[:background] RegenerationWorker.perform_async(account.id) unless options[:dry_run] else diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index fc7fa5aca..b4b88dfdc 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -9,7 +9,7 @@ module Mastodon end def minor - 5 + 6 end def patch @@ -21,7 +21,7 @@ module Mastodon end def flags - '' + 'rc1' end def to_a |