Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

Revert "FEATURE: Include participants in PN search data (#16855)" (#16904)

Browse source 
This reverts commit 71c74a262d.
This commit is contained in:
Penar Musaraj 2022-05-25 01:08:36 -04:00 • committed by GitHub
parent 0b8177de54
commit ebdfc536dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/services/search_indexer.rb
View file

@ -115,13 +115,13 @@ class SearchIndexer
) )
end end
def self.update_posts_index(post_id:, topic_title:, category_name:, topic_tags:, cooked:, private_message:, allowed_users: nil) def self.update_posts_index(post_id:, topic_title:, category_name:, topic_tags:, cooked:, private_message:)
update_index( update_index(
table: 'post', table: 'post',
id: post_id, id: post_id,
a_weight: topic_title, a_weight: topic_title,
b_weight: category_name, b_weight: category_name,
c_weight: "#{topic_tags} #{allowed_users&.join(" ")}", c_weight: topic_tags,
# The tsvector resulted from parsing a string can be double the size of # The tsvector resulted from parsing a string can be double the size of
# the original string. Since there is no way to estimate the length of # the original string. Since there is no way to estimate the length of
# the expected tsvector, we limit the input to ~50% of the maximum # the expected tsvector, we limit the input to ~50% of the maximum
@ -231,8 +231,7 @@ class SearchIndexer
category_name: category_name, category_name: category_name,
topic_tags: tag_names, topic_tags: tag_names,
cooked: obj.cooked, cooked: obj.cooked,
private_message: topic.private_message?, private_message: topic.private_message?
allowed_users: topic.allowed_users.pluck(:username, :name)
) )
SearchIndexer.update_topics_index(topic.id, topic.title, obj.cooked) if obj.is_first_post? SearchIndexer.update_topics_index(topic.id, topic.title, obj.cooked) if obj.is_first_post?
@ -255,8 +254,7 @@ class SearchIndexer
category_name: category_name, category_name: category_name,
topic_tags: tag_names, topic_tags: tag_names,
cooked: post.cooked, cooked: post.cooked,
private_message: obj.private_message?, private_message: obj.private_message?
allowed_users: obj.allowed_users.pluck(:username, :name)
) )
SearchIndexer.update_topics_index(obj.id, obj.title, post.cooked) SearchIndexer.update_topics_index(obj.id, obj.title, post.cooked)

16
spec/services/search_indexer_spec.rb
View file

@ -291,22 +291,6 @@ describe SearchIndexer do
words = post_search_data.search_data.scan(/'([^']*)'/).map { |match| match[0] } words = post_search_data.search_data.scan(/'([^']*)'/).map { |match| match[0] }
expect(words).to contain_exactly('best', 'beig', 'obj', 'http', 'titl', 'long', 'enou', 'unca') expect(words).to contain_exactly('best', 'beig', 'obj', 'http', 'titl', 'long', 'enou', 'unca')
end end
context 'private messages' do
fab!(:user1) { Fabricate(:user, name: 'bloop', username: 'bloopdroop') }
fab!(:user2) { Fabricate(:user, name: 'two', username: 'twotone') }
let!(:pm_topic) { Fabricate(:private_message_topic,
topic_allowed_users: [
Fabricate.build(:topic_allowed_user, user: user1),
Fabricate.build(:topic_allowed_user, user: user2)
]) }
let(:pm_post) { Fabricate(:post, topic: pm_topic) }
it 'includes participating users in a private message' do
search_data = pm_post.post_search_data.search_data
expect(search_data).to include("bloop", "bloopdroop", "two", "twoton")
end
end
end end
describe '.queue_post_reindex' do describe '.queue_post_reindex' do