diff --git a/files/classes/user.py b/files/classes/user.py index 3dbac3bfc7..6537b7e9bf 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -567,12 +567,12 @@ class User(Base, Stndrd, Age_times): posts = posts.filter(Submission.id.in_(saved)) if self.admin_level == 0: - blocking = g.db.query( + blocking = [x[0] for x in g.db.query( UserBlock.target_id).filter_by( - user_id=self.id).all() - blocked = g.db.query( + user_id=self.id).all()] + blocked = [x[0] for x in g.db.query( UserBlock.user_id).filter_by( - target_id=self.id).all() + target_id=self.id).all()] posts = posts.filter( Submission.author_id.notin_(blocking), @@ -591,12 +591,12 @@ class User(Base, Stndrd, Age_times): comments = comments.filter(Comment.id.in_(saved)) if self.admin_level == 0: - blocking = g.db.query( + blocking = [x[0] for x in g.db.query( UserBlock.target_id).filter_by( - user_id=self.id).all() - blocked = g.db.query( + user_id=self.id).all()] + blocked = [x[0] for x in g.db.query( UserBlock.user_id).filter_by( - target_id=self.id).all() + target_id=self.id).all()] comments = comments.filter( Comment.author_id.notin_(blocking), diff --git a/files/routes/front.py b/files/routes/front.py index f4e31af8da..dae1ad4437 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -136,12 +136,12 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words=' posts = posts.filter_by(processing=False) if v and v.admin_level == 0: - blocking = g.db.query( + blocking = [x[0] for x in g.db.query( UserBlock.target_id).filter_by( - user_id=v.id).all() - blocked = g.db.query( + user_id=v.id).all()] + blocked = [x[0] for x in g.db.query( UserBlock.user_id).filter_by( - target_id=v.id).all() + target_id=v.id).all()] posts = posts.filter( Submission.author_id.notin_(blocking), Submission.author_id.notin_(blocked) @@ -268,12 +268,12 @@ def changeloglist(v=None, sort="new", page=1 ,t="all", **kwargs): posts = g.db.query(Submission).options(lazyload('*')).options(lazyload('*')).filter_by(is_banned=False, private=False,).filter(Submission.deleted_utc == 0) if v and v.admin_level == 0: - blocking = g.db.query( + blocking = [x[0] for x in g.db.query( UserBlock.target_id).filter_by( - user_id=v.id).all() - blocked = g.db.query( + user_id=v.id).all()] + blocked = [x[0] for x in g.db.query( UserBlock.user_id).filter_by( - target_id=v.id).all() + target_id=v.id).all()] posts = posts.filter( Submission.author_id.notin_(blocking), Submission.author_id.notin_(blocked) @@ -378,19 +378,19 @@ 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).all() + cc_idlist = [x[0] for x in g.db.query(Submission.id).options(lazyload('*')).filter(Submission.club == True).all()] posts = posts.subquery() comments = g.db.query(Comment).options(lazyload('*')).options(lazyload('*')).filter(Comment.parent_submission.notin_(cc_idlist)) if v and v.admin_level <= 3: - blocking = g.db.query( + blocking = [x[0] for x in g.db.query( UserBlock.target_id).filter_by( - user_id=v.id).all() - blocked = g.db.query( + user_id=v.id).all()] + blocked = [x[0] for x in g.db.query( UserBlock.user_id).filter_by( - target_id=v.id).all() + target_id=v.id).all()] comments = comments.filter( Comment.author_id.notin_(blocking), diff --git a/files/routes/posts.py b/files/routes/posts.py index b96a317c9f..14202889bc 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -110,7 +110,7 @@ def post_id(pid, anything=None, v=None): blocked = v.blocked.subquery() if not (v and v.shadowbanned) and not (v and v.admin_level == 6): - shadowbanned = g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned == True).all() + shadowbanned = [x[0] for x in g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned == True).all()] comments = g.db.query(Comment).options(lazyload('*')).filter(Comment.author_id.notin_(shadowbanned)) comments = g.db.query( @@ -121,7 +121,7 @@ def post_id(pid, anything=None, v=None): ) if not (v and v.shadowbanned) and not (v and v.admin_level == 6): - shadowbanned = g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned == True).all() + shadowbanned = [x[0] for x in g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned == True).all()] comments = comments.filter(Comment.author_id.notin_(shadowbanned)) if v.admin_level >=4: @@ -170,7 +170,7 @@ def post_id(pid, anything=None, v=None): post.preloaded_comments = output else: - shadowbanned = g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned == True).all() + shadowbanned = [x[0] for x in g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned == True).all()] comments = g.db.query(Comment).options(lazyload('*')).filter(Comment.parent_submission == post.id, Comment.author_id.notin_(shadowbanned)) if sort == "top": diff --git a/files/routes/search.py b/files/routes/search.py index b9ff730ca0..faac30f8a7 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -88,12 +88,12 @@ def searchlisting(criteria, v=None, page=1, t="None", sort="top", b=None): if v and v.admin_level >= 4: pass elif v: - blocking = g.db.query( + blocking = [x[0] for x in g.db.query( UserBlock.target_id).filter_by( - user_id=v.id).all() - blocked = g.db.query( + user_id=v.id).all()] + blocked = [x[0] for x in g.db.query( UserBlock.user_id).filter_by( - target_id=v.id).all() + target_id=v.id).all()] posts = posts.filter( Submission.author_id.notin_(blocking),