sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
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
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
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