github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: topics tagged with muted tags should not be included in digest emails

Browse Source
This commit is contained in:
Neil Lalonde
2016-08-08 15:14:18 -04:00
parent fb1b119462
commit 17b51bb465
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/topic.rb
View File

@ -361,6 +361,13 @@ class Topic < ActiveRecord::Base
topics = topics.where("topics.category_id NOT IN (?)", muted_category_ids)
end
# Remove muted categories
muted_tag_ids = TagUser.lookup(user, :muted).pluck(:tag_id)
unless muted_tag_ids.empty?
topics = topics.joins("LEFT OUTER JOIN topic_tags ON topic_tags.topic_id = topics.id")
.where("topic_tags.tag_id NOT IN (?)", muted_tag_ids)
end
topics
end