Merge branch 'master' into glitch-soc/merge-upstream

2020-12-19 14:52:09 +01:00
parent 79c57810b7 c4e860277d
commit ec3e2b8f72
20 changed files with 49 additions and 23 deletions
--- a/lib/mastodon/accounts_cli.rb
+++ b/lib/mastodon/accounts_cli.rb
@@ -245,10 +245,10 @@ module Mastodon
      domain configuration.
    LONG_DESC
    def fix_duplicates
-      Account.remote.select(:uri, 'count(*)').group(:uri).having('count(*) > 1').pluck_each(:uri) do |uri|
+      Account.remote.select(:uri, 'count(*)').group(:uri).having('count(*) > 1').pluck(:uri).each do |uri|
        say("Duplicates found for #{uri}")
        begin
-          ActivityPub::FetchRemotAccountService.new.call(uri) unless options[:dry_run]
+          ActivityPub::FetchRemoteAccountService.new.call(uri) unless options[:dry_run]
        rescue => e
          say("Error processing #{uri}: #{e}", :red)
        end