mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 09:05:06 +01:00
Code Issues Projects Releases Wiki Activity

Better comparison of "local" domain

Browse Source
This commit is contained in:
Eugen Rochko 2016-10-06 16:36:16 +02:00
parent b304cc07d5
commit 15d01a5e08
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/follows_controller.rb
View File

@ -5,7 +5,7 @@ class Api::V1::FollowsController < ApiController
def create def create
raise ActiveRecord::RecordNotFound if params[:uri].blank? 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 render action: :show
end end
end end

4
app/lib/tag_manager.rb
View File

@ -17,6 +17,10 @@ class TagManager
id.start_with?("tag:#{Rails.configuration.x.local_domain}") id.start_with?("tag:#{Rails.configuration.x.local_domain}")
end end
def local_domain?(domain)
domain.nil? || domain.gsub(/[\/]/, '') == Rails.configuration.x.local_domain
end
def uri_for(target) def uri_for(target)
return target.uri if target.respond_to?(:local?) && !target.local? return target.uri if target.respond_to?(:local?) && !target.local?

2
app/services/follow_remote_account_service.rb
View File

@ -7,7 +7,7 @@ class FollowRemoteAccountService < BaseService
def call(uri) def call(uri)
username, domain = uri.split('@') 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) account = Account.find_remote(username, domain)

2
app/services/process_feed_service.rb
View File

@ -63,7 +63,7 @@ class ProcessFeedService < BaseService
href = Addressable::URI.parse(href_val) 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 # A local user is mentioned
mentioned_account = Account.find_local(href.path.gsub('/users/', '')) mentioned_account = Account.find_local(href.path.gsub('/users/', ''))