zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix remote account in contact account setting not being used (#19351)

This commit is contained in:
Eugen Rochko 2022-10-21 14:07:02 +02:00 committed by GitHub
parent c60f9cb865
commit abf6c87ee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/presenters/instance_presenter.rb
View File

@ -12,7 +12,9 @@ class InstancePresenter < ActiveModelSerializers::Model
end end
def account def account
Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) username, domain = Setting.site_contact_username.strip.gsub(/\A@/, '').split('@', 2)
domain = nil if TagManager.instance.local_domain?(domain)
Account.find_remote(username, domain) if username.present?
end end
end end

6
app/validators/existing_username_validator.rb
View File

@ -6,7 +6,7 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
usernames_and_domains = begin usernames_and_domains = begin
value.split(',').map do |str| value.split(',').map do |str|
username, domain = str.strip.gsub(/\A@/, '').split('@') username, domain = str.strip.gsub(/\A@/, '').split('@', 2)
domain = nil if TagManager.instance.local_domain?(domain) domain = nil if TagManager.instance.local_domain?(domain)
next if username.blank? next if username.blank?
@ -21,8 +21,8 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
if options[:multiple] 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? 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 elsif usernames_with_no_accounts.any? || usernames_and_domains.size > 1
record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) if usernames_with_no_accounts.any? || usernames_and_domains.size > 1 record.errors.add(attribute, I18n.t('existing_username_validator.not_found'))
end end
end end
end end