github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: exclude topics from muted tag in category featured list. (#14925)

Browse Source 
Topics from muted tags were visible in the categories page's featured topics section since we didn't filter it before.
This commit is contained in:
Vinoth Kannan 2021-11-16 12:10:50 +05:30 committed by GitHub
parent f52e1258f7
commit c47a526371
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/category_list.rb
View File

@ -70,6 +70,7 @@ class CategoryList
.where('COALESCE(tu.notification_level,1) > :muted', muted: TopicUser.notification_levels[:muted]) .where('COALESCE(tu.notification_level,1) > :muted', muted: TopicUser.notification_levels[:muted])
end end
@all_topics = TopicQuery.remove_muted_tags(@all_topics, @guardian.user)
@all_topics = @all_topics.includes(:last_poster) if @options[:include_topics] @all_topics = @all_topics.includes(:last_poster) if @options[:include_topics]
@all_topics.each do |t| @all_topics.each do |t|
# hint for the serializer # hint for the serializer

4
lib/topic_query.rb
View File

@ -822,7 +822,7 @@ class TopicQuery
def remove_muted(list, user, options) def remove_muted(list, user, options)
list = remove_muted_topics(list, user) unless options && options[:state] == "muted" list = remove_muted_topics(list, user) unless options && options[:state] == "muted"
list = remove_muted_categories(list, user, exclude: options[:category]) list = remove_muted_categories(list, user, exclude: options[:category])
remove_muted_tags(list, user, options) TopicQuery.remove_muted_tags(list, user, options)
end end
def remove_muted_topics(list, user) def remove_muted_topics(list, user)
@ -867,7 +867,7 @@ class TopicQuery
list list
end end
def remove_muted_tags(list, user, opts = {}) def self.remove_muted_tags(list, user, opts = {})
if !SiteSetting.tagging_enabled || SiteSetting.remove_muted_tags_from_latest == 'never' if !SiteSetting.tagging_enabled || SiteSetting.remove_muted_tags_from_latest == 'never'
return list return list
end end

2
lib/topic_query/private_message_lists.rb
View File

@ -39,7 +39,7 @@ class TopicQuery
def list_private_messages_new(user, type = :user) def list_private_messages_new(user, type = :user)
list = filter_private_message_new(user, type) list = filter_private_message_new(user, type)
list = remove_muted_tags(list, user) list = TopicQuery.remove_muted_tags(list, user)
list = remove_dismissed(list, user) list = remove_dismissed(list, user)
create_list(:private_messages, {}, list) create_list(:private_messages, {}, list)

8
spec/models/category_list_spec.rb
View File

@ -41,12 +41,16 @@ describe CategoryList do
secret_subcat.set_permissions(admins: :full) secret_subcat.set_permissions(admins: :full)
secret_subcat.save secret_subcat.save
muted_tag = Fabricate(:tag) # muted tag
SiteSetting.default_tags_muted = muted_tag.name
Fabricate(:topic, category: public_cat, tags: [muted_tag])
CategoryFeaturedTopic.feature_topics CategoryFeaturedTopic.feature_topics
expect(CategoryList.new(Guardian.new(admin), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(2) expect(CategoryList.new(Guardian.new(admin), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(3)
expect(CategoryList.new(Guardian.new(admin), include_topics: true).categories.find { |x| x.name == private_cat.name }.displayable_topics.count).to eq(1) expect(CategoryList.new(Guardian.new(admin), include_topics: true).categories.find { |x| x.name == private_cat.name }.displayable_topics.count).to eq(1)
expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(1) expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(2)
expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == private_cat.name }).to eq(nil) expect(CategoryList.new(Guardian.new(user), include_topics: true).categories.find { |x| x.name == private_cat.name }).to eq(nil)
expect(CategoryList.new(Guardian.new(nil), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(1) expect(CategoryList.new(Guardian.new(nil), include_topics: true).categories.find { |x| x.name == public_cat.name }.displayable_topics.count).to eq(1)