From c20a5e7486fcecafbad019766eab9bf551a698a5 Mon Sep 17 00:00:00 2001
From: doomtube <doomtube@realms.pub>
Date: Tue, 6 Jan 2026 17:33:07 -0500
Subject: [PATCH] Add automatic SSL certificate generation

---
 frontend/src/lib/chat/chatWebSocket.js | 57 +++++++++++++++-----------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/frontend/src/lib/chat/chatWebSocket.js b/frontend/src/lib/chat/chatWebSocket.js
index 60ca31f..fd71a37 100644
--- a/frontend/src/lib/chat/chatWebSocket.js
+++ b/frontend/src/lib/chat/chatWebSocket.js
@@ -103,30 +103,30 @@ class ChatWebSocket {
 	handleMessage(data) {
 		switch (data.type) {
 			case 'welcome':
-				// If we have a token, we're about to authenticate - don't set guest info
-				// The auth_success message will set the correct user info
-				if (!this.token) {
-					chatUserInfo.set({
-						username: data.username,
-						userId: data.userId,
-						isGuest: data.isGuest,
-						isModerator: data.isModerator,
-						isSiteModerator: data.isSiteModerator || false,
-						isStreamer: data.isStreamer || false,
-						isAdmin: data.isAdmin || false,
-						avatarUrl: data.avatarUrl || ''
-					});
+				// Always set initial user info from welcome message
+				// If auth succeeds, auth_success will upgrade to authenticated user
+				// This ensures proper fallback if auth fails (e.g., expired token)
+				chatUserInfo.set({
+					username: data.username,
+					userId: data.userId,
+					isGuest: data.isGuest,
+					isModerator: data.isModerator,
+					isSiteModerator: data.isSiteModerator || false,
+					isStreamer: data.isStreamer || false,
+					isAdmin: data.isAdmin || false,
+					avatarUrl: data.avatarUrl || '',
+					userColor: data.userColor || '#888888'
+				});
 
-					// If guest and has saved name in localStorage, rename immediately
-					if (data.isGuest && typeof localStorage !== 'undefined') {
-						const savedGuestName = localStorage.getItem('guestName');
-						if (savedGuestName && savedGuestName !== data.username) {
-							console.log('Restoring saved guest name:', savedGuestName);
-							// Delay slightly to ensure connection is fully established
-							setTimeout(() => {
-								this.sendRename(savedGuestName);
-							}, 100);
-						}
+				// If guest and has saved name in localStorage, rename immediately
+				if (data.isGuest && typeof localStorage !== 'undefined') {
+					const savedGuestName = localStorage.getItem('guestName');
+					if (savedGuestName && savedGuestName !== data.username) {
+						console.log('Restoring saved guest name:', savedGuestName);
+						// Delay slightly to ensure connection is fully established
+						setTimeout(() => {
+							this.sendRename(savedGuestName);
+						}, 100);
 					}
 				}
 				break;
@@ -175,9 +175,16 @@ class ChatWebSocket {
 
 			case 'error':
 				console.error('Chat error:', data.error);
-				// Show error to user
+				// Show error to user for actionable errors (not auth errors which are handled separately)
 				if (data.error && typeof window !== 'undefined') {
-					alert(data.error);
+					const errorMsg = data.error.toLowerCase();
+					// Don't alert for auth/token errors - user should re-login
+					const isAuthError = errorMsg.includes('token') ||
+						errorMsg.includes('unauthorized') ||
+						errorMsg.includes('auth');
+					if (!isAuthError) {
+						alert(data.error);
+					}
 				}
 				break;