diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-05 13:51:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-05 13:51:50 +0100 |
| commit | bcfd6e3bb48f6e0eb88f7f3a650832842ab69166 (patch) | |
| tree | 0e2bb7334c7954bee2962ed78565046e3b974725 /app/services/process_mentions_service.rb | |
| parent | 22daf24600d8e99e4569740ee5836d25c70c1e8b (diff) | |
| parent | 83359fef2b04e81b35b047510ddb0c79bcf8ddaa (diff) | |
Merge pull request #1259 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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) |