Merge branch 'main' of https://github.com/Balatro-Multiplayer/Botlatro-Multiplayer

Author: Casjb

migrations/1760500003000_db_votes.js

@@ -0,0 +1,38 @@
+/**
+ * @type {import('node-pg-migrate').ColumnDefinitions | undefined}
+ */
+export const shorthands = undefined;
+
+/**
+ * @param pgm {import('node-pg-migrate').MigrationBuilder}
+ * @param run {() => void | undefined}
+ * @returns {Promise<void> | void}
+ */
+export const up = (pgm) => {
+  pgm.createTable('votes', {
+    id: { type: 'serial', primaryKey: true },
+    match_id: { type: 'integer', notNull: true, references: '"matches"', onDelete: 'CASCADE' },
+    user_id: { type: 'varchar(255)', notNull: true, references: '"users"(user_id)', onDelete: 'CASCADE', onUpdate: 'CASCADE' },
+    vote_type: { type: 'varchar(50)', notNull: true }, // 'win', 'cancel', 'rematch', 'bo3', 'bo5'
+    vote_value: { type: 'integer' }, // For win votes: team number (1, 2, etc), for others: null (presence = yes vote)
+    created_at: { type: 'timestamp with time zone', notNull: true, default: pgm.func('NOW()') },
+  });
+
+  // Index for faster lookups
+  pgm.addIndex('votes', ['match_id', 'user_id']);
+  pgm.addIndex('votes', ['match_id', 'vote_type']);
+
+  // Constraint: A user can only have one active vote per match (they can change their vote)
+  pgm.addConstraint('votes', 'unique_user_vote_per_match', {
+    unique: ['match_id', 'user_id']
+  });
+};
+
+/**
+ * @param pgm {import('node-pg-migrate').MigrationBuilder}
+ * @param run {() => void | undefined}
+ * @returns {Promise<void> | void}
+ */
+export const down = (pgm) => {
+  pgm.dropTable('votes', { ifExists: true, cascade: true });
+};

src/events/interactionCreate.ts

@@ -37,7 +37,7 @@ import {
   getQueueSettings,
   getStake,
   getStakeByName,
-  getUserPriorityQueueId,
+  // getUserPriorityQueueId,
   getUserQueues,
   setMatchStakeVoteTeam,
   setPickedMatchStake,
@@ -194,73 +194,80 @@ export default {
           }
         }
 
