rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

fg

remotes/1693045480750635534/spooky-22
Aevann1 2022-03-29 19:35:11 +02:00
parent 948f8c314b
commit efa8903f18
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
files/routes/front.py
View File

@ -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: