gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904)

Browse source 
* Fix ActivityPub handling of replies when LOCAL_DOMAIN ≠ WEB_DOMAIN (#4895)

For all intents and purposes, `local_url?` is used to check if an URL refers
to the Web UI or the various API endpoints of the local instances. Those things
reside on `WEB_DOMAIN` and not `LOCAL_DOMAIN`.

* Change local_url? spec, as all URLs handled by Mastodon are based on WEB_DOMAIN
This commit is contained in:
ThibG 2017-09-13 14:22:16 +02:00 • committed by Eugen Rochko
parent da77f65c46
commit 550ff677da
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/tag_manager.rb
View file

@ -87,7 +87,7 @@ class TagManager
def local_url?(url)
uri = Addressable::URI.parse(url).normalize
domain = uri.host + (uri.port ? ":#{uri.port}" : '')
TagManager.instance.local_domain?(domain)
TagManager.instance.web_domain?(domain)
end
def uri_for(target)