ensure database entry exists for mid game joiners

Author: sunnniee

src/commands/uno.ts

@@ -1,7 +1,7 @@
 
 import { respond } from "../client.js";
 import { JoinButtons } from "../components.js";
-import { autoStartTimeout, defaultSettings } from "../constants.js";
+import { autoStartTimeout } from "../constants.js";
 import database from "../database.js";
 import { games, makeStartMessage } from "../gameLogic/index.js";
 import { startGame } from "../gameLogic/notStarted.js";
@@ -18,13 +18,13 @@ 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.get(msg.channel.guild.id, msg.author.id);
+        const data = database.getOrCreate(msg.channel.guild.id, msg.author.id);
         const gameObj = {
             uid: Math.random().toString().substring(2),
             started: false,
             starting: Math.floor(Date.now() / 1000) + autoStartTimeout,
             host: msg.author.id,
-            settings: data?.preferredSettings ?? { ...defaultSettings },
+            settings: data?.preferredSettings,
             players: [msg.author.id],
             _allowSolo: args[0]?.toLowerCase() === "solo",
             _modified: false,

src/database.ts

@@ -91,6 +91,14 @@ class PlayerStatsDatabase {
         return guild[playerId];
     }
 
+    getOrCreate(guildId: string, playerId: string): PlayerStorage {
+        const value = this.get(guildId, playerId);
+        if (value) return value;
+
+        this.set(guildId, playerId, this.defaultValue);
+        return { ...this.defaultValue };
+    }
+
     getAllForGuild(guildId: string): GuildStorage | undefined {
         if (!this.hasInitalized) return {} as any;
 

src/gameLogic/playedCards.ts

@@ -26,7 +26,7 @@ function isSabotage(ctx: ComponentInteraction<ComponentTypes.STRING_SELECT>, gam
             updateStats(game, game.players[0]);
             return true;
         } else database.set(game.guildID, ctx.member.id, {
-            losses: database.get(game.guildID, ctx.member.id).losses + 1
+            losses: database.getOrCreate(game.guildID, ctx.member.id).losses + 1
         });
 
         game.currentPlayer = next(game.players, game.players.indexOf(game.currentPlayer));

src/gameLogic/started.ts

@@ -4,6 +4,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 database from "../database.js";
 import { config } from "../index.js";
 import { UnoGame } from "../types.js";
 import { cardArrayToCount, getUsername, next, toTitleCase } from "../utils.js";
@@ -97,6 +98,7 @@ export function onGameButtonPress(ctx: ComponentInteraction<ComponentTypes.BUTTO
             });
 
             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

src/utils.ts

@@ -73,7 +73,7 @@ export function updateStats(game: UnoGame<true>, winner: string) {
     if (game._modified) return;
     const newStats: { [id: string]: PlayerStorage; } = {};
     game.players.forEach(id => {
-        const val: PlayerStorage = database.get(game.guildID, id) ?? database.defaultValue;
+        const val = database.getOrCreate(game.guildID, id);
         if (id === winner) val.wins++;
         else val.losses++;
         newStats[id] = val;