From 7bea1530f4b396ae384502b3fcbf8d34f22005e1 Mon Sep 17 00:00:00 2001 From: ThibG Date: Tue, 7 Nov 2017 14:31:57 +0100 Subject: Resolve remote accounts when mentioned even if they are already known (#5539) This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages). --- app/services/process_mentions_service.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 1fd2ece1c..17c01a91d 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -11,15 +11,10 @@ class ProcessMentionsService < BaseService return unless status.local? status.text.scan(Account::MENTION_RE).each do |match| - username, domain = match.first.split('@') - mentioned_account = Account.find_remote(username, domain) - - if mentioned_account.nil? && !domain.nil? - begin - mentioned_account = resolve_remote_account_service.call(match.first.to_s) - rescue Goldfinger::Error, HTTP::Error - mentioned_account = nil - end + begin + mentioned_account = resolve_remote_account_service.call(match.first.to_s) + rescue Goldfinger::Error, HTTP::Error + mentioned_account = nil end next if mentioned_account.nil? -- cgit