From 8445a0c7ad90d24ad4148dd04913eef73090403a Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Sat, 11 Nov 2017 19:15:57 -0800 Subject: [PATCH] Differentiate visible/hidden comments for moderators --- app/models/comment.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/comment.rb b/app/models/comment.rb index 60daac47e..be656fc88 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -40,11 +40,19 @@ class Comment < ApplicationRecord end def hidden(user) - where("score < ? and is_sticky = false", user.comment_threshold) + if user.is_moderator? + where("(score < ? and is_sticky = false) or is_deleted = true", user.comment_threshold) + else + where("score < ? and is_sticky = false", user.comment_threshold) + end end def visible(user) - where("score >= ? or is_sticky = true", user.comment_threshold) + if user.is_moderator? + where("(score >= ? or is_sticky = true) and is_deleted = false", user.comment_threshold) + else + where("score >= ? or is_sticky = true", user.comment_threshold) + end end def deleted