From b2210c68336fef37a7ebbb9a800caf721f038e29 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 25 Nov 2022 22:56:11 +0200 Subject: [PATCH] make me not see modmail, if its important the other jannies will tell me --- files/routes/static.py | 4 +--- files/routes/users.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 6c90bc49f..975b7d820 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -235,9 +235,7 @@ def submit_contact(v): execute_blackjack(v, new_comment, new_comment.body_html, 'modmail') new_comment.top_comment_id = new_comment.id - admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']) - if SITE == 'watchpeopledie.tv': - admins = admins.filter(User.id != AEVANN_ID) + admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != AEVANN_ID) for admin in admins.all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) diff --git a/files/routes/users.py b/files/routes/users.py index 605cc1178..09e1373b3 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -550,9 +550,7 @@ def messagereply(v): top_comment = c.top_comment(g.db) if top_comment.sentto == MODMAIL_ID: - admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) - if SITE == 'watchpeopledie.tv': - admins = admins.filter(User.id != AEVANN_ID) + admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id, User.id != AEVANN_ID) admins = [x[0] for x in admins.all()]