Update index.js

index.js

@@ -34,7 +34,7 @@ console.log(">>> [BOOT] Loading Web Server module...");
 const server = require('./server');
 console.log(">>> [BOOT] Web Server module loaded.");
 
-const { guildLineups, guildSelectedFormation, lineupOwners, activeLineupMessages, managerBoards, guildCustomFormations, guildCustomFormationNames, guildPingType, guildFriendlyPingType, save: saveLineup } = require('./lineup_persistence');
+const { guildLineups, guildSelectedFormation, lineupOwners, activeLineupMessages, managerBoards, guildCustomFormations, guildCustomFormationNames, guildPingType, guildFriendlyPingType, guildScrimMode, save: saveLineup } = require('./lineup_persistence');
 const guildActiveCategory = new Map(); // Stores the currently selected category in the UI for each guild
 
 try {
@@ -514,31 +514,32 @@ client.on('messageCreate', async (message) => {
         return;
     }
 
-    if (commandName === 'lineup') {
-        if (!roleStorage.isWhitelisted(message.guildId, message.member)) return sendNoPermission(message);
+if (commandName === 'lineup') {
+  if (!roleStorage.isWhitelisted(message.guildId, message.member)) return sendNoPermission(message);
 
-        const mentionArg = args[0] ? args[0].toLowerCase().replace('@', '') : null;
-        const pingType = mentionArg === 'here' ? 'here' : 'everyone';
-        guildPingType.set(message.guildId, pingType);
+  const mentionArg = args[0] ? args[0].toLowerCase().replace('@', '') : null;
+  const pingType = mentionArg === 'here' ? 'here' : 'everyone';
+  guildPingType.set(message.guildId, pingType);
 
-        lineupOwners.set(message.guildId, message.author.id);
-        saveLineup();
+  lineupOwners.set(message.guildId, message.author.id);
+  guildScrimMode.set(message.guildId, false); // Clear scrim mode
+  saveLineup();
 
-        // Clear lineup before showing to ensure no names in it
-        const lineup = getGuildLineup(message.guildId);
-        lineup.clear();
-        saveLineup();
+  // Clear lineup before showing to ensure no names in it
+  const lineup = getGuildLineup(message.guildId);
+  lineup.clear();
+  saveLineup();
 
-        // Show lineup immediately without waiting for reactions
-console.log(`[DEBUG] LINEUP-MSG: guild=${message.guildId} pingType=${pingType} owner=${message.author?.id || 'unknown'}`);
+  // Show lineup immediately without waiting for reactions
+  console.log(`[DEBUG] LINEUP-MSG: guild=${message.guildId} pingType=${pingType} owner=${message.author?.id || 'unknown'}`);
   const view = createLineupView(message.guildId);
   const msg = await message.channel.send(view);
   activeLineupMessages.set(message.guildId, { channelId: message.channelId, messageId: msg.id });
   addToCleanupQueue(message.guildId, message.channelId, msg.id, 'lineup');
   return;
-  }
+}
 
-  if (commandName === 'scrimlineup') {
+if (commandName === 'scrimlineup') {
   if (!roleStorage.isWhitelisted(message.guildId, message.member)) return sendNoPermission(message);
 
   const mentionArg = args[0] ? args[0].toLowerCase().replace('@', '') : null;
@@ -546,6 +547,7 @@ console.log(`[DEBUG] LINEUP-MSG: guild=${message.guildId} pingType=${pingType} o
   guildPingType.set(message.guildId, pingType);
 
   lineupOwners.set(message.guildId, message.author.id);
+  guildScrimMode.set(message.guildId, true); // Set scrim mode
   saveLineup();
 
   const lineup = getGuildLineup(message.guildId);
@@ -558,7 +560,7 @@ console.log(`[DEBUG] LINEUP-MSG: guild=${message.guildId} pingType=${pingType} o
   activeLineupMessages.set(message.guildId, { channelId: message.channelId, messageId: msg.id });
   addToCleanupQueue(message.guildId, message.channelId, msg.id, 'lineup');
   return;
-  }
+}
 
   if (commandName === 'top') {
         const sorted = Object.entries(storage.data.stats).sort((a, b) => (b[1].matches || 0) - (a[1].matches || 0)).slice(0, 10);
@@ -846,16 +848,17 @@ console.log(`[DEBUG] LINEUP-MSG: guild=${message.guildId} pingType=${pingType} o
         await message.reply(`✅ Swapped <@${p1.id}> with <@${p2.id}>!`);
 
         // Update the board
-        const boardInfo = activeLineupMessages.get(message.guildId);
-        if (boardInfo) {
-            try {
-                const channel = await client.channels.fetch(boardInfo.channelId);
-                const msg = await channel.messages.fetch(boardInfo.messageId);
-                if (msg) await msg.edit(createLineupView(message.guildId));
-            } catch (e) {}
-        }
-        return;
-    }
+const boardInfo = activeLineupMessages.get(message.guildId);
+  if (boardInfo) {
+    try {
+      const channel = await client.channels.fetch(boardInfo.channelId);
+      const msg = await channel.messages.fetch(boardInfo.messageId);
+      const isScrim = guildScrimMode.get(message.guildId) === true;
+      if (msg) await msg.edit(isScrim ? createScrimLineupView(message.guildId) : createLineupView(message.guildId));
+    } catch (e) {}
+  }
+  return;
+}
 
     if (commandName === 'sync' || commandName === 'sync_cmds') {
         if (!message.member.permissions.has('Administrator')) return;
@@ -1501,6 +1504,7 @@ if (interaction.commandName === 'lineup') {
     guildPingType.set(interaction.guildId, pingType);
 
     lineupOwners.set(interaction.guildId, interaction.user.id);
+    guildScrimMode.set(interaction.guildId, false); // Clear scrim mode
     saveLineup();
     const row1 = new ActionRowBuilder().addComponents(
       new StringSelectMenuBuilder()
@@ -1543,6 +1547,7 @@ if (interaction.commandName === 'lineup') {
     guildPingType.set(interaction.guildId, pingType);
 
     lineupOwners.set(interaction.guildId, interaction.user.id);
+    guildScrimMode.set(interaction.guildId, true); // Set scrim mode
     saveLineup();
 
     const lineup = getGuildLineup(interaction.guildId);
@@ -1628,16 +1633,17 @@ if (interaction.commandName === 'lineup') {
 
             await safeReply(interaction, { content: `✅ Swapped <@${p1.id}> with <@${p2.id}>!`, flags: [MessageFlags.Ephemeral] });
 
-            // Update the board
-            const boardInfo = activeLineupMessages.get(interaction.guildId);
-            if (boardInfo) {
-                try {
-                    const channel = await client.channels.fetch(boardInfo.channelId);
-                    const msg = await channel.messages.fetch(boardInfo.messageId);
-                    if (msg) await msg.edit(createLineupView(interaction.guildId));
-                } catch (e) {}
-            }
-        }
+// Update the board
+  const boardInfo = activeLineupMessages.get(interaction.guildId);
+  if (boardInfo) {
+    try {
+      const channel = await client.channels.fetch(boardInfo.channelId);
+      const msg = await channel.messages.fetch(boardInfo.messageId);
+      const isScrim = guildScrimMode.get(interaction.guildId) === true;
+      if (msg) await msg.edit(isScrim ? createScrimLineupView(interaction.guildId) : createLineupView(interaction.guildId));
+    } catch (e) {}
+  }
+}
 
         if (interaction.commandName === 'sendlink') {
             if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return safeReply(interaction, { content: "❌ No Permission", flags: [MessageFlags.Ephemeral] });
@@ -1892,14 +1898,15 @@ if (interaction.commandName === 'lineup') {
             const tempKey = `custom_${guildId}`;
             guildSelectedFormation.set(guildId, tempKey);
             
-            // Clear current lineup as formation changed
-            const map = new Map();
-            guildLineups.set(guildId, map);
-            saveLineup();
+// Clear current lineup as formation changed
+  const map = new Map();
+  guildLineups.set(guildId, map);
+  saveLineup();
 
-            const view = createLineupView(guildId);
+  const isScrim = guildScrimMode.get(guildId) === true;
+  const view = isScrim ? createScrimLineupView(guildId) : createLineupView(guildId);
 
-            // If the modal was triggered from a message (like the initial setup message), update it!
+  // If the modal was triggered from a message (like the initial setup message), update it!
             if (interaction.message) {
                 await interaction.update(view);
                 activeLineupMessages.set(guildId, { channelId: interaction.channelId, messageId: interaction.message.id });
@@ -1926,31 +1933,33 @@ if (interaction.commandName === 'lineup') {
         }
     }
 
-    if (interaction.isStringSelectMenu() && interaction.customId.startsWith('formation_select_initial_')) {
-        if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return sendNoPermission(interaction);
+if (interaction.isStringSelectMenu() && interaction.customId.startsWith('formation_select_initial_')) {
+  if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return sendNoPermission(interaction);
 
-        const ownerId = lineupOwners.get(interaction.guildId);
-        if (ownerId && interaction.user.id !== ownerId) {
-            return interaction.reply({ content: `❌ Only <@${ownerId}> can initialize this lineup!`, ephemeral: true });
-        }
+  const ownerId = lineupOwners.get(interaction.guildId);
+  if (ownerId && interaction.user.id !== ownerId) {
+    return interaction.reply({ content: `❌ Only <@${ownerId}> can initialize this lineup!`, ephemeral: true });
+  }
 
-        const guildId = interaction.guildId;
-        const formKey = interaction.values[0];
-        guildSelectedFormation.set(guildId, formKey);
-        
-        // Clear current lineup as formation changed
-        const map = new Map();
-        guildLineups.set(guildId, map);
-        saveLineup();
+  const guildId = interaction.guildId;
+  const formKey = interaction.values[0];
+  guildSelectedFormation.set(guildId, formKey);
 
-        const view = createLineupView(guildId);
-        await interaction.update(view);
+  // Clear current lineup as formation changed
+  const map = new Map();
+  guildLineups.set(guildId, map);
+  saveLineup();
 
-        activeLineupMessages.set(guildId, { channelId: interaction.channelId, messageId: interaction.message.id });
-        addToCleanupQueue(guildId, interaction.channelId, interaction.message.id, 'lineup');
-        saveLineup();
-        return;
-    }
+  // Check if in scrim mode
+  const isScrim = guildScrimMode.get(guildId) === true;
+  const view = isScrim ? createScrimLineupView(guildId) : createLineupView(guildId);
+  await interaction.update(view);
+
+  activeLineupMessages.set(guildId, { channelId: interaction.channelId, messageId: interaction.message.id });
+  addToCleanupQueue(guildId, interaction.channelId, interaction.message.id, 'lineup');
+  saveLineup();
+  return;
+}
 
     if (interaction.isStringSelectMenu() && interaction.customId === 'formation_category_select') {
         if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return sendNoPermission(interaction);
@@ -2000,32 +2009,34 @@ if (interaction.commandName === 'lineup') {
         guildLineups.set(guildId, map);
         saveLineup();
 
-        await interaction.update({ content: `✅ Updated public board to **${formKey}**!`, components: [] });
-        
-        try {
-            const channel = interaction.channel;
-            const publicMsg = await channel.messages.fetch(publicMessageId);
-            await publicMsg.edit(createLineupView(guildId));
-        } catch (e) {
-            console.error("[!] Failed to update public board from ephemeral menu:", e.message);
-        }
-        return;
-    }
+await interaction.update({ content: `✅ Updated public board to **${formKey}**!`, components: [] });
 
-    if (interaction.isStringSelectMenu() && interaction.customId === 'formation_select_active') {
-        if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return sendNoPermission(interaction);
-        const ownerId = lineupOwners.get(interaction.guildId);
-        if (ownerId && interaction.user.id !== ownerId) {
-            return interaction.reply({ content: `❌ Only <@${ownerId}> can change the formation!`, ephemeral: true });
-        }
-        const guildId = interaction.guildId;
-        guildSelectedFormation.set(guildId, interaction.values[0]);
-        const map = new Map();
-        guildLineups.set(guildId, map);
-        await interaction.update(createLineupView(guildId));
-        saveLineup();
-        return;
-    }
+  try {
+    const channel = interaction.channel;
+    const publicMsg = await channel.messages.fetch(publicMessageId);
+    const isScrim = guildScrimMode.get(guildId) === true;
+    await publicMsg.edit(isScrim ? createScrimLineupView(guildId) : createLineupView(guildId));
+  } catch (e) {
+    console.error("[!] Failed to update public board from ephemeral menu:", e.message);
+  }
+  return;
+}
+
+if (interaction.isStringSelectMenu() && interaction.customId === 'formation_select_active') {
+  if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return sendNoPermission(interaction);
+  const ownerId = lineupOwners.get(interaction.guildId);
+  if (ownerId && interaction.user.id !== ownerId) {
+    return interaction.reply({ content: `❌ Only <@${ownerId}> can change the formation!`, ephemeral: true });
+  }
+  const guildId = interaction.guildId;
+  guildSelectedFormation.set(guildId, interaction.values[0]);
+  const map = new Map();
+  guildLineups.set(guildId, map);
+  const isScrim = guildScrimMode.get(guildId) === true;
+  await interaction.update(isScrim ? createScrimLineupView(guildId) : createLineupView(guildId));
+  saveLineup();
+  return;
+}
 
     if (interaction.isStringSelectMenu() && interaction.customId.startsWith('formation_select_')) {
         if (interaction.customId.includes('_initial_') || interaction.customId.includes('_active')) return; 
@@ -2036,16 +2047,17 @@ if (interaction.commandName === 'lineup') {
             return interaction.reply({ content: `❌ Only <@${ownerId}> can change the formation!`, ephemeral: true });
         }
 
-        const guildId = interaction.guildId;
-        guildSelectedFormation.set(guildId, interaction.values[0]);
-        const map = new Map();
-        guildLineups.set(guildId, map);
-        await interaction.update(createLineupView(guildId));
-        saveLineup();
-        return;
-    }
+const guildId = interaction.guildId;
+  guildSelectedFormation.set(guildId, interaction.values[0]);
+  const map = new Map();
+  guildLineups.set(guildId, map);
+  const isScrim = guildScrimMode.get(guildId) === true;
+  await interaction.update(isScrim ? createScrimLineupView(guildId) : createLineupView(guildId));
+  saveLineup();
+  return;
+}
 
-    if (interaction.isStringSelectMenu() && interaction.customId.startsWith('manager_formation_select_')) {
+if (interaction.isStringSelectMenu() && interaction.customId.startsWith('manager_formation_select_')) {
         const guildId = interaction.guildId;
         guildSelectedFormation.set(guildId, interaction.values[0]);
         const map = new Map();
@@ -2114,12 +2126,13 @@ if (interaction.commandName === 'lineup') {
                 if (!lineupBoard.get(pos)) lineupBoard.set(pos, []);
                 lineupBoard.get(pos).push(userId);
             }
-            saveLineup();
-            await interaction.editReply(createLineupView(lineupGuildId));
-            return;
-        }
+saveLineup();
+  const isScrim = guildScrimMode.get(lineupGuildId) === true;
+  await interaction.editReply(isScrim ? createScrimLineupView(lineupGuildId) : createLineupView(lineupGuildId));
+  return;
+}
 
-        if (interaction.customId === 'lineup_clear') {
+if (interaction.customId === 'lineup_clear') {
             if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) return sendNoPermission(interaction);
 
             const ownerId = lineupOwners.get(interaction.guildId);
@@ -2127,13 +2140,14 @@ if (interaction.commandName === 'lineup') {
                 return interaction.reply({ content: `❌ Only <@${ownerId}> can clear the board!`, ephemeral: true });
             }
 
-            lineupBoard.clear();
-            saveLineup();
-            await interaction.update(createLineupView(lineupGuildId));
-            return;
-        }
+lineupBoard.clear();
+  saveLineup();
+  const isScrim = guildScrimMode.get(lineupGuildId) === true;
+  await interaction.update(isScrim ? createScrimLineupView(lineupGuildId) : createLineupView(lineupGuildId));
+  return;
+}
 
-        if (interaction.customId === 'lineup_done') {
+if (interaction.customId === 'lineup_done') {
             if (!roleStorage.isWhitelisted(interaction.guildId, interaction.member)) {
                 return sendNoPermission(interaction);
             }