From 64bdb679bdcbfd04351411dd54c119ad39363649 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 5 Dec 2021 20:52:03 +0200 Subject: [PATCH] sfdfsd --- files/helpers/get.py | 6 +++--- files/routes/front.py | 25 +++++++++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/files/helpers/get.py b/files/helpers/get.py index 9df2bcb5f..6a430506b 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -216,7 +216,7 @@ def get_comment(i, v=None, graceful=False): return comment -def get_comments(cids, v=None, load_parent=False): +def get_comments(cids, v=None, load_parent=False, shadowbanned=False): if not cids: return [] @@ -235,8 +235,8 @@ def get_comments(cids, v=None, load_parent=False): blocking.c.id, blocked.c.id, ).filter(Comment.id.in_(cids)) - - if not (v and v.shadowbanned) and not (v and v.admin_level > 1): + + if not shadowbanned and not v.shadowbanned 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/routes/front.py b/files/routes/front.py index 21bbf555f..dee68b686 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -367,7 +367,7 @@ def random_post(v): return redirect(f"/post/{post.id}") @cache.memoize(timeout=86400) -def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"): +def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all", shadowbanned=False): posts = g.db.query(Submission) cc_idlist = [x[0] for x in g.db.query(Submission.id).filter(Submission.club == True).all()] @@ -415,6 +415,7 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"): elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) + if shadowbanned: comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned != None) comments = comments.offset(25 * (page - 1)).limit(26).all() return [x[0] for x in comments] @@ -428,13 +429,21 @@ def all_comments(v): sort=request.values.get("sort", "new") t=request.values.get("t", defaulttimefilter) - idlist = comment_idlist(v=v, - page=page, - sort=sort, - t=t, - ) - - comments = get_comments(idlist, v=v) + if request.values.get("shadowbanned"): + idlist = comment_idlist(v=v, + page=page, + sort=sort, + t=t, + shadowbanned=true + ) + comments = get_comments(idlist, v=v, shadowbanned=True) + else: + idlist = comment_idlist(v=v, + page=page, + sort=sort, + t=t, + ) + comments = get_comments(idlist, v=v) next_exists = len(idlist) > 25