commit: 89dc29affbfe99cb84505cd65aa6e2adab8d2c7c
parent: 85e09518b9bb510d9a421ad759ddd74cb5b47894
Author: ThibG <thib@sitedethib.com>
Date: Sun, 23 Apr 2017 14:19:54 +0200
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.
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/lib/webfinger_resource.rb b/app/lib/webfinger_resource.rb
@@ -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