-        await handleTwoPlayerMatchVoting(interaction, {
-          participants: matchUsersArray,
-          onComplete: async (interaction, winner) => {
-            const customSelId = interaction.values[0]
-            const matchDataParts: string[] = customSelId.split('_')
-            const matchId = parseInt(matchDataParts[1])
-
-            // Check if this match is Best of 3 or 5
-            const matchDataObj = await getMatchData(matchId)
-            const isBo3 = matchDataObj.best_of_3
-            const isBo5 = matchDataObj.best_of_5
-
-            if (!isBo3 && !isBo5) {
-              await setWinningTeam(matchId, winner)
-              await endMatch(matchId)
-              return
-            }
-
-            const embed = interaction.message.embeds[0]
-            const fields = embed.data.fields || []
+        try {
+          await handleTwoPlayerMatchVoting(interaction, {
+            participants: matchUsersArray,
+            onComplete: async (interaction, winner) => {
+              const customSelId = interaction.values[0]
+              const matchDataParts: string[] = customSelId.split('_')
+              const matchId = parseInt(matchDataParts[1])
+
+              // Check if this match is Best of 3 or 5
+              const matchDataObj = await getMatchData(matchId)
+              const isBo3 = matchDataObj.best_of_3
+              const isBo5 = matchDataObj.best_of_5
+
+              if (!isBo3 && !isBo5) {
+                await setWinningTeam(matchId, winner)
+                await endMatch(matchId)
+                return
+              } else {
+                const embed = interaction.message.embeds[0]
+                const fields = embed.data.fields || []
 
-            // Update Best of scores and check for match winner
-            const winnerIndex = winner === 1 ? 0 : 1
-            for (let i = 0; i < Math.min(2, fields.length); i++) {
-              const val = fields[i].value || ''
-              const lines = val.split('\n')
+                // Update Best of scores in the embed (for display only)
+                const winnerIndex = winner === 1 ? 0 : 1
+                for (let i = 0; i < Math.min(2, fields.length); i++) {
+                  const val = fields[i].value || ''
+                  const lines = val.split('\n')
 
-              const cleaned = lines.filter(
-                (l) => !l.includes('Win Votes') && !l.includes('<@'),
-              )
+                  const cleaned = lines.filter(
+                    (l) => !l.includes('Win Votes') && !l.includes('<@'),
+                  )
 
-              const mmrIdx = cleaned.findIndex((l) => l.includes('MMR'))
-              if (mmrIdx !== -1) {
-                const mmrLine = cleaned[mmrIdx]
-                const m = mmrLine.match(/Score:\s*(\d+)/i)
-                let score = m ? parseInt(m[1], 10) || 0 : 0
+                  const mmrIdx = cleaned.findIndex((l) => l.includes('MMR'))
+                  if (mmrIdx !== -1) {
+                    const mmrLine = cleaned[mmrIdx]
+                    const m = mmrLine.match(/Score:\s*(\d+)/i)
+                    let score = m ? parseInt(m[1], 10) || 0 : 0
 
-                if (i === winnerIndex) score += 1
+                    if (i === winnerIndex) score += 1
 
-                cleaned[mmrIdx] =
-                  mmrLine.replace(/\s*-?\s*Score:\s*\d+/i, '').trimEnd() +
-                  ` - Score: ${score}`
-              }
+                    cleaned[mmrIdx] =
+                      mmrLine.replace(/\s*-?\s*Score:\s*\d+/i, '').trimEnd() +
+                      ` - Score: ${score}`
+                  }
 
-              fields[i].value = cleaned.join('\n')
-            }
-
-            const scores = getBestOfMatchScores(fields)
-            const requiredWins = isBo5 ? 3 : isBo3 ? 2 : 1
-            const [team1Wins, team2Wins] = scores
+                  fields[i].value = cleaned.join('\n')
+                }
 
-            let winningTeam = 0
-            if (team1Wins >= requiredWins) {
-              winningTeam = 1
-            } else if (team2Wins >= requiredWins) {
-              winningTeam = 2
-            }
+                // Get updated scores from the embed (after incrementing)
+                let scores = getBestOfMatchScores(fields)
+                let requiredWins = isBo5 ? 3 : isBo3 ? 2 : 1
+                const [team1Wins, team2Wins] = scores
+
+                // Check if a team has won the Best of series
+                let winningTeam = 0
+                if (team1Wins >= requiredWins) {
+                  winningTeam = 1
+                } else if (team2Wins >= requiredWins) {
+                  winningTeam = 2
+                }
 
-            if (winningTeam) {
-              await endMatch(matchId)
-              return
-            }
+                if (winningTeam) {
+                  await setWinningTeam(matchId, winningTeam)
+                  await endMatch(matchId)
+                  return
+                }
 
-            interaction.message.embeds[0] = embed
-            await interaction.update({ embeds: interaction.message.embeds })
-          },
-        })
+                interaction.message.embeds[0] = embed
+                await interaction.update({ embeds: interaction.message.embeds })
+              }
+            },
+          })
+        } catch (err) {
+          console.error(err)
+        }
       }
 
       if (interaction.customId.startsWith('deck-bans-')) {
@@ -434,9 +441,9 @@ export default {
 
         if (interaction.customId === 'check-queued') {
           const userQueueList = await getUserQueues(interaction.user.id)
-          const priorityQueueId = await getUserPriorityQueueId(
-            interaction.user.id,
-          )
+          // const priorityQueueId = await getUserPriorityQueueId(
+          //   interaction.user.id,
+          // )
 
           if (userQueueList.length > 0) {
             const timeSpent = await timeSpentInQueue(
@@ -447,7 +454,7 @@ export default {
               content:
                 `
                         You are in queue for **${userQueueList.map((queue) => `${queue.queue_name}`).join(', ')}**!` +
-                `${priorityQueueId ? `\nYour priority queue is **${(await getQueueSettings(priorityQueueId, ['queue_name'])).queue_name}**!` : ``}` +
+                // `${priorityQueueId ? `\nYour priority queue is **${(await getQueueSettings(priorityQueueId, ['queue_name'])).queue_name}**!` : ``}` +
                 `\nJoined queue ${timeSpent}.`,
               flags: MessageFlags.Ephemeral,
             })
@@ -542,6 +549,7 @@ export default {
               voteType: 'Cancel Match Votes',
               embedFieldIndex: 2,
               participants: matchUsersArray,
+              matchId: matchId,
               onComplete: async (interaction) => {
                 await cancel(interaction, matchId)
               },
@@ -724,6 +732,8 @@ export default {
             voteType: 'Rematch Votes',
             embedFieldIndex: 2,
             participants: matchUsersArray,
+            matchId: matchId,
+            resendMessage: false,
             onComplete: async (interaction, { embed }) => {
               await interaction.update({
                 content: 'A Rematch for this matchup has begun!',
@@ -796,6 +806,7 @@ export default {
             voteType: voteFieldName,
             embedFieldIndex: 3,
             participants: matchUsersArray,
+            matchId: matchId,
             onComplete: async (interaction, { embed }) => {
               const rows = interaction.message.components.map((row) =>
                 ActionRowBuilder.from(row as any),

src/utils/Autocompletions.ts

@@ -33,13 +33,14 @@ export async function strikeAutocomplete(interaction: AutocompleteInteraction) {
       const uniqueIds = [...new Set(userIds)]
       const users = await Promise.all(uniqueIds.map((id) => fetchUserSafe(id)))
 
+      // why in the world is this here - jeff
       // logging
-      console.group('ids')
-      console.log(uniqueIds)
-      console.groupEnd()
-      console.group('users')
-      for (const user of users) console.log(user?.username)
-      console.groupEnd()
+      // console.group('ids')
+      // console.log(uniqueIds)
+      // console.groupEnd()
+      // console.group('users')
+      // for (const user of users) console.log(user?.username)
+      // console.groupEnd()
       //
 
       const q = value.toLowerCase()