github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 12:42:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: default_tags_muted setting should work for anonymous users too.

Browse Source
This commit is contained in:
Vinoth Kannan 2020-08-20 10:40:03 +05:30
parent 54cf3c6766
commit 89fcb75af2
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/topic_query.rb
View File

@ -908,11 +908,18 @@ class TopicQuery
end
def remove_muted_tags(list, user, opts = nil)
if user.nil? || !SiteSetting.tagging_enabled || SiteSetting.remove_muted_tags_from_latest == 'never'
if !SiteSetting.tagging_enabled || SiteSetting.remove_muted_tags_from_latest == 'never'
return list
end
muted_tag_ids = TagUser.lookup(user, :muted).pluck(:tag_id)
muted_tag_ids = []
if user.present?
muted_tag_ids = TagUser.lookup(user, :muted).pluck(:tag_id)
else
muted_tag_ids = SiteSetting.default_tags_muted.split("|").map(&:to_i)
end
if muted_tag_ids.blank?
return list
end

13
spec/components/topic_query_spec.rb
View File

@ -281,6 +281,19 @@ describe TopicQuery do
end
end
context 'remove_muted_tags' do
fab!(:topic) { Fabricate(:topic, tags: [tag]) }
before do
SiteSetting.remove_muted_tags_from_latest = 'always'
SiteSetting.default_tags_muted = tag.id.to_s
end
it 'removes default muted tag topics for anonymous users' do
expect(TopicQuery.new(nil).list_latest.topics.map(&:id)).not_to include(topic.id)
end
end
context "and categories too" do
let(:category1) { Fabricate(:category_with_definition) }
let(:category2) { Fabricate(:category_with_definition) }