skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdfd

Browse source
This commit is contained in:
Aevann1 2022-02-25 18:34:55 +02:00
parent d66f4b96f5
commit b4138adb4e
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
files/routes/front.py
View file

@ -274,12 +274,11 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
elif subs: elif subs:
if v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) if v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
else: else:
if SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None) if subsonly:
else: posts = posts.filter(Submission.sub != None)
if subsonly: if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks))
posts = posts.filter(Submission.sub != None) elif SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None)
if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) elif v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
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) if gt: posts = posts.filter(Submission.created_utc > gt)
if lt: posts = posts.filter(Submission.created_utc < lt) if lt: posts = posts.filter(Submission.created_utc < lt)
@ -356,12 +355,11 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
elif subs: elif subs:
if v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) if v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
else: else:
if SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None) if subsonly:
else: pins = pins.filter(Submission.sub != None)
if subsonly: if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks))
pins = pins.filter(Submission.sub != None) elif SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None)
if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) elif v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
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: if v and v.admin_level == 0:
blocking = [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=v.id).all()] blocking = [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=v.id).all()]