Update server/server.js

server/server.js

@@ -91,11 +91,30 @@ function normalizeThumb(meta) {
     meta?.image_url,
     meta?.images?.[0],
     meta?.images?.medium,
-    meta?.images?.cover
+    meta?.images?.cover,
+    meta?.thumb
   ].filter(Boolean);
   return candidates[0] || null;
 }
 
+function findUserByName(room, targetNameRaw) {
+  if (!targetNameRaw) return null;
+  const targetName = String(targetNameRaw).replace(/^@/, '').trim().toLowerCase();
+  // Prefer exact match, else startsWith, else includes
+  let candidate = null;
+  for (const [id, u] of room.users.entries()) {
+    const n = (u.name || '').toLowerCase();
+    if (n === targetName) return { id, u };
+    if (!candidate && n.startsWith(targetName)) candidate = { id, u };
+  }
+  if (candidate) return candidate;
+  for (const [id, u] of room.users.entries()) {
+    const n = (u.name || '').toLowerCase();
+    if (n.includes(targetName)) return { id, u };
+  }
+  return null;
+}
+
 // ---------- API endpoints (JioSaavn proxy) ----------
 app.get('/api/result', async (req, res) => {
   try {
@@ -154,13 +173,7 @@ app.get('/api/ytsearch', async (req, res) => {
     if (!key) return res.status(501).json({ error: 'YouTube search unavailable: set YT_API_KEY env' });
     const q = req.query.q || '';
     const resp = await axios.get('https://www.googleapis.com/youtube/v3/search', {
-      params: {
-        key,
-        q,
-        part: 'snippet',
-        type: 'video',
-        maxResults: 10
-      },
+      params: { key, q, part: 'snippet', type: 'video', maxResults: 12 },
       timeout: 10000
     });
     const items = (resp.data.items || []).map(it => ({
@@ -211,7 +224,8 @@ io.on('connection', (socket) => {
     if (!room.name && roomName) room.name = String(roomName).trim().slice(0, 60) || null;
 
     const role = socket.id === room.hostId ? 'host' : 'member';
-    room.users.set(socket.id, { name: String(name || 'Guest').slice(0, 40), role });
+    const cleanName = String(name || 'Guest').slice(0, 40);
+    room.users.set(socket.id, { name: cleanName, role });
 
     socket.join(roomId);
     joinedRoom = roomId;
@@ -223,7 +237,7 @@ io.on('connection', (socket) => {
       roomName: room.name || room.id
     });
 
-    io.to(roomId).emit('system', { text: `System: ${name || 'Guest'} has joined the chat` });
+    io.to(roomId).emit('system', { text: `System: ${cleanName} has joined the chat` });
     broadcastMembers(roomId);
   });
 
@@ -248,15 +262,13 @@ io.on('connection', (socket) => {
     socket.to(roomId).emit('chat_message', { name, text, at: Date.now() });
   });
 
-  // User /play request -> notify host/cohosts and room
+  // /play request
   socket.on('song_request', ({ roomId, requester, query }) => {
     const room = rooms.get(roomId);
     if (!room) return;
     const payload = { requester, query, at: Date.now(), requestId: `${Date.now()}_${Math.random().toString(36).slice(2)}` };
     for (const [id, usr] of room.users.entries()) {
-      if (id === room.hostId || usr.role === 'cohost') {
-        io.to(id).emit('song_request', payload);
-      }
+      if (id === room.hostId || usr.role === 'cohost') io.to(id).emit('song_request', payload);
     }
     io.to(roomId).emit('system', { text: `System: ${requester} requested /play ${query}` });
   });
@@ -266,34 +278,31 @@ io.on('connection', (socket) => {
     const room = rooms.get(roomId);
     if (!room) return;
     if (!requireHostOrCohost(room, socket.id)) return;
-    if (action === 'accept' && track) {
-      room.track = {
+    if ((action === 'accept' || action === 'queue') && track) {
+      const t = {
         url: track.url,
         title: track.title || track.url,
         meta: track.meta || {},
         kind: track.kind || 'audio',
         thumb: track.thumb || normalizeThumb(track.meta || {})
       };
-      room.isPlaying = false;
-      room.anchor = 0;
-      room.anchorAt = Date.now();
-      io.to(roomId).emit('set_track', { track: room.track });
-      io.to(roomId).emit('pause', { anchor: 0, anchorAt: room.anchorAt });
-      io.to(roomId).emit('system', { text: `System: Now playing ${room.track.title}` });
-    } else if (action === 'queue' && track) {
-      room.queue.push({
-        url: track.url,
-        title: track.title || track.url,
-        meta: track.meta || {},
-        kind: track.kind || 'audio',
-        thumb: track.thumb || normalizeThumb(track.meta || {})
-      });
-      io.to(roomId).emit('queue_update', { queue: room.queue });
-      io.to(roomId).emit('system', { text: `System: Queued ${track.title || track.url}` });
+      if (action === 'accept') {
+        room.track = t;
+        room.isPlaying = false;
+        room.anchor = 0;
+        room.anchorAt = Date.now();
+        io.to(roomId).emit('set_track', { track: room.track });
+        io.to(roomId).emit('pause', { anchor: 0, anchorAt: room.anchorAt });
+        io.to(roomId).emit('system', { text: `System: Now playing ${room.track.title}` });
+      } else {
+        room.queue.push(t);
+        io.to(roomId).emit('queue_update', { queue: room.queue });
+        io.to(roomId).emit('system', { text: `System: Queued ${t.title}` });
+      }
     }
   });
 
-  // Host controls
+  // Host/cohost controls
   socket.on('set_track', ({ roomId, track }) => {
     const room = rooms.get(roomId);
     if (!room || !requireHostOrCohost(room, socket.id)) return;
@@ -333,7 +342,7 @@ io.on('connection', (socket) => {
     io.to(roomId).emit('seek', { anchor: room.anchor, anchorAt: room.anchorAt, isPlaying: room.isPlaying });
   });
 
-  // Ended -> auto next from queue
+  // Ended -> auto next
   socket.on('ended', ({ roomId }) => {
     const room = rooms.get(roomId);
     if (!room || !requireHostOrCohost(room, socket.id)) return;
@@ -347,7 +356,7 @@ io.on('connection', (socket) => {
       io.to(roomId).emit('set_track', { track: room.track });
       io.to(roomId).emit('pause', { anchor: 0, anchorAt: room.anchorAt });
       io.to(roomId).emit('queue_update', { queue: room.queue });
-      io.to(roomId).emit('system', { text: `System: Now playing ${room.track.title || room.track.url}` });
+      io.to(roomId).emit('system', { text: `System: Now playing ${room.track.title}` });
     } else {
       io.to(roomId).emit('system', { text: 'System: Queue ended' });
     }
@@ -360,32 +369,26 @@ io.on('connection', (socket) => {
     const actor = room.users.get(socket.id);
     if (!actor || !(socket.id === room.hostId || actor.role === 'cohost')) return;
 
-    let targetEntry = null;
-    for (const [id, u] of room.users.entries()) {
-      if (u.name && u.name.toLowerCase() === targetName.toLowerCase()) {
-        targetEntry = { id, u };
-        break;
-      }
-    }
-    if (!targetEntry) {
+    const found = findUserByName(room, targetName);
+    if (!found) {
       io.to(socket.id).emit('system', { text: `System: User @${targetName} not found` });
       return;
     }
 
     if (cmd === 'kick') {
-      const { id } = targetEntry;
+      const { id } = found;
       io.to(id).emit('system', { text: 'System: You were kicked by the host' });
       io.sockets.sockets.get(id)?.leave(roomId);
       room.users.delete(id);
-      io.to(roomId).emit('system', { text: `System: ${targetEntry.u.name} was kicked` });
+      io.to(roomId).emit('system', { text: `System: ${found.u.name} was kicked` });
       broadcastMembers(roomId);
     } else if (cmd === 'promote') {
-      targetEntry.u.role = 'cohost';
-      io.to(roomId).emit('system', { text: `System: ${targetEntry.u.name} was promoted to co-host` });
+      found.u.role = 'cohost';
+      io.to(roomId).emit('system', { text: `System: ${found.u.name} was promoted to co-host` });
       broadcastMembers(roomId);
     } else if (cmd === 'mute') {
-      targetEntry.u.muted = true;
-      io.to(roomId).emit('system', { text: `System: ${targetEntry.u.name} was muted` });
+      found.u.muted = true;
+      io.to(roomId).emit('system', { text: `System: ${found.u.name} was muted` });
       broadcastMembers(roomId);
     }
   });
@@ -412,7 +415,8 @@ io.on('connection', (socket) => {
       io.to(joinedRoom).emit('host_changed', { hostId: room.hostId });
     }
     if (leftUser) {
-      io.to(joinedRoom).emit('system', { text: `System: ${leftUser.name || 'User'} has left the chat` });
+      const nm = leftUser.name || 'User';
+      io.to(joinedRoom).emit('system', { text: `System: ${nm} has left the chat` });
     }
     if (room.users.size === 0) {
       rooms.delete(joinedRoom);