diff options
| author | ThibG <thib@sitedethib.com> | 2017-04-15 02:15:46 +0200 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-15 02:15:46 +0200 |
| commit | a9529d3b4b057eeb3b47943b271ad6605e22732d (patch) | |
| tree | ce574918a357859d321f146b3c7bf0f34acad0cd /app/controllers | |
| parent | 0d2910478a6b1659f4c40e64cf28cf2e64dfb01e (diff) | |
Allow running mastodon on a different domain as the one used for identifying users (#1267)
* 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.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/push_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/push_controller.rb b/app/controllers/api/push_controller.rb index 78d4e36e6..f2ddfd969 100644 --- a/app/controllers/api/push_controller.rb +++ b/app/controllers/api/push_controller.rb @@ -30,7 +30,7 @@ class Api::PushController < ApiController params = Rails.application.routes.recognize_path(uri.path) domain = uri.host + (uri.port ? ":#{uri.port}" : '') - return unless TagManager.instance.local_domain?(domain) && params[:controller] == 'accounts' && params[:action] == 'show' && params[:format] == 'atom' + return unless TagManager.instance.web_domain?(domain) && params[:controller] == 'accounts' && params[:action] == 'show' && params[:format] == 'atom' Account.find_local(params[:username]) end |