Update dependency @types/node to v20.14.10

- Updated the card embed generator to use fields instead of just dumping everything in the description
- Add the currency a user has to the embed as a field

#253

Reviewed-on: #288
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>

package.json

@@ -40,7 +40,7 @@
     "glob": "^10.3.10",
     "jest": "^29.0.0",
     "jest-mock-extended": "^3.0.0",
-    "minimatch": "9.0.4",
+    "minimatch": "9.0.5",
     "mysql": "^2.18.1",
     "ts-jest": "^29.0.0",
     "typeorm": "0.3.20",

src/buttonEvents/Claim.ts

@@ -76,7 +76,7 @@ export default class Claim extends ButtonEvent {
 
         const imageFileName = card.card.path.split("/").pop()!;
 
-        const embed = CardDropHelperMetadata.GenerateDropEmbed(card, inventory.Quantity, imageFileName, interaction.user.username);
+        const embed = CardDropHelperMetadata.GenerateDropEmbed(card, inventory.Quantity, imageFileName, interaction.user.username, user.Currency);
         const row = CardDropHelperMetadata.GenerateDropButtons(card, claimId, interaction.user.id, true);
 
         await interaction.editReply({
@@ -84,4 +84,4 @@ export default class Claim extends ButtonEvent {
             components: [ row ],
         });
     }
-}
+}

src/buttonEvents/Inventory.ts

