rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

same as last commit

pull/134/head
Aevann 2023-02-26 00:45:09 +02:00
parent 672e28b697
commit 691a025db8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
files/routes/notifications.py
View File

@ -307,7 +307,7 @@ def notifications(v:User):
cids = [x[0].id for x in comments]
listing = []
total = []
total = [x[0] for x in comments]
for c, n in comments:
if n.created_utc > 1620391248: c.notif_utc = n.created_utc
if not n.read:
@ -321,10 +321,10 @@ def notifications(v:User):
total.extend(c.replies2)
for x in c.replies2:
if x.replies2 == None: x.replies2 = []
count = 0
while count < 50 and c.parent_comment and ((count == 0 and c.parent_comment.id not in cids) or c.parent_comment.author_id == v.id or c.parent_comment.id in cids):
count += 1
def process(c):
c = c.parent_comment
total.append(c)
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)
@ -332,11 +332,19 @@ def notifications(v:User):
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)
count = 0
while count < 50 and c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids):
count += 1
process(c)
if count == 0 and c.parent_comment and c.parent_comment not in total:
process(c)
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)