Reduce the number of synchronous resolves when posting toots (#6075)

1 files changed, 15 insertions, 9 deletions

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index e12721c46..46401f298 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -11,18 +11,20 @@ class ProcessMentionsService < BaseService
     return unless status.local?
 
     status.text = status.text.gsub(Account::MENTION_RE) do |match|
-      begin
-        mentioned_account = resolve_remote_account_service.call($1)
-      rescue Goldfinger::Error, HTTP::Error
-        mentioned_account = nil
-      end
+      username, domain  = $1.split('@')
+      mentioned_account = Account.find_remote(username, domain)
 
-      if mentioned_account.nil?
-        username, domain  = $1.split('@')
-        mentioned_account = Account.find_remote(username, domain)
+      if mention_undeliverable?(status, mentioned_account)
+        begin
+          mentioned_account = resolve_remote_account_service.call($1)
+        rescue Goldfinger::Error, HTTP::Error
+          mentioned_account = nil
+        end
       end
 
-      next match if mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && status.stream_entry.hidden?)
+      mentioned_account ||= Account.find_remote(username, domain)
+
+      next match if mention_undeliverable?(status, mentioned_account)
 
       mentioned_account.mentions.where(status: status).first_or_create(status: status)
       "@#{mentioned_account.acct}"
@@ -37,6 +39,10 @@ class ProcessMentionsService < BaseService
 
   private
 
+  def mention_undeliverable?(status, mentioned_account)
+    mentioned_account.nil? || (!mentioned_account.local? && mentioned_account.ostatus? && status.stream_entry.hidden?)
+  end
+
   def create_notification(status, mention)
     mentioned_account = mention.account