From f1275b90eb9913ee266afebb44f384d22d9b709d Mon Sep 17 00:00:00 2001 From: justcool393 Date: Thu, 6 Oct 2022 00:04:46 -0700 Subject: [PATCH] filter properly per poll: https://rdrama.net/post/79285/-/2845495 --- files/classes/user.py | 5 +---- files/routes/users.py | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 03160b4d9..59a157d72 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -458,12 +458,9 @@ class User(Base): posts = g.db.query(Submission.id).filter_by(author_id=self.id, is_pinned=False) - if not (v and (v.admin_level > PERMS['POST_COMMENT_MODERATION'] or v.id == self.id)): + if not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.id)): posts = posts.filter_by(is_banned=False, private=False, ghost=False) - if not (v and v.admin_level > PERMS['POST_COMMENT_MODERATION']): - posts = posts.filter_by(deleted_utc=0) - posts = apply_time_filter(t, posts, Submission) posts = sort_posts(sort, posts) diff --git a/files/routes/users.py b/files/routes/users.py index a958fcba9..a32a6274c 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -1145,12 +1145,10 @@ def u_username_comments(username, v=None): comments = comments.filter( Comment.is_banned == False, Comment.ghost == False, - comment_post_author.shadowbanned == None + comment_post_author.shadowbanned == None, + Comment.deleted_utc == 0, ) - if not (v and v.admin_level > PERMS['POST_COMMENT_MODERATION']): - comments = comments.filter(Comment.deleted_utc == 0) - comments = apply_time_filter(t, comments, Comment) comments = sort_comments(sort, comments)