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

4
app/lib/tag_manager.rb
View file

@ -56,6 +56,10 @@ class TagManager
id.start_with?("tag:#{Rails.configuration.x.local_domain}")
end
def web_domain?(domain)
domain.nil? || domain.gsub(/[\/]/, '').casecmp(Rails.configuration.x.web_domain).zero?
end
def local_domain?(domain)
domain.nil? || domain.gsub(/[\/]/, '').casecmp(Rails.configuration.x.local_domain).zero?
end