feat: cancel match from queue log

Author: robotzurg

src/events/interactionCreate.ts

@@ -652,9 +652,13 @@ export default {
             t.players.map((u) => u.user_id),
           )
 
-          async function cancel(interaction: any, matchId: number) {
+          async function cancel(
+            interaction: any,
+            matchId: number,
+            log: boolean = false,
+          ) {
             try {
-              if (interaction.message) {
+              if (interaction.message && !log) {
                 await interaction
                   .update({
                     content: 'The match has been cancelled.',
@@ -681,6 +685,11 @@ export default {
               await cancel(interaction, matchId)
           }
 
+          // Check if log channel is the channel
+          if (interaction.channel!.id == botSettings.queue_logs_channel_id) {
+            await cancel(interaction, matchId, true)
+          }
+
           // Otherwise do normal vote
           try {
             await handleVoting(interaction, {

src/utils/matchHelpers.ts

@@ -654,9 +654,7 @@ export async function updateQueueLogMessage(
         const eloChange = player.elo_change ?? 0
         const changeStr = eloChange > 0 ? `+${eloChange}` : `${eloChange}`
         const winnerEmoji = team.id === winningTeamId ? '🏆 ' : ''
-        playerLines.push(
-          `${winnerEmoji}<@${player.user_id}>: ${changeStr} MMR (${player.elo} total)`,
-        )
+        playerLines.push(`${winnerEmoji}<@${player.user_id}>: ${changeStr} MMR`)
       }
     }
 
@@ -672,7 +670,6 @@ export async function updateQueueLogMessage(
 
     await queueLogMsg.edit({
       embeds: [updatedEmbed],
-      components: [],
     })
 
     console.log(`Updated queue log message for match ${matchId}`)

src/utils/queueHelpers.ts

@@ -739,13 +739,23 @@ export async function sendQueueLog(
   const selectRow =
     new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(selectMenu)
 
+  // Add cancel match button
+  const cancelButton = new ButtonBuilder()
+    .setCustomId(`cancel-${matchId}`)
+    .setLabel('Cancel Match')
+    .setStyle(ButtonStyle.Danger)
+
+  const buttonRow = new ActionRowBuilder<ButtonBuilder>().addComponents(
+    cancelButton,
+  )
+
   // Send to logging channel
   try {
     await matchLog.setLogChannel()
     if (matchLog.channel) {
       const matchLogMsg = await matchLog.channel.send({
         embeds: [matchLog.embed],
-        components: [selectRow],
+        components: [selectRow, buttonRow],
       })
       await setMatchQueueLogMessageId(matchId, matchLogMsg.id)
     }