From efa8903f18372e78aa553baeb4707c6bc52344ad Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 29 Mar 2022 19:35:11 +0200 Subject: [PATCH] fg --- files/routes/front.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index 9ada36809..e214d93c4 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -285,7 +285,7 @@ def front_all(v, sub=None, subdomain=None): @cache.memoize(timeout=86400) -def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", filter_words='', gt=0, lt=0, sub=None, site=None, subs=None): +def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", filter_words='', gt=0, lt=0, sub=None, site=None, subs=2): posts = g.db.query(Submission) @@ -295,13 +295,11 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if sub: posts = posts.filter_by(sub=sub.name) - elif not v: - posts = posts.filter(Submission.sub == None) - elif v.subs == 1: + elif subs == 1: posts = posts.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs))) - elif v.subs == 2: + elif subs == 2: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - elif v.subs == 3: + elif subs == 3: posts = posts.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks)) @@ -372,13 +370,11 @@ 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) - elif not v: - pins = pins.filter(Submission.sub == None) - elif v.subs == 1: + elif subs == 1: pins = pins.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs))) - elif v.subs == 2: + elif subs == 2: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - elif v.subs == 3: + elif subs == 3: pins = pins.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks)) if v and v.admin_level < 2: