dre
This commit is contained in:
parent
413f2931ee
commit
cb790e98d2
3 changed files with 12 additions and 13 deletions
|
@ -138,10 +138,10 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='
|
|||
if v and v.admin_level == 0:
|
||||
blocking = g.db.query(
|
||||
UserBlock.target_id).filter_by(
|
||||
user_id=v.id).subquery()
|
||||
user_id=v.id).all()
|
||||
blocked = g.db.query(
|
||||
UserBlock.user_id).filter_by(
|
||||
target_id=v.id).subquery()
|
||||
target_id=v.id).all()
|
||||
posts = posts.filter(
|
||||
Submission.author_id.notin_(blocking),
|
||||
Submission.author_id.notin_(blocked)
|
||||
|
@ -270,10 +270,10 @@ def changeloglist(v=None, sort="new", page=1 ,t="all", **kwargs):
|
|||
if v and v.admin_level == 0:
|
||||
blocking = g.db.query(
|
||||
UserBlock.target_id).filter_by(
|
||||
user_id=v.id).subquery()
|
||||
user_id=v.id).all()
|
||||
blocked = g.db.query(
|
||||
UserBlock.user_id).filter_by(
|
||||
target_id=v.id).subquery()
|
||||
target_id=v.id).all()
|
||||
posts = posts.filter(
|
||||
Submission.author_id.notin_(blocking),
|
||||
Submission.author_id.notin_(blocked)
|
||||
|
@ -378,7 +378,7 @@ def random_post(v):
|
|||
def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all", **kwargs):
|
||||
|
||||
posts = g.db.query(Submission).options(lazyload('*'))
|
||||
cc_idlist = g.db.query(Submission.id).options(lazyload('*')).filter(Submission.club == True).subquery()
|
||||
cc_idlist = g.db.query(Submission.id).options(lazyload('*')).filter(Submission.club == True).all()
|
||||
|
||||
posts = posts.subquery()
|
||||
|
||||
|
@ -387,10 +387,10 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all", **kwargs):
|
|||
if v and v.admin_level <= 3:
|
||||
blocking = g.db.query(
|
||||
UserBlock.target_id).filter_by(
|
||||
user_id=v.id).subquery()
|
||||
user_id=v.id).all()
|
||||
blocked = g.db.query(
|
||||
UserBlock.user_id).filter_by(
|
||||
target_id=v.id).subquery()
|
||||
target_id=v.id).all()
|
||||
|
||||
comments = comments.filter(
|
||||
Comment.author_id.notin_(blocking),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue