forked from rDrama/rDrama
1
0
Fork 0
master
Aevann1 2022-02-25 18:34:55 +02:00
parent 9c02af1ed4
commit be445a99b1
1 changed files with 10 additions and 12 deletions

View File

@ -273,12 +273,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 subs:
if v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
else:
if SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None)
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)))
if gt: posts = posts.filter(Submission.created_utc > gt)
@ -355,12 +354,11 @@ 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 subs:
if v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
else:
if SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None)
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)))
if v and v.admin_level == 0: