update join mid game option

Author: sunnniee

src/commands/uno.ts

@@ -18,13 +18,20 @@ export const cmd = {
 Jump: https://discord.com/channels/${existingGame.message.channel.guild.id}/${existingGame.message.channel.id}/${existingGame.message.id}`);
         games[msg.channel.id] = { started: false } as UnoGame<false>;
 
-        const data = database.getOrCreate(msg.channel.guild.id, msg.author.id);
+        const data = database.getOrCreate(msg.guild.id, msg.author.id);
+
+        const { canRejoin } = data.preferredSettings;
+        if (typeof canRejoin === "boolean") {
+            data.preferredSettings.canRejoin = canRejoin ? "temporarily" : "no";
+            database.set(msg.guild.id, msg.author.id, { preferredSettings: data.preferredSettings });
+        }
+
         const gameObj = {
             uid: Math.random().toString().substring(2),
             started: false,
             starting: Math.floor(Date.now() / 1000) + autoStartTimeout,
             host: msg.author.id,
-            settings: data?.preferredSettings,
+            settings: data.preferredSettings,
             players: [msg.author.id],
             _allowSolo: args[0]?.toLowerCase() === "solo",
             _modified: false,

src/components.ts

@@ -2,7 +2,7 @@ import { ComponentBuilder } from "@oceanicjs/builders";
 import { ButtonStyles, ComponentTypes, MessageActionRow } from "oceanic.js";
 
 import { client, sendMessage } from "./client.js";
-import { ButtonIDs, cardEmotes, defaultSettings, SelectIDs, SettingsIDs } from "./constants.js";
+import { ButtonIDs, cardEmotes, defaultSettings, maxRejoinableTurnCount, SelectIDs, SettingsIDs } from "./constants.js";
 import { sendGameMessage } from "./gameLogic/index.js";
 import { Card, UnoGame } from "./types.js";
 import { cardArrayToCount, getUsername, next, toHumanReadableTime, toTitleCase } from "./utils.js";
@@ -38,7 +38,7 @@ export const JoinButtons = new ComponentBuilder<MessageActionRow>()
     })
     .toJSON();
 
