diff --git a/files/classes/comment.py b/files/classes/comment.py index 6d1f79914..28a3ba076 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -29,7 +29,7 @@ class Comment(Base): distinguish_level = Column(Integer, default=0) deleted_utc = Column(Integer, default=0) is_approved = Column(Integer, ForeignKey("users.id")) - level = Column(Integer, default=0) + level = Column(Integer, default=1) parent_comment_id = Column(Integer, ForeignKey("comments.id")) top_comment_id = Column(Integer) over_18 = Column(Boolean, default=False) diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index adadbd6d2..6cdc1a781 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -13,6 +13,9 @@ def create_comment(text_html, autojanny=False): distinguish_level=6) g.db.add(new_comment) g.db.flush() + + new_comment.top_comment_id = new_comment.id + return new_comment.id def send_repeatable_notification(uid, text, autojanny=False): diff --git a/files/routes/admin.py b/files/routes/admin.py index 247c5eb7e..f06c13cda 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -1007,6 +1007,9 @@ def shadowban(user_id, v): ) g.db.add(new_comment) g.db.flush() + + new_comment.top_comment_id = new_comment.id + for admin in g.db.query(User).filter(User.admin_level > 2, User.id != v.id).all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) g.db.add(notif) @@ -1189,6 +1192,9 @@ def ban_user(user_id, v): ) g.db.add(new_comment) g.db.flush() + + new_comment.top_comment_id = new_comment.id + for admin in g.db.query(User).filter(User.admin_level > 2, User.id != v.id).all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) g.db.add(notif) diff --git a/files/routes/front.py b/files/routes/front.py index e707e81e5..2dd80b416 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -108,7 +108,7 @@ def notifications(v): Comment.deleted_utc == 0, Comment.author_id != AUTOJANNY_ID, Comment.body_html.notlike('

New rdrama mention: 2).all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) g.db.add(notif) diff --git a/files/routes/static.py b/files/routes/static.py index 0e56a5411..81bdc8b28 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -312,6 +312,8 @@ def submit_contact(v): ) g.db.add(new_comment) g.db.flush() + new_comment.top_comment_id = new_comment.id + for admin in g.db.query(User).filter(User.admin_level > 1).all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) g.db.add(notif) diff --git a/files/routes/users.py b/files/routes/users.py index 281a28781..1c8b9521c 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -623,12 +623,14 @@ def message2(v, username): parent_submission=None, level=1, sentto=user.id, - body_html=text_html, + body_html=text_html ) g.db.add(c) g.db.flush() + c.top_comment_id = c.id + notif = Notification(comment_id=c.id, user_id=user.id) g.db.add(notif) @@ -670,7 +672,7 @@ def messagereply(v): new_comment = Comment(author_id=v.id, parent_submission=None, parent_comment_id=id, - top_comment_id=parent.top_comment_id if parent.top_comment_id else parent.id, + top_comment_id=parent.top_comment_id, level=parent.level + 1, sentto=user_id, body_html=text_html,