ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix existing username validator not allowing multiple accounts (#16153) 

Fix #16107
rebase/4.0.0rc2
Eugen Rochko 2021-05-04 14:22:04 +02:00 committed by GitHub
parent fab65848d2
commit 3639862dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/validators/existing_username_validator.rb
View File

@ -19,10 +19,10 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
str unless Account.find_remote(username, domain) str unless Account.find_remote(username, domain)
end end
if usernames_with_no_accounts.any? && options[:multiple] if options[:multiple]
record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', '))) record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: usernames_with_no_accounts.join(', '))) if usernames_with_no_accounts.any?
elsif usernames_with_no_accounts.any? || usernames_and_domains.size > 1 else
record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) 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 end
end end