From 5686f46a4a0de62921077fdca9535e826e01b59b Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Sat, 7 Aug 2021 17:19:53 +0200
Subject: [PATCH] gfgf

---
 files/classes/comment.py |  5 -----
 files/classes/user.py    | 16 ----------------
 files/helpers/get.py     |  6 +++++-
 files/routes/front.py    |  2 +-
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/files/classes/comment.py b/files/classes/comment.py
index 51b9d2578..28d87f091 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -52,11 +52,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
 
 	post = relationship("Submission")
 	flags = relationship("CommentFlag", lazy="dynamic")
-	votes = relationship(
-		"CommentVote",
-		lazy="dynamic",
-		primaryjoin="CommentVote.comment_id==Comment.id")
-
 	author = relationship(
 		"User",
 		lazy="joined",
diff --git a/files/classes/user.py b/files/classes/user.py
index 9f1a206e0..9bd3e8785 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -55,17 +55,6 @@ class User(Base, Stndrd, Age_times):
 	newtabexternal = Column(Boolean, default=True)
 	zzz = Column(Boolean, default=False)
 	oldreddit = Column(Boolean, default=False)
-	submissions = relationship(
-		"Submission",
-		lazy="dynamic",
-		primaryjoin="Submission.author_id==User.id",
-		)
-	comments = relationship(
-		"Comment",
-		lazy="dynamic",
-		primaryjoin="Comment.author_id==User.id")
-	votes = relationship("Vote", lazy="dynamic")
-	commentvotes = relationship("CommentVote", lazy="dynamic")
 	bio = Column(String, default="")
 	bio_html = Column(String, default="")
 	badges = relationship("Badge", lazy="dynamic")
@@ -104,11 +93,6 @@ class User(Base, Stndrd, Age_times):
 	_applications = relationship("OauthApp", lazy="dynamic")
 	authorizations = relationship("ClientAuth", lazy="dynamic")
 
-	saved_posts = relationship(
-		"SaveRelationship",
-		lazy="dynamic",
-		primaryjoin="User.id==SaveRelationship.user_id")
-
 	awards = relationship(
 		"AwardRelationship",
 		lazy="dynamic",
diff --git a/files/helpers/get.py b/files/helpers/get.py
index abf609e09..6172b47b9 100644
--- a/files/helpers/get.py
+++ b/files/helpers/get.py
@@ -199,7 +199,7 @@ def get_comment(i, v=None, graceful=False, **kwargs):
 	return comment
 
 
-def get_comments(cids, v=None):
+def get_comments(cids, v=None, load_parent=False):
 
 	if not cids: return []
 
@@ -245,6 +245,10 @@ def get_comments(cids, v=None):
 	else:
 		output = g.db.query(Comment).filter(Comment.id.in_(cids)).all()
 
+	if load_parent:
+		parents = [x.parent_comment_id for x in output if x.parent_comment_id]
+		parents = get_comments(parents, v=v)
+
 	return sorted(output, key=lambda x: cids.index(x.id))
 
 
diff --git a/files/routes/front.py b/files/routes/front.py
index 752c84ea7..bf6f84423 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -34,7 +34,7 @@ def notifications(v):
 		cids = v.notification_commentlisting(page=page, all_=all_)
 		next_exists = (len(cids) == 26)
 		cids = cids[:25]
-		comments = get_comments(cids, v=v)
+		comments = get_comments(cids, v=v, load_parent=True)
 
 	listing = []
 	for c in comments: