treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351) 

This provides a hotfix for outbound salmon requests to other Mastodon instances
as they currently will try to resovle user@WEB_DOMAIN instead of user@LOCAL_DOMAIN
(see #2012 and #20312).

Furthermore, this should ease transition from users switching from
LOCAL_DOMAIN = WEB_DOMAIN to another LOCAL_DOMAIN when WEB_DOMAIN does not change.
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
ThibG 2017-04-23 14:19:54 +02:00 committed by Eugen
parent 85e09518b9
commit 89dc29affb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/webfinger_resource.rb
View File

@ -61,6 +61,6 @@ class WebfingerResource
end
def domain_matches_local?
TagManager.instance.local_domain?(local_domain)
TagManager.instance.local_domain?(local_domain) || TagManager.instance.web_domain?(local_domain)
end
end