From 332ac0f299fbb255bd28a9a91169ee92286b8c26 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Mon, 12 Dec 2022 06:31:46 +0800 Subject: [PATCH] UX: Exclude child catgegories of muted category in similar to search (#19414) Follow-up to 207b764ea37f13469db1117c5c1102ace05fd2f9 --- app/models/topic.rb | 2 +- spec/models/topic_spec.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index f917f4fdeb2..8c407873e16 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -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 diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 0e1e784bd53..11c13e0a91f 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -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) }