From 144ecfcfc7d9974117f1563084409a9558290a60 Mon Sep 17 00:00:00 2001 From: Starfall Date: Sat, 11 Apr 2020 20:04:46 -0500 Subject: Revert "Revert "Merge branch 'glitch'"" This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b. --- app/models/account.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'app/models') 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 -- cgit