From acde2c856bafb51615cd28f5be7578668a3452f6 Mon Sep 17 00:00:00 2001 From: TLSM Date: Sun, 12 Jun 2022 02:11:59 -0400 Subject: [PATCH] Enable JL2 viewing shadowbanned comments. --- files/classes/comment.py | 2 +- files/classes/submission.py | 2 +- files/classes/user.py | 4 ++-- files/helpers/get.py | 2 +- files/routes/comments.py | 2 +- files/routes/posts.py | 4 ++-- files/templates/comments.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 08c6d93db..db1780b76 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -75,7 +75,7 @@ class Comment(Base): @lazy def flags(self, v): flags = g.db.query(CommentFlag).filter_by(comment_id=self.id).order_by(CommentFlag.created_utc).all() - if not (v and (v.shadowbanned or v.admin_level > 2)): + if not (v and (v.shadowbanned or v.admin_level >= 2)): for flag in flags: if flag.user.shadowbanned: flags.remove(flag) diff --git a/files/classes/submission.py b/files/classes/submission.py index 14bd29684..466401415 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -79,7 +79,7 @@ class Submission(Base): @lazy def flags(self, v): flags = g.db.query(Flag).filter_by(post_id=self.id).order_by(Flag.created_utc).all() - if not (v and (v.shadowbanned or v.admin_level > 2)): + if not (v and (v.shadowbanned or v.admin_level >= 2)): for flag in flags: if flag.user.shadowbanned: flags.remove(flag) diff --git a/files/classes/user.py b/files/classes/user.py index 93478d707..f420712e6 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -561,8 +561,8 @@ class User(Base): 'bannerurl': self.banner_url, 'bio_html': self.bio_html_eager, 'coins': self.coins, - 'post_count': 0 if self.shadowbanned and not (v and (v.shadowbanned or v.admin_level > 2)) else self.post_count, - 'comment_count': 0 if self.shadowbanned and not (v and (v.shadowbanned or v.admin_level > 2)) else self.comment_count, + 'post_count': 0 if self.shadowbanned and not (v and (v.shadowbanned or v.admin_level >= 2)) else self.post_count, + 'comment_count': 0 if self.shadowbanned and not (v and (v.shadowbanned or v.admin_level >= 2)) else self.comment_count, 'badges': [x.path for x in self.badges], } diff --git a/files/helpers/get.py b/files/helpers/get.py index c015b6f2e..59b30df6c 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -231,7 +231,7 @@ def get_comments(cids, v=None, load_parent=False): blocked.c.target_id, ).filter(Comment.id.in_(cids)) - if not (v and (v.shadowbanned or v.admin_level > 2)): + if not (v and (v.shadowbanned or v.admin_level >= 2)): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) comments = comments.join( diff --git a/files/routes/comments.py b/files/routes/comments.py index f1118960b..2f5bbdd0c 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -128,7 +128,7 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): blocked.c.target_id, ) - if not (v and v.shadowbanned) and not (v and v.admin_level > 2): + if not (v and v.shadowbanned) and not (v and v.admin_level >= 2): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) comments=comments.filter( diff --git a/files/routes/posts.py b/files/routes/posts.py index f3687b865..ff515a0ea 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -166,7 +166,7 @@ def post_id(pid, anything=None, v=None, sub=None): blocked.c.target_id, ) - if not (v and v.shadowbanned) and not (v and v.admin_level > 2): + if not (v and v.shadowbanned) and not (v and v.admin_level >= 2): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) comments=comments.filter(Comment.parent_submission == post.id, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID))).join( @@ -297,7 +297,7 @@ def viewmore(v, pid, sort, offset): blocked.c.target_id, ).filter(Comment.parent_submission == pid, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID)), Comment.stickied == None, Comment.id.notin_(ids)) - if not (v and v.shadowbanned) and not (v and v.admin_level > 2): + if not (v and v.shadowbanned) and not (v and v.admin_level >= 2): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) comments=comments.join( diff --git a/files/templates/comments.html b/files/templates/comments.html index 8133ca1c0..fb46226e1 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -57,7 +57,7 @@ {% set downs=c.downvotes %} {% set score=ups-downs %} -{% if v and (v.shadowbanned or v.admin_level > 2) %} +{% if v and (v.shadowbanned or v.admin_level >= 2) %} {% set replies=c.replies3 %} {% else %} {% set replies=c.replies %}