diff options
| author | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
|---|---|---|
| committer | Starfall <root@starfall.blue> | 2020-02-04 17:44:29 -0600 |
| commit | 6d24d3bcb84abd04f31da95f97f6d60ef0afdc00 (patch) | |
| tree | e7c38251a9e92bdf3a464b4aa7f1880aa5139bf0 /app/services/process_mentions_service.rb | |
| parent | c0c9529df269816f52915a9802e5e30fbce9576b (diff) | |
| parent | 885e9227c6e8e1ce5e4a5625d5126ba76dce2c00 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/services/process_mentions_service.rb')
| -rw-r--r-- | app/services/process_mentions_service.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 19de37717..3c257451c 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -14,7 +14,16 @@ class ProcessMentionsService < BaseService mentions = [] status.text = status.text.gsub(Account::MENTION_RE) do |match| - username, domain = Regexp.last_match(1).split('@') + username, domain = Regexp.last_match(1).split('@') + + domain = begin + if TagManager.instance.local_domain?(domain) + nil + else + TagManager.instance.normalize_domain(domain) + end + end + mentioned_account = Account.find_remote(username, domain) if mention_undeliverable?(mentioned_account) |