Merge pull request #170 from cephie-studios/canary

Canary

Author: 1ceit

public/assets/app/charts/LCLK/LCLK_DEP_1.png

@@ -95,6 +95,13 @@ export function setupChatWebsocket(
 
       socket.join(sessionId);
 
+      socket.on('typing', ({ username }: { username: string }) => {
+        if (typeof username !== 'string' || username.length === 0 || username.length > 50) {
+          return;
+        }
+        socket.to(sessionId).emit('userTyping', { userId, username });
+      });
+
       socket.on('chatMessage', async ({ user, message }) => {
         const sessionId = socket.data.sessionId;
         if (!sessionId || !message || message.length > 500) return;

public/assets/app/sounds/vcConnect.mp3

@@ -138,6 +138,18 @@ export function setupGlobalChatWebsocket(
       return;
     }
 
+    try {
+      const user = await mainDb
+        .selectFrom('users')
+        .select(['username'])
+        .where('id', '=', userId)
+        .executeTakeFirst();
+      socket.data.username = user?.username || 'Unknown';
+    } catch (error) {
+      console.error('[Global Chat] Error fetching username:', error);
+      socket.data.username = 'Unknown';
+    }
+
     socket.data.userId = userId;
     socket.data.station = station;
     socket.data.position = position;
@@ -160,7 +172,7 @@ export function setupGlobalChatWebsocket(
 
         connectedGlobalChatUsers.set(userId, {
           id: userId,
-          username: user?.username || 'Unknown',
+          username: socket.data.username,
           avatar: avatarUrl,
           station: station,
           position: position || null,
@@ -188,8 +200,12 @@ export function setupGlobalChatWebsocket(
       }
     }
 
+    socket.on('globalTyping', ({ username }: { username: string }) => {
+      socket.broadcast.emit('globalUserTyping', { userId, username: socket.data.username });
+    });
+
     socket.on('globalChatMessage', async ({ user, message }) => {
-      if (!message || message.length > 500) return;
+      if (!message || message.length > 500 || user.userId !== socket.data.userId) return;
 
       const sanitizedMessage = sanitizeMessage(message, 500);
       if (!sanitizedMessage) return;
@@ -204,7 +220,7 @@ export function setupGlobalChatWebsocket(
 
         connectedGlobalChatUsers.set(user.userId, {
           id: user.userId,
-          username: user.username || existingUser?.username || 'Unknown',
+          username: socket.data.username,
           avatar: avatarUrl || existingUser?.avatar || null,
           station: socket.data.station,
           position: socket.data.position || null,