Merge remote-tracking branch 'parent/main' into upstream-20231116

app/chewy/public_statuses_index.rb

@@ -144,7 +144,7 @@ class PublicStatusesIndex < Chewy::Index
   index_scope ::Status.unscoped
                       .kept
                       .indexable
-                      .includes(:media_attachments, :preloadable_poll, :preview_cards, :tags, :account)
+                      .includes(:media_attachments, :preloadable_poll, :tags, :account, preview_cards_status: :preview_card)
 
   root date_detection: false do
     field(:id, type: 'long')

app/chewy/statuses_index.rb

@@ -147,7 +147,6 @@ class StatusesIndex < Chewy::Index
   index_scope ::Status.unscoped.kept.without_reblogs.includes(
     :account,
     :media_attachments,
-    :preview_cards,
     :local_mentioned,
     :local_favorited,
     :local_reblogged,
@@ -155,6 +154,7 @@ class StatusesIndex < Chewy::Index
     :local_emoji_reacted,
     :tags,
     :local_referenced,
+    preview_cards_status: :preview_card,
     preloadable_poll: :local_voters
   ),
               delete_if: lambda { |status|