skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pain

Browse source
This commit is contained in:
Aevann1 2022-04-04 01:44:54 +02:00
parent 29e34eeac9
commit 6ef1f41bf6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/classes/comment.py
View file

@ -54,7 +54,7 @@ class Comment(Base):
author = relationship("User", primaryjoin="User.id==Comment.author_id")
senttouser = relationship("User", primaryjoin="User.id==Comment.sentto", viewonly=True)
parent_comment = relationship("Comment", remote_side=[id], viewonly=True)
child_comments = relationship("Comment", remote_side=[parent_comment_id], viewonly=True)
child_comments = relationship("Comment", lazy="dynamic", remote_side=[parent_comment_id], viewonly=True)
awards = relationship("AwardRelationship", viewonly=True)
reports = relationship("CommentFlag", viewonly=True)

10
files/routes/front.py
View file

@ -124,13 +124,13 @@ def notifications(v):
listing = []
for c in comments:
if c.parent_submission:
c.replies2 = [x for x in c.child_comments if c.author_id == v.id or x.id in all]
if c.id == 1661969: print(c.replies2)
cids = cids | set(x.id for x in c.replies2)
if not c.replies2:
c.replies2 = c.child_comments.filter(Comment.author_id == v.id, Comment.id.in_(all)).all()
cids.update(x.id for x in c.replies2)
while c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment in comments):
c = c.parent_comment
c.replies2 = [x for x in c.child_comments if c.author_id == v.id or x.id in all]
cids = cids | set(x.id for x in c.replies2)
c.replies2 = c.child_comments.filter(Comment.author_id == v.id, Comment.id.in_(all)).all()
cids.update(x.id for x in c.replies2)
cids.add(c.id)
else:
while c.parent_comment: