From 45fa9af644da58d0da4d7da91147c29a14d8f8b6 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 29 Mar 2022 19:39:47 +0200 Subject: [PATCH] sfd --- files/routes/front.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index 03c235e2c..2c086e224 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -295,13 +295,13 @@ 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 and subs == 1: - posts = posts.filter(Submission.sub == None) - elif subs == 1: + elif not v: + if subs == 1: posts = posts.filter(Submission.sub == None) + elif v.subs == 1: posts = posts.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs))) - elif subs == 2: + elif v.subs == 2: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - elif subs == 3: + elif v.subs == 3: posts = posts.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks)) @@ -373,12 +373,12 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if sub: pins = pins.filter_by(sub=sub.name) elif not v: - pins = pins.filter(Submission.sub == None) - elif subs == 1: + if subs == 1: pins = pins.filter(Submission.sub == None) + elif v.subs == 1: pins = pins.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs))) - elif subs == 2: + elif v.subs == 2: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - elif subs == 3: + elif v.subs == 3: pins = pins.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks)) if v and v.admin_level < 2: