diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 37f11cb2c1..84cca0da99 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -88,7 +88,7 @@ def NOTIFY_USERS2(text, v): return notify_users -def send_admin(id, body_html): +def send_admin(id, body_html, vid): new_comment = Comment(author_id=id, parent_submission=None, @@ -99,7 +99,7 @@ def send_admin(id, body_html): g.db.add(new_comment) g.db.flush() - admins = g.db.query(User).filter(User.admin_level > 2).all() + admins = g.db.query(User).filter(User.admin_level > 2, User.id != vid).all() for admin in admins: notif = Notification(comment_id=new_comment.id, user_id=admin.id) g.db.add(notif) \ No newline at end of file diff --git a/files/routes/admin.py b/files/routes/admin.py index 52aae2b3b3..deb15cd0e2 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -765,7 +765,7 @@ def shadowban(user_id, v): body_html = sanitize(body) - send_admin(NOTIFICATIONS_ID, body_html) + send_admin(NOTIFICATIONS_ID, body_html, v.id) g.db.commit() return {"message": "User shadowbanned!"} @@ -930,7 +930,7 @@ def ban_user(user_id, v): body_html = sanitize(body) - send_admin(NOTIFICATIONS_ID, body_html) + send_admin(NOTIFICATIONS_ID, body_html, v.id) g.db.commit() diff --git a/files/routes/oauth.py b/files/routes/oauth.py index f45c21d8d6..815842b443 100644 --- a/files/routes/oauth.py +++ b/files/routes/oauth.py @@ -52,7 +52,7 @@ def request_api_keys(v): text_html = sanitize(text, noimages=True) - send_admin(NOTIFICATIONS_ID, text_html) + send_admin(NOTIFICATIONS_ID, text_html, v.id) g.db.commit() diff --git a/files/routes/static.py b/files/routes/static.py index 646bcbd878..9a21c2d295 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -295,7 +295,7 @@ def submit_contact(v): body_html += f"

{url}

" else: return {"error": "Image/Video files only"}, 400 - send_admin(v.id, body_html) + send_admin(v.id, body_html, v.id) g.db.commit() return render_template("contact.html", v=v, msg="Your message has been sent.")