From 1d1f3d1a3bceff0c0b90032311e1c85457153a3a Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 12 May 2023 22:37:26 +0300 Subject: [PATCH] dont give me modmail notifs on WPD (if its important they'll tell me) --- files/routes/static.py | 2 ++ files/routes/users.py | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 5b87c5095..df2579c16 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -282,6 +282,8 @@ def submit_contact(v): new_comment.top_comment_id = new_comment.id admin_ids = [x[0] for x in g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']).all()] + if SITE_NAME == 'watchpeopledie.tv': + admin_ids += AEVANN_ID for admin_id in admin_ids: notif = Notification(comment_id=new_comment.id, user_id=admin_id) diff --git a/files/routes/users.py b/files/routes/users.py index 6f1006c69..61c10012d 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -664,14 +664,14 @@ def messagereply(v:User): top_comment = c.top_comment if top_comment.sentto == MODMAIL_ID: - admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) + admin_ids = [x[0] for x in g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id).all()] + if SITE_NAME == 'watchpeopledie.tv': + admin_ids += AEVANN_ID - admins = [x[0] for x in admins.all()] + if parent.author.id not in admin_ids + [v.id]: + admin_ids.append(parent.author.id) - if parent.author.id not in admins + [v.id]: - admins.append(parent.author.id) - - for admin in admins: + for admin in admin_ids: notif = Notification(comment_id=c.id, user_id=admin) g.db.add(notif)