add score confirmation

src/discord/buttons/confirmScore.ts

@@ -0,0 +1,22 @@
+import { UserError } from "@/lib/discord/UserError"
+import { getGame } from "@/lib/game"
+import { scoreGame } from "@/lib/game/scoreGame"
+import { type ButtonInteraction } from "discord.js"
+
+export default {
+    id: "confirmScore",
+    async execute(interaction: ButtonInteraction) {
+        await interaction.deferReply({ ephemeral: true })
+
+        const score1 = parseInt(interaction.args.shift()!)
+        const score2 = parseInt(interaction.args.shift()!)
+
+        const game = await getGame(interaction.channelId)
+        if (!game) throw new UserError("This command can only be used in game channels!")
+
+        const success = await scoreGame(game, score1, score2)
+        if (!success) throw new UserError("This game has already been scored.")
+
+        return "Game scored."
+    },
+}

src/discord/buttons/score.ts

@@ -16,7 +16,7 @@ export default {
             throw new UserError("This score request must be accepted by the other team.")
 
         await interaction.editReply("Closing channel...")
-        const success = await closeChannel(game)
+        const success = await closeChannel(game, interaction.message.embeds[0]?.image?.url)
         if (!success) throw new UserError("Channel already closed!")
     },
 }

src/discord/commands/scoreGame.ts

@@ -1,8 +1,15 @@
-import { InteractionContextType, SlashCommandBuilder, type ChatInputCommandInteraction } from "discord.js"
+import {
+    bold,
+    ButtonStyle,
+    InteractionContextType,
+    SlashCommandBuilder,
+    userMention,
+    type ChatInputCommandInteraction,
+} from "discord.js"
 
+import { MessageOptionsBuilder } from "@/lib/discord/MessageOptionsBuilder"
 import { UserError } from "@/lib/discord/UserError"
 import { getGame } from "@/lib/game"
-import { scoreGame } from "@/lib/game/scoreGame"
 
 const Options = {
     Team1Score: "team-1-score",
@@ -36,9 +43,26 @@ export default {
         const game = await getGame(interaction.channelId)
         if (!game) throw new UserError("This command can only be used in game channels!")
 
-        const success = await scoreGame(game, score1, score2)
-        if (!success) throw new UserError("This game has already been scored.")
+        const winner = score1 > score2 ? game.teams[0] : score2 > score1 ? game.teams[1] : null
+        const score = score1 > score2 ? `${score1}-${score2}` : `${score2}-${score1}`
 
-        return "Game scored."
+        await interaction.editReply(
+            new MessageOptionsBuilder()
+                .setContent(
+                    "Please confirm " +
+                        bold(
+                            winner
+                                ? winner.players.map(userMention).join(" ") + ` won ${score}`
+                                : "game ended in a draw",
+                        ) +
+                        ".",
+                )
+                .addButtons((button) =>
+                    button
+                        .setLabel("Confirm")
+                        .setStyle(ButtonStyle.Success)
+                        .setCustomId(`confirmScore:${score1}:${score2}`),
+                ),
+        )
     },
 }

src/lib/game/closeChannel.ts

@@ -1,5 +1,5 @@
 import { Game } from "@/database/models/Game"
-import { client } from "@/discord"
+import { client, colors } from "@/discord"
 import {
     EmbedBuilder,
     OverwriteType,
@@ -10,7 +10,7 @@ import {
     type OverwriteResolvable,
 } from "discord.js"
 
-export async function closeChannel(game: Game) {
+export async function closeChannel(game: Game, image?: string) {
     const guild = await client.guilds.fetch(game.guildId!)
     if (!guild) return
 
@@ -20,6 +20,8 @@ export async function closeChannel(game: Game) {
     const embed = new EmbedBuilder()
         .setTitle(`Game ${game.sequence} Finished`)
         .setDescription(`The game has finished. Please score it via the \`/score-game\` command.`)
+        .setColor(colors.baseColor)
+        .setImage(image ?? null)
         .setFields(
             game.teams.map((v, i) => ({
                 name: `Team ${i + 1}`,

src/lib/game/voidGame.ts

@@ -10,7 +10,7 @@ export async function voidGame(gameId: string) {
 
     const success = await archiveGame(
         game,
-        game.teams.map(() => 0),
+        game.teams.map(() => -1),
     )
 
     if (!success) return false

src/lib/queue/tempNicks.ts

@@ -7,7 +7,7 @@ const previousNicks = new Map<string, string | null>()
 export function setTempNick(queue: Queue, user: string, nick: string) {
     const guild = client.guilds.cache.get(queue.guildId)
     const member = guild?.members.cache.get(user)
-    if (member && guild?.ownerId === member.id) {
+    if (member && guild?.ownerId !== member.id) {
         previousNicks.set(user, member.nickname)
         updateNick(queue, user, nick).catch(console.error)
     }