diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/account.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index e46888415..0fcf897c9 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -480,7 +480,16 @@ class Account < ApplicationRecord def from_text(text) return [] if text.blank? - text.scan(MENTION_RE).map { |match| match.first.split('@', 2) }.uniq.map { |(username, domain)| EntityCache.instance.mention(username, domain) } + text.scan(MENTION_RE).map { |match| match.first.split('@', 2) }.uniq.map do |(username, domain)| + domain = begin + if TagManager.instance.local_domain?(domain) + nil + else + TagManager.instance.normalize_domain(domain) + end + end + EntityCache.instance.mention(username, domain) + end.compact end private |