From ec7b111699df15e35d0c3f4e18bc447a590ace7e Mon Sep 17 00:00:00 2001
From: Josh Creek <8179928+jcreek@users.noreply.github.com>
Date: Thu, 4 Apr 2024 12:10:07 +0100
Subject: [PATCH] fix(#30): Ensure kicking a user always works

---
 src/routes/estimation/[roomId]/+page.svelte | 9 ++++++++-
 src/server/websocket.ts                     | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/routes/estimation/[roomId]/+page.svelte b/src/routes/estimation/[roomId]/+page.svelte
index 27b84c7..7c6c5c1 100644
--- a/src/routes/estimation/[roomId]/+page.svelte
+++ b/src/routes/estimation/[roomId]/+page.svelte
@@ -1,6 +1,13 @@
 <script lang="ts">
 	const changesLog = [
-		{ timestamp: '2024-02-11T19:00:00', message: 'Added celebration when all users have the same estimate (cred: O. Nicholass)' },
+		{
+			timestamp: '2024-02-11T19:00:00',
+			message: 'Added fix to ensure that kicking a user always works'
+		},
+		{
+			timestamp: '2024-02-11T19:00:00',
+			message: 'Added celebration when all users have the same estimate (cred: O. Nicholass)'
+		},
 		{ timestamp: '2024-01-05T00:00:00', message: 'Added the ability to kick a user' },
 		{ timestamp: '2024-01-05T00:00:00', message: 'Added update notes' }
 	];
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 18d0563..3754e35 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -171,12 +171,16 @@ wss.on('connection', (ws: WebSocket, req) => {
 			console.log('kick user message received');
 			if (room) {
 				const userIdToKick = data.userId;
+
 				const ws = room.getWebSocketByUserId(userIdToKick);
 				console.log(userIdToKick, ws);
 				if (ws) {
 					console.log('closing ws');
 					ws.close();
 				}
+
+				// Remove them from the room even if the active websocket can't be found or can't be closed
+				room.removeUser(userIdToKick);
 			}
 		}
 	});