Procházet zdrojové kódy

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

ThibG před 6 roky
rodič
revize
cea98e0c12
1 změnil soubory, kde provedl 15 přidání a 9 odebrání
  1. 15 9
      app/services/process_mentions_service.rb

+ 15 - 9
app/services/process_mentions_service.rb

@@ -11,18 +11,20 @@ class ProcessMentionsService < BaseService
     return unless status.local?
     return unless status.local?
 
 
     status.text = status.text.gsub(Account::MENTION_RE) do |match|
     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
       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.mentions.where(status: status).first_or_create(status: status)
       "@#{mentioned_account.acct}"
       "@#{mentioned_account.acct}"
@@ -37,6 +39,10 @@ class ProcessMentionsService < BaseService
 
 
   private
   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)
   def create_notification(status, mention)
     mentioned_account = mention.account
     mentioned_account = mention.account