From 4d81c37c08c04c343b54829306c9c33267c6e292 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 6 Jan 2022 19:28:27 +0200 Subject: [PATCH] fds --- files/routes/front.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/routes/front.py b/files/routes/front.py index e03a5865b..8c806603e 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -29,7 +29,7 @@ def notifications(v): modmail = request.values.get('modmail') posts = request.values.get('posts') if modmail and v.admin_level > 1: - comments = g.db.query(Comment).filter(Comment.sentto==0).order_by(Comment.created_utc.desc()).offset(25*(page-1)).limit(26).all() + comments = g.db.query(Comment).distinct(Comment.parent_comment_id).filter(Comment.sentto==0, not_(Comment.child_comments.any())).order_by(Comment.parent_comment_id.desc()).offset(25*(page-1)).limit(26).all() next_exists = (len(comments) > 25) comments = comments[:25] elif messages: @@ -37,7 +37,7 @@ def notifications(v): comments = g.db.query(Comment).distinct(Comment.parent_comment_id).filter(or_(Comment.author_id==v.id, Comment.sentto==v.id), Comment.parent_submission == None, Comment.sentto != None, not_(Comment.child_comments.any())).order_by(Comment.parent_comment_id.desc()).offset(25*(page-1)).limit(26).all() next_exists = (len(comments) > 25) - comments = comments[:25] + comments = comments[:24] elif posts: notifications = v.notifications.join(Notification.comment).filter(Comment.author_id == AUTOJANNY_ID).order_by(Notification.id.desc()).offset(25 * (page - 1)).limit(101).all()