From 66ee04a97761f58353fcf6f19850981a67aec944 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Tue, 26 Mar 2013 23:44:03 -0600 Subject: [PATCH] Don't show deleted comments in /comments --- r2/r2/controllers/listingcontroller.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py index f2761a877..c26d0a4b1 100755 --- a/r2/r2/controllers/listingcontroller.py +++ b/r2/r2/controllers/listingcontroller.py @@ -1041,11 +1041,15 @@ class CommentsController(ListingController): def keep_fn(self): def keep(item): - return (not item._spam or - (c.user_is_loggedin and - (item.author_id == c.user._id or - c.user_is_admin or - item.subreddit.is_moderator(c.user)))) + can_see_spam = (c.user_is_loggedin and + (item.author_id == c.user._id or + c.user_is_admin or + item.subreddit.is_moderator(c.user))) + can_see_deleted = c.user_is_loggedin and c.user_is_admin + + return ((not item._spam or can_see_spam) and + (not item._deleted or can_see_deleted)) + return keep def query(self):