IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 02:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Exclude child catgegories of muted category in similar to search (#19414)

Browse Source 
Follow-up to 207b764ea3
This commit is contained in:
Alan Guo Xiang Tan 2022-12-12 06:31:46 +08:00 committed by GitHub
parent c9197cf9d8
commit 332ac0f299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/topic.rb
View File

@ -642,7 +642,7 @@ class Topic < ActiveRecord::Base
excluded_category_ids_sql = <<~SQL
#{excluded_category_ids_sql}
UNION
#{CategoryUser.where(notification_level: CategoryUser.notification_levels[:muted], user: user).select(:category_id).to_sql}
#{CategoryUser.muted_category_ids_query(user, include_direct: true).select("categories.id").to_sql}
SQL
end

11
spec/models/topic_spec.rb
View File

@ -701,6 +701,17 @@ RSpec.describe Topic do
expect(Topic.similar_to("has evil trout made any topics?", "", user)).to eq([])
end
it 'does not return topics from child categories where the user has muted the parent category' do
expect(Topic.similar_to("has evil trout made any topics?", "", user)).to eq([topic])
parent_category = topic.category
child_category = Fabricate(:category, parent_category: parent_category)
topic.update!(category: child_category)
CategoryUser.create!(category: parent_category, user: user, notification_level: CategoryUser.notification_levels[:muted])
expect(Topic.similar_to("has evil trout made any topics?", "", user)).to eq([])
end
context "with secure categories" do
fab!(:group) { Fabricate(:group) }
fab!(:private_category) { Fabricate(:private_category, group: group) }