diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-06 16:36:16 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-10-06 16:36:16 +0200 |
| commit | 15d01a5e08dd13b55d6b67ea26d56894487c09a9 (patch) | |
| tree | 44e31821b823d4fa53e1a592f604249290339cb5 /app/services | |
| parent | b304cc07d525fdf0843cac419fa0e8e4bdda714e (diff) | |
Better comparison of "local" domain
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/follow_remote_account_service.rb | 2 | ||||
| -rw-r--r-- | app/services/process_feed_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb index 9fbf17091..3b305504c 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 9585b15dd..d24b803e6 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/', '')) |