diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 88cbd964e..57dc1d03d 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -13,13 +13,11 @@ def send_notification(uid, text, autojanny=False): text_html = CustomRenderer().render(mistletoe.Document(text)) text_html = sanitize(text_html) - author_id = AUTOJANNY_ID - - # if autojanny: author_id = AUTOJANNY_ID - # else: - # author_id = NOTIFICATIONS_ID - # existing = g.db.query(Comment.id).filter(Comment.author_id == author_id, Comment.body_html == text_html, Comment.notifiedto == uid).first() - # if existing: return + if autojanny: author_id = AUTOJANNY_ID + else: + author_id = NOTIFICATIONS_ID + existing = g.db.query(Comment.id).filter(Comment.author_id == author_id, Comment.body_html == text_html, Comment.notifiedto == uid).first() + if existing: return new_comment = Comment(author_id=author_id, parent_submission=None, @@ -31,8 +29,7 @@ def send_notification(uid, text, autojanny=False): g.db.flush() - notif = Notification(comment_id=new_comment.id, - user_id=uid) + notif = Notification(comment_id=new_comment.id, user_id=uid) g.db.add(notif) diff --git a/files/routes/admin.py b/files/routes/admin.py index 04940cd8c..b3ea08869 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -24,9 +24,21 @@ else: cc = "country club" @app.get("/notify") @admin_level_required(3) def notify(v): + + text_html = sanitize(CustomRenderer().render(mistletoe.Document("IMPORTANT: https://rdrama.net/post/30782/psa-make-sure-you-know-your"))) + + new_comment = Comment(author_id=AUTOJANNY_ID, + parent_submission=None, + distinguish_level=6, + body_html=text_html) + g.db.add(new_comment) + g.db.flush() + users = (x[0] for x in g.db.query(User.id).all()) for u in users: - send_notification(u, f"IMPORTANT: https://rdrama.net/post/30782/psa-make-sure-you-know-your") + notif = Notification(comment_id=new_comment.id, user_id=u) + g.db.add(notif) + g.db.commit() return "sex"