Unverified Commit e6706d17 authored by Takeshi Umeda's avatar Takeshi Umeda Committed by GitHub

Fix searchable status without explicitly mentioning it (#13829)

parent 3a1a21ad
......@@ -33,7 +33,7 @@ class StatusesIndex < Chewy::Index
define_type ::Status.unscoped.kept.without_reblogs.includes(:media_attachments), delete_if: ->(status) { status.searchable_by.empty? } do
crutch :mentions do |collection|
data = ::Mention.where(status_id: collection.map(&:id)).where(account: Account.local).pluck(:status_id, :account_id)
data = ::Mention.where(status_id: collection.map(&:id)).where(account: Account.local, silent: false).pluck(:status_id, :account_id)
data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
end
......
......@@ -139,7 +139,7 @@ class Status < ApplicationRecord
ids << account_id if local?
if preloaded.nil?
ids += mentions.where(account: Account.local).pluck(:account_id)
ids += mentions.where(account: Account.local, silent: false).pluck(:account_id)
ids += favourites.where(account: Account.local).pluck(:account_id)
ids += reblogs.where(account: Account.local).pluck(:account_id)
ids += bookmarks.where(account: Account.local).pluck(:account_id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment