From 3639862dee7e47cfd4f11430871aae3f3f71821f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 4 May 2021 14:22:04 +0200 Subject: Fix existing username validator not allowing multiple accounts (#16153) Fix #16107 --- app/validators/existing_username_validator.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/validators/existing_username_validator.rb b/app/validators/existing_username_validator.rb index afbe0c635..8f7d96b8e 100644 --- a/app/validators/existing_username_validator.rb +++ b/app/validators/existing_username_validator.rb @@ -19,10 +19,10 @@ class ExistingUsernameValidator < ActiveModel::EachValidator str unless Account.find_remote(username, domain) end - if usernames_with_no_accounts.any? && options[:multiple] - record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', '))) - elsif usernames_with_no_accounts.any? || usernames_and_domains.size > 1 - record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) + if options[:multiple] + record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', '))) if usernames_with_no_accounts.any? + else + record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) if usernames_with_no_accounts.any? || usernames_and_domains.size > 1 end end end -- cgit