From e6706d171a3406a40b597dc47fd2dca5b334f2e2 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Sat, 23 May 2020 12:47:25 +0900
Subject: [PATCH] Fix searchable status without explicitly mentioning it
(#13829)
---
app/chewy/statuses_index.rb | 2 +-
app/models/status.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index bec9ed88b..d4b05fca9 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -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
diff --git a/app/models/status.rb b/app/models/status.rb
index a1babf85e..71596ec2f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -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)