diff options
| -rw-r--r-- | app/lib/tag_manager.rb | 2 | ||||
| -rw-r--r-- | app/models/account.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb index ad76d10c4..d2cf35b49 100644 --- a/app/lib/tag_manager.rb +++ b/app/lib/tag_manager.rb @@ -18,7 +18,7 @@ class TagManager end def local_domain?(domain) - domain.nil? || domain.gsub(/[\/]/, '') == Rails.configuration.x.local_domain + domain.nil? || domain.gsub(/[\/]/, '').downcase == Rails.configuration.x.local_domain.downcase end def uri_for(target) diff --git a/app/models/account.rb b/app/models/account.rb index e43d51b1c..c1b52ea1b 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -125,7 +125,7 @@ class Account < ApplicationRecord end def self.find_remote!(username, domain) - where(arel_table[:username].matches(username)).where(domain: domain).take! + where(arel_table[:username].matches(username)).where(domain.nil? ? { domain: nil } : arel_table[:domain].matches(domain)).take! end def self.find_local(username) |