From 15d01a5e08dd13b55d6b67ea26d56894487c09a9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 6 Oct 2016 16:36:16 +0200 Subject: [PATCH] Better comparison of "local" domain --- app/controllers/api/v1/follows_controller.rb | 2 +- app/lib/tag_manager.rb | 4 ++++ app/services/follow_remote_account_service.rb | 2 +- app/services/process_feed_service.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb index f688f2e72c..739ac1fb1f 100644 --- a/app/controllers/api/v1/follows_controller.rb +++ b/app/controllers/api/v1/follows_controller.rb @@ -5,7 +5,7 @@ class Api::V1::FollowsController < ApiController def create raise ActiveRecord::RecordNotFound if params[:uri].blank? - @account = FollowService.new.call(current_user.account, params[:uri]).try(:target_account) + @account = FollowService.new.call(current_user.account, params[:uri].strip).try(:target_account) render action: :show end end diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb index 4d29ca1f8b..ad76d10c47 100644 --- a/app/lib/tag_manager.rb +++ b/app/lib/tag_manager.rb @@ -17,6 +17,10 @@ class TagManager id.start_with?("tag:#{Rails.configuration.x.local_domain}") end + def local_domain?(domain) + domain.nil? || domain.gsub(/[\/]/, '') == Rails.configuration.x.local_domain + end + def uri_for(target) return target.uri if target.respond_to?(:local?) && !target.local? diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb index 9fbf17091d..3b305504c1 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/follow_remote_account_service.rb @@ -7,7 +7,7 @@ class FollowRemoteAccountService < BaseService def call(uri) username, domain = uri.split('@') - return Account.find_local(username) if domain == Rails.configuration.x.local_domain || domain.nil? + return Account.find_local(username) if TagManager.instance.local_domain?(domain) account = Account.find_remote(username, domain) diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 9585b15ddc..d24b803e64 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -63,7 +63,7 @@ class ProcessFeedService < BaseService href = Addressable::URI.parse(href_val) - if href.host == Rails.configuration.x.local_domain + if TagManager.instance.local_domain?(href.host) # A local user is mentioned mentioned_account = Account.find_local(href.path.gsub('/users/', ''))