@@ -26,6 +26,11 @@ export default class Inventory extends ButtonEvent {
 
             const embed = await InventoryHelper.GenerateInventoryPage(member.user.username, member.user.id, Number(page));
 
+            if (!embed) {
+                await interaction.followUp("No page for user found.");
+                return;
+            }
+
             await interaction.followUp({
                 files: [ embed.image ],
                 embeds: [ embed.embed ],
@@ -34,7 +39,7 @@ export default class Inventory extends ButtonEvent {
         } catch (e) {
             AppLogger.LogError("Button/Inventory", `Error generating inventory page for ${member.user.username} with id ${member.user.id}: ${e}`);
 
-            await interaction.reply("No page for user found.");
+            await interaction.followUp("An error has occurred running this command.");
         }
     }
 }

src/buttonEvents/Reroll.ts

@@ -59,7 +59,7 @@ export default class Reroll extends ButtonEvent {
             const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
             const quantityClaimed = inventory ? inventory.Quantity : 0;
 
-            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName, undefined, user.Currency);
 
             const claimId = v4();
 
@@ -78,4 +78,4 @@ export default class Reroll extends ButtonEvent {
             await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`);
         }
     }
-}
+}

src/commands/drop.ts

@@ -67,7 +67,7 @@ export default class Drop extends Command {
             const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
             const quantityClaimed = inventory ? inventory.Quantity : 0;
 
-            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName, undefined, user.Currency);
 
             const claimId = v4();
 

src/commands/inventory.ts

@@ -39,6 +39,11 @@ export default class Inventory extends Command {
 
             const embed = await InventoryHelper.GenerateInventoryPage(user.username, user.id, pageNumber);
 
+            if (!embed) {
+                await interaction.followUp("No page for user found.");
+                return;
+            }
+
             await interaction.followUp({
                 files: [ embed.image ],
                 embeds: [ embed.embed ],
@@ -47,7 +52,7 @@ export default class Inventory extends Command {
         } catch (e) {
             AppLogger.LogError("Commands/Inventory", e as string);
 
-            await interaction.followUp("No page for user found.");
+            await interaction.followUp("An error has occurred running this command.");
         }
     }
 }

src/helpers/CardDropHelperMetadata.ts

@@ -4,6 +4,7 @@ import CardRarityChances from "../constants/CardRarityChances";
 import { DropResult } from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
 import AppLogger from "../client/appLogger";
+import CardConstants from "../constants/CardConstants";
 
 export default class CardDropHelperMetadata {
     public static GetRandomCard(): DropResult | undefined {
@@ -77,25 +78,41 @@ export default class CardDropHelperMetadata {
         return { card, series };
     }
 
-    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: number, imageFileName: string, claimedBy?: string): EmbedBuilder {
+    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: number, imageFileName: string, claimedBy?: string, currency?: number): EmbedBuilder {
         AppLogger.LogSilly("CardDropHelperMetadata/GenerateDropEmbed", `Parameters: drop=${drop.card.id}, quantityClaimed=${quantityClaimed}, imageFileName=${imageFileName}`);
 
-        let description = "";
+        const description = drop.series.name;
-        description += `Series: ${drop.series.name}\n`;
-        description += `Claimed: ${quantityClaimed}\n`;
 
-        if (claimedBy != null) {
+        const embed = new EmbedBuilder()
-            description += `Claimed by: ${claimedBy}\n`;
-        } else {
-            description += "Claimed by: (UNCLAIMED)\n";
-        }
-
-        return new EmbedBuilder()
             .setTitle(drop.card.name)
             .setDescription(description)
             .setFooter({ text: `${CardRarityToString(drop.card.type)} · ${drop.card.id}` })
             .setColor(CardRarityToColour(drop.card.type))
-            .setImage(`attachment://${imageFileName}`);
+            .setImage(`attachment://${imageFileName}`)
+            .addFields([
+                {
+                    name: "Claimed",
+                    value: `${quantityClaimed}`,
+                    inline: true,
+                },
+                {
+                    name: "Claimed by",
+                    value: claimedBy ?? "(UNCLAIMED)",
+                    inline: true,
+                }
+            ]);
+
+        if (currency != null) {
+            embed.addFields([
+                {
+                    name: "Currency",
+                    value: `${currency}`,
+                    inline: true,
+                }
+            ]);
+        }
+
+        return embed;
     }
 
     public static GenerateDropButtons(drop: DropResult, claimId: string, userId: string, disabled: boolean = false): ActionRowBuilder<ButtonBuilder> {
@@ -105,7 +122,7 @@ export default class CardDropHelperMetadata {
             .addComponents(
                 new ButtonBuilder()
                     .setCustomId(`claim ${drop.card.id} ${claimId} ${userId}`)
-                    .setLabel("Claim")
+                    .setLabel(`Claim (${CardConstants.ClaimCost} 🪙)`)
                     .setStyle(ButtonStyle.Primary)
                     .setDisabled(disabled),
                 new ButtonBuilder()
@@ -113,4 +130,4 @@ export default class CardDropHelperMetadata {
                     .setLabel("Reroll")
                     .setStyle(ButtonStyle.Secondary));
     }
-}
+}

src/helpers/InventoryHelper.ts

@@ -31,13 +31,15 @@ interface ReturnedInventoryPage {
 
 
 export default class InventoryHelper {
-    public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<ReturnedInventoryPage> {
+    public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<ReturnedInventoryPage | undefined> {
         AppLogger.LogSilly("Helpers/InventoryHelper", `Parameters: username=${username}, userid=${userid}, page=${page}`);
 
         const cardsPerPage = 9;
 
         const inventory = await Inventory.FetchAllByUserId(userid);
 
+        if (!inventory || inventory.length == 0) return undefined;
+
         const clientCards = cloneDeep(CoreClient.Cards);
 
         const allSeriesClaimed = clientCards
@@ -88,8 +90,7 @@ export default class InventoryHelper {
         const currentPage = pages[page];
 
         if (!currentPage) {
-            AppLogger.LogError("Helpers/InventoryHelper", "Unable to find page");
+            return undefined;
-            return Promise.reject("Unable to find page");
         }
 
         const embed = new EmbedBuilder()

yarn.lock

@@ -979,10 +979,17 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
   integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
 
-"@types/node@*", "@types/node@^20.0.0":
+"@types/node@*":
-  version "20.14.8"
+  version "20.14.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.8.tgz#45c26a2a5de26c3534a9504530ddb3b27ce031ac"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
-  integrity sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==
+  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/node@^20.0.0":
+  version "20.14.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.10.tgz#a1a218290f1b6428682e3af044785e5874db469a"
+  integrity sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==
   dependencies:
     undici-types "~5.26.4"
 
@@ -4369,10 +4376,10 @@ minimatch@9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@9.0.4, minimatch@^9.0.0, minimatch@^9.0.4:
+minimatch@9.0.5:
-  version "9.0.4"
+  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
@@ -4383,6 +4390,13 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.0, minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
@@ -5889,9 +5903,9 @@ ts-essentials@^10.0.0:
   integrity sha512-77FHNJEyysF9+1s4G6eejuA1lxw7uMchT3ZPy3CIbh7GIunffpshtM8pTe5G6N5dpOzNevqRHew859ceLWVBfw==
 
 ts-jest@^29.0.0:
-  version "29.1.4"
+  version "29.1.5"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.4.tgz#26f8a55ce31e4d2ef7a1fd47dc7fa127e92793ef"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.5.tgz#d6c0471cc78bffa2cb4664a0a6741ef36cfe8f69"
-  integrity sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==
+  integrity sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"