From 55785b160320783392ffe3f24c5ca48e6ee7a5f2 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 26 May 2023 03:42:16 -0400
Subject: [PATCH] Extract methods for user de-duping in maintenance CLI
(#25117)
---
lib/mastodon/cli/maintenance.rb | 66 +++++++++++++++++++--------------
1 file changed, 38 insertions(+), 28 deletions(-)
diff --git a/lib/mastodon/cli/maintenance.rb b/lib/mastodon/cli/maintenance.rb
index 660adef80..b10748035 100644
--- a/lib/mastodon/cli/maintenance.rb
+++ b/lib/mastodon/cli/maintenance.rb
@@ -231,34 +231,9 @@ module Mastodon::CLI
end
end
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
- users = User.where(id: row['ids'].split(',')).sort_by(&:created_at).reverse.drop(1)
- @prompt.warn "Unsetting confirmation token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
-
- users.each do |user|
- user.update!(confirmation_token: nil)
- end
- end
-
- if ActiveRecord::Migrator.current_version < 2022_01_18_183010
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
- users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
- @prompt.warn "Unsetting remember token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
-
- users.each do |user|
- user.update!(remember_token: nil)
- end
- end
- end
-
- ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
- users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
- @prompt.warn "Unsetting password reset token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
-
- users.each do |user|
- user.update!(reset_password_token: nil)
- end
- end
+ deduplicate_users_process_confirmation_token
+ deduplicate_users_process_remember_token
+ deduplicate_users_process_password_token
@prompt.say 'Restoring users indexes…'
ActiveRecord::Base.connection.add_index :users, ['confirmation_token'], name: 'index_users_on_confirmation_token', unique: true
@@ -272,6 +247,41 @@ module Mastodon::CLI
end
end
+ def deduplicate_users_process_confirmation_token
+ ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE confirmation_token IS NOT NULL GROUP BY confirmation_token HAVING count(*) > 1").each do |row|
+ users = User.where(id: row['ids'].split(',')).sort_by(&:created_at).reverse.drop(1)
+ @prompt.warn "Unsetting confirmation token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+
+ users.each do |user|
+ user.update!(confirmation_token: nil)
+ end
+ end
+ end
+
+ def deduplicate_users_process_remember_token
+ if ActiveRecord::Migrator.current_version < 2022_01_18_183010
+ ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE remember_token IS NOT NULL GROUP BY remember_token HAVING count(*) > 1").each do |row|
+ users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+ @prompt.warn "Unsetting remember token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+
+ users.each do |user|
+ user.update!(remember_token: nil)
+ end
+ end
+ end
+ end
+
+ def deduplicate_users_process_password_token
+ ActiveRecord::Base.connection.select_all("SELECT string_agg(id::text, ',') AS ids FROM users WHERE reset_password_token IS NOT NULL GROUP BY reset_password_token HAVING count(*) > 1").each do |row|
+ users = User.where(id: row['ids'].split(',')).sort_by(&:updated_at).reverse.drop(1)
+ @prompt.warn "Unsetting password reset token for those accounts: #{users.map(&:account).map(&:acct).join(', ')}"
+
+ users.each do |user|
+ user.update!(reset_password_token: nil)
+ end
+ end
+ end
+
def deduplicate_account_domain_blocks!
remove_index_if_exists!(:account_domain_blocks, 'index_account_domain_blocks_on_account_id_and_domain')