fix: merge and preserve user roles during chat logging upsert

server/db.js

@@ -627,11 +627,10 @@ export async function logChatMessagesBatch(messages) {
       VALUES (?, ?, ?, ?, ?, ?)
       ON CONFLICT(username) DO UPDATE SET
         display_name = excluded.display_name,
-        is_mod = excluded.is_mod,
-        is_sub = excluded.is_sub,
-        is_vip = excluded.is_vip,
-        last_seen = excluded.last_seen
-      WHERE excluded.last_seen > chat_users.last_seen
+        is_mod = CASE WHEN excluded.is_mod = 1 THEN 1 ELSE chat_users.is_mod END,
+        is_sub = CASE WHEN excluded.is_sub = 1 THEN 1 ELSE chat_users.is_sub END,
+        is_vip = CASE WHEN excluded.is_vip = 1 THEN 1 ELSE chat_users.is_vip END,
+        last_seen = CASE WHEN excluded.last_seen > chat_users.last_seen THEN excluded.last_seen ELSE chat_users.last_seen END
     `);
 
     const runTransaction = sqliteDb.transaction((msgs) => {
@@ -703,16 +702,18 @@ export async function logChatMessagesBatch(messages) {
         is_streamer: msg.isStreamer || false
       });
 
-      const viewerKey = `${streamId || 'null'}-${username}`;
-      viewersToUpsert.set(viewerKey, {
-        stream_id: streamId,
-        username: msg.username.toLowerCase(),
-        display_name: msg.displayName || msg.username,
-        has_chatted: true,
-        is_mod: msg.isMod || false,
-        is_sub: msg.isSub || false,
-        first_seen: ts
-      });
+      if (streamId) {
+        const viewerKey = `${streamId}-${username}`;
+        viewersToUpsert.set(viewerKey, {
+          stream_id: streamId,
+          username: msg.username.toLowerCase(),
+          display_name: msg.displayName || msg.username,
+          has_chatted: true,
+          is_mod: msg.isMod || false,
+          is_sub: msg.isSub || false,
+          first_seen: ts
+        });
+      }
 
       const userKey = username;
       chatUsersToUpsert.set(userKey, {
@@ -749,15 +750,44 @@ export async function logChatMessagesBatch(messages) {
     if (uniqueChatUsers.length > 0) {
       const { data: existingUsers } = await supabase
         .from('chat_users')
-        .select('username, last_seen')
+        .select('username, last_seen, is_mod, is_sub, is_vip')
         .in('username', uniqueChatUsers.map(u => u.username));
       
-      const existingMap = new Map((existingUsers || []).map(u => [u.username, new Date(u.last_seen).getTime()]));
-      const toUpsert = uniqueChatUsers.filter(u => {
-         const oldTime = existingMap.get(u.username) || 0;
-         const newTime = new Date(u.last_seen).getTime();
-         return newTime > oldTime;
-      });
+      const existingMap = new Map((existingUsers || []).map(u => [
+        u.username,
+        {
+          last_seen: new Date(u.last_seen).getTime(),
+          is_mod: u.is_mod || false,
+          is_sub: u.is_sub || false,
+          is_vip: u.is_vip || false
+        }
+      ]));
+      
+      const toUpsert = [];
+      for (const u of uniqueChatUsers) {
+        const existing = existingMap.get(u.username);
+        if (existing) {
+          const oldTime = existing.last_seen;
+          const newTime = new Date(u.last_seen).getTime();
+          
+          const isUpgraded = (!existing.is_mod && u.is_mod) ||
+                             (!existing.is_sub && u.is_sub) ||
+                             (!existing.is_vip && u.is_vip);
+          
+          u.is_mod = u.is_mod || existing.is_mod;
+          u.is_sub = u.is_sub || existing.is_sub;
+          u.is_vip = u.is_vip || existing.is_vip;
+          
+          if (newTime > oldTime || isUpgraded) {
+            if (oldTime > newTime) {
+              u.last_seen = new Date(oldTime).toISOString();
+            }
+            toUpsert.push(u);
+          }
+        } else {
+          toUpsert.push(u);
+        }
+      }
 
       if (toUpsert.length > 0) {
          const { error: chatUserError } = await supabase
@@ -800,11 +830,10 @@ export async function logRolesBatch(users) {
       VALUES (?, ?, ?, ?, ?, ?)
       ON CONFLICT(username) DO UPDATE SET
         display_name = excluded.display_name,
-        is_mod = excluded.is_mod,
-        is_sub = excluded.is_sub,
-        is_vip = excluded.is_vip,
-        last_seen = excluded.last_seen
-      WHERE excluded.last_seen > chat_users.last_seen
+        is_mod = CASE WHEN excluded.is_mod = 1 THEN 1 ELSE chat_users.is_mod END,
+        is_sub = CASE WHEN excluded.is_sub = 1 THEN 1 ELSE chat_users.is_sub END,
+        is_vip = CASE WHEN excluded.is_vip = 1 THEN 1 ELSE chat_users.is_vip END,
+        last_seen = CASE WHEN excluded.last_seen > chat_users.last_seen THEN excluded.last_seen ELSE chat_users.last_seen END
     `);
 
     const runTransaction = sqliteDb.transaction((usersToInsert) => {
@@ -829,21 +858,44 @@ export async function logRolesBatch(users) {
     // Supabase Mode
     const { data: existingUsers } = await supabase
       .from('chat_users')
-      .select('username, last_seen')
+      .select('username, last_seen, is_mod, is_sub, is_vip')
       .in('username', uniqueChatUsers.map(u => u.username));
     
-    const existingMap = new Map((existingUsers || []).map(u => [u.username, new Date(u.last_seen).getTime()]));
+    const existingMap = new Map((existingUsers || []).map(u => [
+      u.username,
+      {
+        last_seen: new Date(u.last_seen).getTime(),
+        is_mod: u.is_mod || false,
+        is_sub: u.is_sub || false,
+        is_vip: u.is_vip || false
+      }
+    ]));
     
-    // Always update roles (is_mod/is_sub/is_vip), but only advance last_seen if newer
-    const toUpsert = uniqueChatUsers.map(u => {
-       const oldTime = existingMap.get(u.username) || 0;
-       const newTime = new Date(u.last_seen).getTime();
-       return {
-         ...u,
-         // Keep last_seen as the newer of the two
-         last_seen: newTime > oldTime ? u.last_seen : (existingUsers || []).find(e => e.username === u.username)?.last_seen || u.last_seen
-       };
-    });
+    const toUpsert = [];
+    for (const u of uniqueChatUsers) {
+      const existing = existingMap.get(u.username);
+      if (existing) {
+        const oldTime = existing.last_seen;
+        const newTime = new Date(u.last_seen).getTime();
+        
+        const isUpgraded = (!existing.is_mod && u.is_mod) ||
+                           (!existing.is_sub && u.is_sub) ||
+                           (!existing.is_vip && u.is_vip);
+        
+        u.is_mod = u.is_mod || existing.is_mod;
+        u.is_sub = u.is_sub || existing.is_sub;
+        u.is_vip = u.is_vip || existing.is_vip;
+        
+        if (newTime > oldTime || isUpgraded) {
+          if (oldTime > newTime) {
+            u.last_seen = new Date(oldTime).toISOString();
+          }
+          toUpsert.push(u);
+        }
+      } else {
+        toUpsert.push(u);
+      }
+    }
 
     if (toUpsert.length > 0) {
        const { error: chatUserError } = await supabase