refactor: Remove unneeded guild reference

Also fix a non i18n'ed string

Author: GeekCornerGH

src/events/messageCreate.ts

@@ -1,4 +1,4 @@
-import { Guild, GuildTextBasedChannel, Message } from "discord.js";
+import { GuildTextBasedChannel, Message } from "discord.js";
 
 import runningGameMessage from "../components/runningGameMessage.js";
 import { event } from "../typings/event.js";
@@ -14,7 +14,7 @@ export const e: event = async (client, message: Message) => {
     if (scrolledWeight > maxWeightBeforeResend) {
         const msg = message.channel.messages.cache.get(game.messageId);
         if (msg) await msg?.delete();
-        const sent = await (msg?.channel as GuildTextBasedChannel).send(await runningGameMessage(client, game, message.guild as Guild));
+        const sent = await (msg?.channel as GuildTextBasedChannel).send(await runningGameMessage(client, game));
         game.messageId = sent.id;
     }
 };

src/interactions/buttons/confirmLeaveGame.ts

@@ -1,5 +1,5 @@
 
-import { Guild, MessageFlags, TextChannel } from "discord.js";
+import { MessageFlags, TextChannel } from "discord.js";
 import { t } from "i18next";
 
 import runningGameMessage from "../../components/runningGameMessage.js";
@@ -40,7 +40,7 @@ export const b: button = {
         await interaction.channel?.messages.cache.get(game.messageId)?.delete();
         await (interaction.channel as TextChannel).send(t("strings:game.left", { name: await getUsername(client, game.guildId, interaction.user.id), lng }));
         if ((game._modified && game.players.length === 0) || (!game._modified && game.players.length === 1)) return endGame(game, interaction.client, "notEnoughPeople");
-        const msg = await (interaction.channel as TextChannel).send(await runningGameMessage(client, game, interaction.guild as Guild));
+        const msg = await (interaction.channel as TextChannel).send(await runningGameMessage(client, game));
         game.messageId = msg.id;
     }
 };

src/utils/game/endTurn.ts

@@ -1,4 +1,5 @@
 import { ButtonInteraction, Client, StringSelectMenuInteraction, TextChannel } from "discord.js";
+import { t } from "i18next";
 
 import runningGameMessage from "../../components/runningGameMessage.js";
 import { runningUnoGame } from "../../typings/unoGame.js";
@@ -8,7 +9,6 @@ import { getUsername } from "../getUsername.js";
 import timeouts from "../timeoutManager.js";
 import endGame from "./endGame.js";
 import onTimeout from "./onTimeout.js";
-import toTitleCase from "./toTitleCase.js";
 
 export default async (client: Client, game: runningUnoGame, interaction: StringSelectMenuInteraction | ButtonInteraction, previousPlayer: string, type: "played" | "skipped" | "misc", toAppend?: string, showPlayedCard: boolean = true) => {
     if (!interaction.inGuild()) return;
@@ -18,12 +18,12 @@ export default async (client: Client, game: runningUnoGame, interaction: StringS
     if (showPlayedCard || type !== "misc") game.log.push({ player: previousPlayer, card: game.currentCard, adminAbused: game.adminAbused });
     const isUnique = uniqueVariants.includes(game.currentCard.split("-")[1] as typeof uniqueVariants[number]);
     const currentCardEmote = isUnique ? config.emoteless ? colorEmotes.other : coloredUniqueCards[game.currentCard as keyof typeof coloredUniqueCards] : cardEmotes[game.currentCard];
-    await (interaction.channel as TextChannel).send(`${showPlayedCard ? `**${await getUsername(client, game.guildId, previousPlayer)}** played ${currentCardEmote} ${toTitleCase(game.currentCard, lng)}\n` : ""}${toAppend ?? ""}`.trim());
+    await (interaction.channel as TextChannel).send(`${showPlayedCard ? `${t("strings:game.played", { lng, name: await getUsername(client, game.guildId, game.currentPlayer), currentCardEmote, card: game.currentCard })}\n` : ""}${toAppend ?? ""}`.trim());
     await interaction.channel?.messages.cache.get(game.messageId)?.delete();
     await interaction.deleteReply();
     if ((game._modified && game.players.length === 0) || (!game._modified && game.players.length === 1)) return endGame(game, interaction.client, "notEnoughPeople");
     if (game.cards[previousPlayer] && game.cards[previousPlayer].length === 0) return endGame(game, interaction.client, "win", previousPlayer);
-    const msg = await (interaction.channel as TextChannel).send(await runningGameMessage(client, game, interaction.guild!));
+    const msg = await (interaction.channel as TextChannel).send(await runningGameMessage(client, game));
     game.messageId = msg.id;
     if (type !== "misc") {
         game.canSkip = false;

src/utils/game/onTimeout.ts

@@ -62,7 +62,7 @@ export default async (client: Client, game: runningUnoGame, player: string) => {
         else if (game.players.length === 1) return endGame(game, client, "win", game.currentPlayer);
     }
     await (client.channels.cache.get(game.channelId) as GuildTextBasedChannel).messages.cache.get(game.messageId)?.delete();
-    const msg = await (client.channels.cache.get(game.channelId) as GuildTextBasedChannel).send(await runningGameMessage(client, game, client.guilds.cache.get(game.guildId)!));
+    const msg = await (client.channels.cache.get(game.channelId) as GuildTextBasedChannel).send(await runningGameMessage(client, game));
     game.messageId = msg.id;
     game.turnProgress = "chooseCard";
     game.log.push({ player: previousPlayer, card: game.currentCard, adminAbused: game.adminAbused });

src/utils/game/startGame.ts

@@ -54,7 +54,7 @@ export default async (client: Client, game: unoGame, automatic: boolean, message
     await message.delete();
     game.startingDate = new Date(Date.now());
     await (message.channel as GuildTextBasedChannel).send(`${t("strings:game.started", { lng })}${game.settings.adminabusemode === true ? t("strings:game.startedAA", { lng }) : ""}`);
-    const msg = await (message.channel as GuildTextBasedChannel).send(await runningGameMessage(client, game, message.guild));
+    const msg = await (message.channel as GuildTextBasedChannel).send(await runningGameMessage(client, game));
     game.messageId = msg.id;
     timeouts.set(game.channelId, () => onTimeout(client, game, game.currentPlayer), game.settings.timeoutDuration * 1000);
 };