carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

Revert "Revert "fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3256216?context=8#context"" 

This reverts commit 5a41160865.
master
Aevann 2022-12-24 00:29:04 +02:00
parent 5a41160865
commit 4d1183f3ec
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/routes/notifications.py
View File

@ -295,9 +295,9 @@ def notifications(v:User):
next_exists = (len(comments) > PAGE_SIZE)
comments = comments[:PAGE_SIZE]
cids = [x[0].id for x in comments]
comms = get_comments(cids, v=v)
listing = []
total = []
for c, n in comments:
if n.created_utc > 1620391248: c.notif_utc = n.created_utc
if not n.read:
@ -308,6 +308,7 @@ def notifications(v:User):
if c.parent_submission:
if c.replies2 == None:
c.replies2 = g.db.query(Comment).filter_by(parent_comment_id=c.id).filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).order_by(Comment.id.desc()).all()
total.extend(c.replies2)
for x in c.replies2:
if x.replies2 == None: x.replies2 = []
count = 0
@ -316,15 +317,25 @@ def notifications(v:User):
c = c.parent_comment
if c.replies2 == None:
c.replies2 = g.db.query(Comment).filter_by(parent_comment_id=c.id).filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).order_by(Comment.id.desc()).all()
total.extend(c.replies2)
for x in c.replies2:
if x.replies2 == None:
x.replies2 = g.db.query(Comment).filter_by(parent_comment_id=x.id).filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).order_by(Comment.id.desc()).all()
total.extend(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()
total.extend(c.replies2)
if c not in listing: listing.append(c)
total.extend(listing)
total_cids = [x.id for x in total]
total_cids.extend(cids)
total_cids = set(total_cids)
output = get_comments_v_properties(v, True, None, Comment.id.in_(total_cids))[1]
g.db.commit()