Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Allow running mastodon on a different domain as the one used for identifying users (#1267)

Browse source 
* Allow running mastodon on a different domain as the one used for identifying users

* Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing

* Compare to web_domain instead of local_domain when dealing with feeds/API

* Correctly identify mentions to local accounts

Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.
This commit is contained in:
ThibG 2017-04-15 02:15:46 +02:00 • committed by Eugen
parent 0d2910478a
commit a9529d3b4b
5 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/process_feed_service.rb
View file

@ -163,7 +163,7 @@ class ProcessFeedService < BaseService
url = Addressable::URI.parse(link['href'])
mentioned_account = if TagManager.instance.local_domain?(url.host)
mentioned_account = if TagManager.instance.web_domain?(url.host)
Account.find_local(url.path.gsub('/users/', ''))
else
Account.find_by(url: link['href']) || FetchRemoteAccountService.new.call(link['href'])