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

fds

remotes/1693045480750635534/spooky-22
Aevann1 2022-04-29 17:22:31 +02:00
parent a6b26ece67
commit aefb322952
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
files/routes/front.py
View File

@ -304,12 +304,9 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
voted = [x[0] for x in g.db.query(Vote.submission_id).filter_by(user_id=v.id).all()]
posts = posts.filter(Submission.id.notin_(voted))
if sub:
posts = posts.filter_by(sub=sub.name)
elif not v:
if subs == 1: posts = posts.filter(Submission.sub == None)
else:
posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
if sub: posts = posts.filter_by(sub=sub.name)
elif not v: posts = posts.filter(Submission.sub == None)
else: 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)
@ -379,12 +376,9 @@ 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 not v:
if subs == 1: pins = pins.filter(Submission.sub == None)
else:
pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
if sub: pins = pins.filter_by(sub=sub.name)
elif not v: pins = pins.filter(Submission.sub == None)
else: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
if v and v.admin_level < 2:
pins = pins.filter(Submission.author_id.notin_(v.userblocks))