From 6586890b6c65d33d5d371b1c328848d02f7a01d5 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Thu, 7 Aug 2025 22:27:57 +0200
Subject: [PATCH] feat: update WebSocket to handle new message format

---
 components/MessageArea.vue | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index 26645cd..26d4b74 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -40,9 +40,10 @@
 </template>
 
 <script lang="ts" setup>
-import type { MessageResponse, ScrollPosition, UserResponse } from '~/types/interfaces';
+import type { MessageResponse, ScrollPosition, UserResponse, WSMessage } from '~/types/interfaces';
 import scrollToBottom from '~/utils/scrollToBottom';
 import { generateIrcColor } from '#imports';
+import { WSEvent } from '~/types/enums';
 
 const { getDisplayName } = useProfile()
 const { fetchMe } = useApi()
@@ -195,16 +196,19 @@ if (accessToken && apiBase) {
 	ws.addEventListener("message", async (event) => {
 		console.log("event data:", event.data);
 		console.log("message uuid:", event.data.uuid);
-		const parsedData = JSON.parse(event.data);
-		console.log("[MSG] parsed message:", parsedData);
+		const message: WSMessage = JSON.parse(event.data);
+		console.log("[MSG] parsed message:", message);
 		
-		console.log("parsed message type:", messagesType.value[parsedData.uuid]);
-		console.log("parsed message timestamp:", messageTimestamps.value[parsedData.uuid]);
-		pushMessage(parsedData);
-		await nextTick();
-		if (messagesElement.value) {
-			console.log("scrolling to bottom");
-			scrollToBottom(messagesElement.value);
+		if (message.event == WSEvent.MessageSend) {
+			const messageObject = message.entity as MessageResponse;
+			console.log("parsed message type:", messagesType.value[messageObject.uuid]);
+			console.log("parsed message timestamp:", messageTimestamps.value[messageObject.uuid]);
+			pushMessage(messageObject);
+			await nextTick();
+			if (messagesElement.value) {
+				console.log("scrolling to bottom");
+				scrollToBottom(messagesElement.value);
+			}
 		}
 	});