From f626a15a6a58ec17ca8997f070415973ea9ac4f4 Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Fri, 17 Sep 2021 14:09:07 +0200
Subject: [PATCH] dre

---
 files/routes/front.py  | 14 +++++++-------
 files/routes/posts.py  |  7 +++----
 files/routes/search.py |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/files/routes/front.py b/files/routes/front.py
index 69e69e5fd..f4e31af8d 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -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),
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 9ac527276..b96a317c9 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).subquery()
+			shadowbanned = 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).subquery()
+			shadowbanned = 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,8 +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).subquery()
-
+		shadowbanned = 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 483489d2f..b9ff730ca 100644
--- a/files/routes/search.py
+++ b/files/routes/search.py
@@ -90,10 +90,10 @@ def searchlisting(criteria, v=None, page=1, t="None", sort="top", b=None):
 	elif v:
 		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),