about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-02 20:04:46 +0200
committerGitHub <noreply@github.com>2019-10-02 20:04:46 +0200
commit575dc11cb2045c32b8fc0325de7bc321bd4728aa (patch)
treee8ae310ed24abdb87caad45b96409ad489cf739a /app/models
parent699f53c464c6d6376b25b6b5fafd1caaa983f737 (diff)
Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/status.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 078a64566..3504ac370 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -129,12 +129,14 @@ class Status < ApplicationRecord
   REAL_TIME_WINDOW = 6.hours
 
   def searchable_by(preloaded = nil)
-    ids = [account_id]
+    ids = []
+
+    ids << account_id if local?
 
     if preloaded.nil?
-      ids += mentions.pluck(:account_id)
-      ids += favourites.pluck(:account_id)
-      ids += reblogs.pluck(:account_id)
+      ids += mentions.where(account: Account.local).pluck(:account_id)
+      ids += favourites.where(account: Account.local).pluck(:account_id)
+      ids += reblogs.where(account: Account.local).pluck(:account_id)
     else
       ids += preloaded.mentions[id] || []
       ids += preloaded.favourites[id] || []