From 22bf052b737f554fd4dfee801c04ee8f71036c0c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 18 Feb 2022 14:19:09 +0200 Subject: [PATCH] bcv --- files/routes/front.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index 3b01f040c5..786ebca579 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -270,8 +270,10 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if sub: posts = posts.filter_by(sub=sub.name) else: - if SITE_NAME == 'Ruqqus': posts = posts.filter(Submission.sub != None) - if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) + if SITE_NAME == 'Ruqqus': + posts = posts.filter(Submission.sub != None) + if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) + elif v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) if gt: posts = posts.filter(Submission.created_utc > gt) if lt: posts = posts.filter(Submission.created_utc < lt) @@ -346,8 +348,10 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False) if sub: pins = pins.filter_by(sub=sub.name) else: - if SITE_NAME == 'Ruqqus': pins = pins.filter(Submission.sub != None) - if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) + if SITE_NAME == 'Ruqqus': + pins = pins.filter(Submission.sub != None) + if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) + elif v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) if v and v.admin_level == 0: blocking = [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=v.id).all()]