From 031d74efdb0c94ba6a1a5d6caa185602ab0486c8 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Feb 2022 18:39:03 +0200 Subject: [PATCH] fdsdsf --- files/routes/front.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index c38c06f72..4e8d8d7d9 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -271,14 +271,13 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" posts = g.db.query(Submission) if sub: posts = posts.filter_by(sub=sub.name) + elif subsonly: + posts = posts.filter(Submission.sub != None) + if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) elif subs: if v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - else: - if subsonly: - posts = posts.filter(Submission.sub != None) - if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) - elif SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None) - elif v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) + elif SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None) + 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) @@ -352,14 +351,13 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if (sort == "hot" or (v and v.id == Q_ID)) and page == 1 and ccmode == "false" and not gt and not lt: pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False) if sub: pins = pins.filter_by(sub=sub.name) + elif subsonly: + pins = pins.filter(Submission.sub != None) + if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) elif subs: if v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - else: - if subsonly: - pins = pins.filter(Submission.sub != None) - if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) - elif SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None) - elif v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) + elif SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None) + 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()]