kkkk
This commit is contained in:
parent
4c527477b2
commit
6336833655
1 changed files with 6 additions and 4 deletions
|
@ -161,6 +161,7 @@ def front_all(v, sub=None):
|
||||||
t=request.values.get('t', defaulttime)
|
t=request.values.get('t', defaulttime)
|
||||||
ccmode=request.values.get('ccmode', "false")
|
ccmode=request.values.get('ccmode', "false")
|
||||||
subs=session.get('subs', False)
|
subs=session.get('subs', False)
|
||||||
|
subsonly=request.values.get('subsonly', False)
|
||||||
|
|
||||||
try: gt=int(request.values.get("utc_greater_than", 0))
|
try: gt=int(request.values.get("utc_greater_than", 0))
|
||||||
except: gt=0
|
except: gt=0
|
||||||
|
@ -178,7 +179,8 @@ def front_all(v, sub=None):
|
||||||
gt=gt,
|
gt=gt,
|
||||||
lt=lt,
|
lt=lt,
|
||||||
sub=sub,
|
sub=sub,
|
||||||
site=SITE
|
site=SITE,
|
||||||
|
subsonly=subsonly
|
||||||
)
|
)
|
||||||
|
|
||||||
posts = get_posts(ids, v=v)
|
posts = get_posts(ids, v=v)
|
||||||
|
@ -264,7 +266,7 @@ def front_all(v, sub=None):
|
||||||
|
|
||||||
|
|
||||||
@cache.memoize(timeout=86400)
|
@cache.memoize(timeout=86400)
|
||||||
def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", subs=False, filter_words='', gt=0, lt=0, sub=None, site=None):
|
def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", subs=False, filter_words='', gt=0, lt=0, sub=None, site=None, subsonly=False):
|
||||||
|
|
||||||
posts = g.db.query(Submission)
|
posts = g.db.query(Submission)
|
||||||
|
|
||||||
|
@ -274,7 +276,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
||||||
else:
|
else:
|
||||||
if SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None)
|
if SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None)
|
||||||
else:
|
else:
|
||||||
if SITE_NAME == 'Ruqqus':
|
if subsonly:
|
||||||
posts = posts.filter(Submission.sub != None)
|
posts = posts.filter(Submission.sub != None)
|
||||||
if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks))
|
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)))
|
||||||
|
@ -356,7 +358,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
||||||
else:
|
else:
|
||||||
if SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None)
|
if SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None)
|
||||||
else:
|
else:
|
||||||
if SITE_NAME == 'Ruqqus':
|
if subsonly:
|
||||||
pins = pins.filter(Submission.sub != None)
|
pins = pins.filter(Submission.sub != None)
|
||||||
if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks))
|
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)))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue