IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow TL0 users topics in email digest

Browse Source
This commit is contained in:
Arpit Jalan
2015-01-29 21:10:26 +05:30
parent 4fd0200df8
commit 21e94859a9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/topic.rb
View File

@@ -124,7 +124,7 @@ class Topic < ActiveRecord::Base
scope :visible, -> { where(visible: true) }
scope :created_since, lambda { |time_ago| where('created_at > ?', time_ago) }
scope :created_since, lambda { |time_ago| where('topics.created_at > ?', time_ago) }
scope :secured, lambda { |guardian=nil|
ids = guardian.secure_category_ids if guardian
@@ -276,8 +276,10 @@ class Topic < ActiveRecord::Base
.visible
.secured(Guardian.new(user))
.joins("LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}")
.joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
.where(closed: false, archived: false)
.where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
.where("COALESCE(users.trust_level, 0) > 0")
.created_since(since)
.listable_topics
.includes(:category)