Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)

diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index b7365d5cacb90bbdc5a7d0280b111d210a058710..f5735421c7c90bccc616cacbbd89b312eeb4629c 100644 (file)
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -31,19 +31,19 @@ class StatusesIndex < Chewy::Index
     },
   }
 
     },
   }
 

-  define_type ::Status.unscoped.without_reblogs.includes(:media_attachments) do
+  define_type ::Status.unscoped.kept.without_reblogs.includes(:media_attachments), delete_if: ->(status) { status.searchable_by.empty? } do

     crutch :mentions do |collection|
     crutch :mentions do |collection|

-      data = ::Mention.where(status_id: collection.map(&:id)).pluck(:status_id, :account_id)
+      data = ::Mention.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id)

       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
     crutch :favourites do |collection|
       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
     crutch :favourites do |collection|

-      data = ::Favourite.where(status_id: collection.map(&:id)).pluck(:status_id, :account_id)
+      data = ::Favourite.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id)

       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
     crutch :reblogs do |collection|
       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
     crutch :reblogs do |collection|

-      data = ::Status.where(reblog_of_id: collection.map(&:id)).pluck(:reblog_of_id, :account_id)
+      data = ::Status.where(reblog_of_id: collection.map(&:id)).where(account: Account.local).pluck(:reblog_of_id, :account_id)

       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 
       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
     end
 

diff --git a/app/models/status.rb b/app/models/status.rb
index 078a6456635713a2b14634cea5c257ab670434cf..3504ac3709d604e740d4b2ebf39befecfd5d3c33 100644 (file)
--- 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)
   REAL_TIME_WINDOW = 6.hours
 
   def searchable_by(preloaded = nil)

-    ids = [account_id]
+    ids = []
+
+    ids << account_id if local?

 
     if preloaded.nil?
 
     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] || []
     else
       ids += preloaded.mentions[id] || []
       ids += preloaded.favourites[id] || []