-export const GameButtons = ((canRejoin: boolean) => {
+export const GameButtons = ((game: UnoGame<true>) => {
     const components = new ComponentBuilder<MessageActionRow>()
         .addInteractionButton({
             style: ButtonStyles.SECONDARY,
@@ -67,7 +67,8 @@ export const GameButtons = ((canRejoin: boolean) => {
             style: ButtonStyles.PRIMARY,
             customID: ButtonIDs.JOIN_MID_GAME,
             label: "Join",
-            disabled: !canRejoin,
+            disabled: game.settings.canRejoin === "no"
+                || (game.settings.canRejoin === "temporarily" && game.turn > maxRejoinableTurnCount),
             emoji: ComponentBuilder.emojiToPartial("➡️", "default")
         });
     return components.toJSON();
@@ -182,7 +183,19 @@ export const SettingsSelectMenu = (game: UnoGame<false>) => new ComponentBuilder
             {
                 label: "Allow joining mid game",
                 value: SettingsIDs.ALLOW_REJOINING,
-                description: game.settings.canRejoin ? "Enabled" : "Disabled"
+                description: (() => {
+                    switch (game.settings.canRejoin) {
+                        case "no": {
+                            return "Disabled";
+                        }
+                        case "temporarily": {
+                            return "Only quickly after game start";
+                        }
+                        case "permanently": {
+                            return "For the whole game";
+                        }
+                    }
+                })()
             }
         ]
     })

src/constants.ts

@@ -79,7 +79,7 @@ export const defaultSettings: UnoGameSettings = {
     allowStacking: true,
     randomizePlayerList: true,
     resendGameMessage: true,
-    canRejoin: false,
+    canRejoin: "no",
     sevenAndZero: false
 } as const;
 

src/gameLogic/index.ts

@@ -3,7 +3,7 @@ import { AnyTextableGuildChannel, ComponentInteraction, ComponentTypes, Guild, M
 
 import { client, deleteMessage, sendMessage } from "../client.js";
 import { GameButtons, SettingsSelectMenu } from "../components.js";
-import { ButtonIDs, cardEmojis, cardEmotes, coloredUniqueCards, defaultColor, defaultSettings, maxRejoinableTurnCount, rainbowColors, SelectIDs, SettingsIDs, uniqueVariants, veryLongTime } from "../constants.js";
+import { ButtonIDs, cardEmojis, cardEmotes, coloredUniqueCards, defaultColor, defaultSettings, rainbowColors, SelectIDs, SettingsIDs, uniqueVariants, veryLongTime } from "../constants.js";
 import database from "../database.js";
 import { config } from "../index.js";
 import timeouts from "../timeouts.js";
@@ -89,7 +89,7 @@ ${game.players.map((p, i) => makeGameLine(game, p, i)).join("\n")}
             .setFooter((game._modified ? "This game will not count towards the leaderboard. " : "")
                 + `Timeout is ${toHumanReadableTime(game.settings.timeoutDuration).toLowerCase()}`)
             .toJSON()],
-        components: GameButtons(game.settings.canRejoin && game.turn < maxRejoinableTurnCount)
+        components: GameButtons(game)
     }).then(msg => {
         if (!msg) return cancelGameMessageFail(game);
 

src/gameLogic/notStarted.ts

@@ -7,7 +7,7 @@ import { ButtonIDs, cardEmotes, cards, defaultSettings, SettingsIDs, uniqueVaria
 import database from "../database.js";
 import timeouts from "../timeouts.js";
 import { Card, DebugState, DebugStateType, UnoGame } from "../types.js";
-import { getPlayerMember, hasStarted, shuffle, toTitleCase, updateStats, without } from "../utils.js";
+import { getPlayerMember, hasStarted, next, shuffle, toTitleCase, updateStats, without } from "../utils.js";
 import { games, makeStartMessage, sendGameMessage } from "./index.js";
 
 export function makeDrawCardProxy(startedGame: UnoGame<true>, userId: string, t, p, n) {
@@ -198,6 +198,8 @@ export function makeSettingsModal(ctx: ComponentInteraction) {
     });
 }
 export function onSettingsChange(ctx: ComponentInteraction<ComponentTypes.STRING_SELECT>, game: UnoGame<false>) {
+    const rejoinOptionOrder = ["no", "temporarily", "permanently"] as const;
+
     switch (ctx.data.values.raw[0]) {
         case SettingsIDs.KICK_ON_TIMEOUT: {
             game.settings.kickOnTimeout = !game.settings.kickOnTimeout;
@@ -224,7 +226,8 @@ export function onSettingsChange(ctx: ComponentInteraction<ComponentTypes.STRING
             break;
         }
         case SettingsIDs.ALLOW_REJOINING: {
-            game.settings.canRejoin = !game.settings.canRejoin;
+            // @ts-ignore Argument of type 'readonly ["no", "temporarily", "permanently"]' is not assignable to parameter of type '("no" | "temporarily" | "permanently")[]'.
+            game.settings.canRejoin = next(rejoinOptionOrder, rejoinOptionOrder.indexOf(game.settings.canRejoin));
             break;
         }
         default: {

src/gameLogic/started.ts

@@ -3,7 +3,7 @@ import { ButtonStyles, ComponentInteraction, ComponentTypes, MessageActionRow, M
 
 import { sendMessage } from "../client.js";
 import { DrawStackedCardSelect, PickCardSelect } from "../components.js";
-import { ButtonIDs, cardEmotes } from "../constants.js";
+import { ButtonIDs, cardEmotes, maxRejoinableTurnCount } from "../constants.js";
 import database from "../database.js";
 import { config } from "../index.js";
 import { UnoGame } from "../types.js";
@@ -96,16 +96,23 @@ export function onGameButtonPress(ctx: ComponentInteraction<ComponentTypes.BUTTO
                 content: "You can't rejoin a game you left!",
                 flags: MessageFlags.EPHEMERAL
             });
+            if (game.settings.canRejoin === "no"
+                || (game.settings.canRejoin === "temporarily" && game.turn > maxRejoinableTurnCount))
+                return ctx.createFollowup({
+                    content: "You can't rejoin this game",
+                    flags: MessageFlags.EPHEMERAL
+                });
 
             game.players.push(ctx.member.id);
             database.getOrCreate(ctx.guild.id, ctx.member.id);
             // in ascending order
             const cardCounts = Object.values(game.cards).map(c => c.length).sort((a, b) => a - b);
-            // amount of cards is the same as the player with the highest amount of cards
+            // amount of cards is the same as the player with the highest amount of cards (minimum of 7)
             // but at most 5 above the 2nd highest amount of cards
             const highest = cardCounts.pop();
             const secondHighest = cardCounts.pop();
-            const { cards, newDeck } = game.draw(highest > secondHighest + 5 ? secondHighest + 5 : highest);
+            const { cards, newDeck } = game.draw(Math.min(highest, secondHighest + 5, 7));
+
             game.cards[ctx.member.id] = new Proxy(cards, {
                 set(t, p, n) {
                     makeDrawCardProxy(game, ctx.member.id, t, p, n);

src/types.ts

@@ -49,7 +49,7 @@ export type UnoGameSettings = {
     allowStacking: boolean,
     randomizePlayerList: boolean,
     resendGameMessage: boolean,
-    canRejoin: boolean,
+    canRejoin: "no" | "temporarily" | "permanently",
     sevenAndZero: boolean
 }
 export type UnoGame<T extends boolean> = T extends true ? {