From 028a92162bb0888de71d8fca211a72694355e619 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Wed, 9 Aug 2023 18:19:43 +0300
Subject: [PATCH] make blocking affect chat too

---
 files/assets/js/chat.js   |  6 ++++++
 files/routes/chat.py      | 12 +++++++++---
 files/templates/chat.html |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js
index 71d5b5809d..24ba5052ce 100644
--- a/files/assets/js/chat.js
+++ b/files/assets/js/chat.js
@@ -64,7 +64,13 @@ function flash(){
 }
 
 
+const blocked_user_ids = document.getElementById('blocked_user_ids').value.split(',')
+
 socket.on('speak', function(json) {
+	if (blocked_user_ids.includes(json.user_id.toString())) {
+		return
+	}
+
 	let text
 	let text_html
 
diff --git a/files/routes/chat.py b/files/routes/chat.py
index 0e0425cda6..c3ad1449bd 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -55,10 +55,13 @@ def chat(v):
 	if not v.admin_level and TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM:
 		abort(403, f"Need at least {TRUESCORE_CHAT_MINIMUM} truescore for access to chat!")
 	orgy = get_orgy()
+
+	displayed_messages = {k: val for k, val in messages.items() if val["user_id"] not in v.userblocks}
+
 	if orgy:
-		return render_template("orgy.html", v=v, messages=messages, orgy = orgy, site = SITE)
+		return render_template("orgy.html", v=v, messages=displayed_messages, orgy=orgy, site=SITE)
 	else:
-		return render_template("chat.html", v=v, messages=messages)
+		return render_template("chat.html", v=v, messages=displayed_messages)
 
 @app.get("/old_chat")
 @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400)
@@ -67,7 +70,10 @@ def chat(v):
 def old_chat(v):
 	if not v.admin_level and TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM:
 		abort(403, f"Need at least {TRUESCORE_CHAT_MINIMUM} truescore for access to chat!")
-	return render_template("chat.html", v=v, messages=messages)
+
+	displayed_messages = {k: val for k, val in messages.items() if val["user_id"] not in v.userblocks}
+
+	return render_template("chat.html", v=v, messages=displayed_messages)
 
 @socketio.on('speak')
 @is_not_banned_socketio
diff --git a/files/templates/chat.html b/files/templates/chat.html
index a8dd9e8b5e..0a7ea2ed50 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -33,6 +33,7 @@
 	<input id="site_name" hidden value="{{SITE_NAME}}">
 	<input id="slurreplacer" hidden value="{{v.slurreplacer}}">
 	<input id="admin_level" hidden value="{{v.admin_level}}">
+	<input id="blocked_user_ids" hidden value="{{(v.userblocks|string)[1:-1]}}">
 	<script defer src="{{'js/vendor/socketio.js' | asset}}"></script>
 	<script defer src="{{'js/chat.js' | asset}}"></script>
 	<script defer src="{{'js/vendor/lozad.js' | asset}}"></script>