diff --git a/files/routes/static.py b/files/routes/static.py index 31298a135..b0d9938c0 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -252,7 +252,7 @@ def submit_contact(v): execute_under_siege(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'], User.id != AEVANN_ID) + admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']) 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 358c18bfb..da7c7621e 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -607,7 +607,10 @@ def messagereply(v:User): 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, User.id != AEVANN_ID) + admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) + + if SITE == 'rdrama.net': + admins = admins.filter(User.id != AEVANN_ID) admins = [x[0] for x in admins.all()]