diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-20 22:41:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 22:41:20 +0100 |
| commit | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (patch) | |
| tree | e4be53cb0b2e7f876bea6c61d4fe64d7586ae63d /app/services/process_mentions_service.rb | |
| parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
| parent | dc0cc5a57d224b4c53bc58dad919b727055bd9a3 (diff) | |
Merge pull request #2117 from ClearlyClaire/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 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 93a96667e..b3b279147 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -28,13 +28,11 @@ class ProcessMentionsService < BaseService @status.text = @status.text.gsub(Account::MENTION_RE) do |match| username, domain = Regexp.last_match(1).split('@') - domain = begin - if TagManager.instance.local_domain?(domain) - nil - else - TagManager.instance.normalize_domain(domain) - end - end + domain = if TagManager.instance.local_domain?(domain) + nil + else + TagManager.instance.normalize_domain(domain) + end mentioned_account = Account.find_remote(username, domain) |