From 5214f81d4955a7c96538771f3b8eeba16cdadc1f Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 4 Apr 2022 02:54:53 +0200
Subject: [PATCH] fds

---
 files/routes/front.py | 76 ++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 44 deletions(-)
diff --git a/files/routes/front.py b/files/routes/front.py
index b66b4121f..929cd83dc 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -102,7 +102,7 @@ def notifications(v):
 			g.db.add(c)
 		g.db.commit()
 
-		# print("1: " + str(time.time() - t), flush=True)
+		print("1: " + str(time.time() - t), flush=True)
 
 		comments = g.db.query(Comment).join(Notification).distinct(Comment.top_comment_id).filter(
 			Notification.user_id == v.id,
@@ -115,62 +115,50 @@ def notifications(v):
 		next_exists = (len(comments) > 25)
 		comments = comments[:25]
 
-		sex = time.time()
-		cids = [x[0] for x in g.db.query(Comment.id).join(Notification).filter(
-			Notification.user_id == v.id,
-			Comment.is_banned == False,
-			Comment.deleted_utc == 0,
-			Comment.author_id != AUTOJANNY_ID,
-			Comment.body_html.notlike('<html><body><p>New rdrama mention: <a href="https://old.reddit.com/r/%')
-		).order_by(Comment.top_comment_id.desc()).all()]
-		print(time.time() - sex)
+		print("2: " + str(time.time() - t), flush=True)
 
-		sex = time.time()
 		cids = g.db.query(Comment).join(Notification).filter(
 			Notification.user_id == v.id,
 			Comment.is_banned == False,
 			Comment.deleted_utc == 0,
 			Comment.author_id != AUTOJANNY_ID,
 			Comment.body_html.notlike('<html><body><p>New rdrama mention: <a href="https://old.reddit.com/r/%')
-		).order_by(Comment.top_comment_id.desc()).all()
-		print(time.time() - sex)
+		).order_by(Comment.top_comment_id.desc())
 
 
-	# 	# print("3: " + str(time.time() - t), flush=True)
+		print("3: " + str(time.time() - t), flush=True)
 
-	# 	listing = []
-	# 	for c in comments:
-	# 		if c.parent_submission:
-	# 			if c.replies2 == None:
-	# 				c.replies2 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
-	# 				for x in c.replies2:
-	# 					if x.replies2 == None: x.replies2 = []
-	# 			while c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids):
-	# 				c = c.parent_comment
-	# 				if c.replies2 == None:
-	# 					c.replies2 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
-	# 					for x in c.replies2:
-	# 						if x.replies2 == None: x.replies2 = []
-	# 		else:
-	# 			while c.parent_comment:
-	# 				c = c.parent_comment
-	# 			c.replies2 = g.db.query(Comment).filter_by(parent_comment_id=c.id).order_by(Comment.id).all()
+		listing = []
+		for c in comments:
+			if c.parent_submission:
+				if c.replies2 == None:
+					c.replies2 = c.child_comments.filter(Comment.author_id == v.id).all() + cids.filter(Comment.parent_comment_id == c.id).all()
+					for x in c.replies2:
+						if x.replies2 == None: x.replies2 = []
+				while c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids):
+					c = c.parent_comment
+					if c.replies2 == None:
+						c.replies2 = c.child_comments.filter(Comment.author_id == v.id).all() + cids.filter(Comment.parent_comment_id == c.id).all()
+						for x in c.replies2:
+							if x.replies2 == None: x.replies2 = []
+			else:
+				while c.parent_comment:
+					c = c.parent_comment
+				c.replies2 = g.db.query(Comment).filter_by(parent_comment_id=c.id).order_by(Comment.id).all()
 
-	# 		if c not in listing: listing.append(c)
+			if c not in listing: listing.append(c)
 
-	# if request.headers.get("Authorization"): return {"data":[x.json for x in listing]}
+	if request.headers.get("Authorization"): return {"data":[x.json for x in listing]}
 
-	# print("5: " + str(time.time() - t), flush=True)
-	# return render_template("notifications.html",
-	# 						v=v,
-	# 						notifications=listing,
-	# 						next_exists=next_exists,
-	# 						page=page,
-	# 						standalone=True,
-	# 						render_replies=True
-	# 					   )
-
-	return 'fuq'
+	print("5: " + str(time.time() - t), flush=True)
+	return render_template("notifications.html",
+							v=v,
+							notifications=listing,
+							next_exists=next_exists,
+							page=page,
+							standalone=True,
+							render_replies=True
+						   )
 
 
 @app.get("/")
