Update dependency @types/node to v20.8.7

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Add the quantity which the user has claimed to the drop embed

#37

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

- This has been tested by running the command for a card which has no claimed card and ensure it says 0
- Then reran the command for that card and ensured it says 1

# Checklist

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/61
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>

.gitignore

@@ -108,3 +108,4 @@ config.json
 ormconfig.json
 gdrive-credentials.json
 cards/
+*.db

package.json

@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {
@@ -28,7 +28,7 @@
     "@types/uuid": "^9.0.0",
     "discord.js": "^14.3.0",
     "dotenv": "^16.0.0",
-    "googleapis": "^126.0.0",
+    "googleapis": "^127.0.0",
     "jest": "^29.0.0",
     "jest-mock-extended": "^3.0.0",
     "minimatch": "9.0.3",

src/Functions/CardSetupFunction.ts

@@ -59,7 +59,7 @@ export default class CardSetupFunction {
             const cardDirLegendary = legendaryExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'LEGENDARY')) : [];
             const cardDirSilver = silverExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'SILVER')) : [];
 
-            for (let file of cardDirBronze) {
+            for (let file of cardDirBronze.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                 const filePart = file.split('.');
 
                 const cardId = filePart[0];
@@ -70,7 +70,7 @@ export default class CardSetupFunction {
                 cardsToSave.push(card);
             }
 
-            for (let file of cardDirGold) {
+            for (let file of cardDirGold.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                 const filePart = file.split('.');
 
                 const cardId = filePart[0];
@@ -81,7 +81,7 @@ export default class CardSetupFunction {
                 cardsToSave.push(card);
             }
 
-            for (let file of cardDirLegendary) {
+            for (let file of cardDirLegendary.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                 const filePart = file.split('.');
 
                 const cardId = filePart[0];
@@ -92,7 +92,7 @@ export default class CardSetupFunction {
                 cardsToSave.push(card);
             }
 
-            for (let file of cardDirSilver) {
+            for (let file of cardDirSilver.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                 const filePart = file.split('.');
 
                 const cardId = filePart[0];

src/buttonEvents/Reroll.ts

@@ -6,6 +6,7 @@ import { CardRarityToColour, CardRarityToString } from "../constants/CardRarity"
 import { v4 } from "uuid";
 import { CoreClient } from "../client/client";
 import Card from "../database/entities/card/Card";
+import Inventory from "../database/entities/app/Inventory";
 
 export default class Reroll extends ButtonEvent {
     public override async execute(interaction: ButtonInteraction) {
@@ -32,9 +33,16 @@ export default class Reroll extends ButtonEvent {
 
         const attachment = new AttachmentBuilder(image, { name: randomCard.FileName });
 
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.CardNumber);
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+        let embedDescription = "";
+        embedDescription += `Series: ${randomCard.Series.Name}\n`;
+        embedDescription += `Claimed: ${quantityClaimed || 0}\n`;
+
         const embed = new EmbedBuilder()
             .setTitle(randomCard.Name)
-            .setDescription(randomCard.Series.Name)
+            .setDescription(embedDescription)
             .setFooter({ text: CardRarityToString(randomCard.Rarity) })
             .setColor(CardRarityToColour(randomCard.Rarity))
             .setImage(`attachment://${randomCard.FileName}`);

src/commands/drop.ts

@@ -6,6 +6,7 @@ import { readFileSync } from "fs";
 import { CoreClient } from "../client/client";
 import { v4 } from "uuid";
 import Card from "../database/entities/card/Card";
+import Inventory from "../database/entities/app/Inventory";
 
 export default class Drop extends Command {
     constructor() {
@@ -38,9 +39,16 @@ export default class Drop extends Command {
 
         const attachment = new AttachmentBuilder(image, { name: randomCard.FileName });
 
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.CardNumber);
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+        let embedDescription = "";
+        embedDescription += `Series: ${randomCard.Series.Name}\n`;
+        embedDescription += `Claimed: ${quantityClaimed || 0}\n`;
+
         const embed = new EmbedBuilder()
             .setTitle(randomCard.Name)
-            .setDescription(randomCard.Series.Name)
+            .setDescription(embedDescription)
             .setFooter({ text: CardRarityToString(randomCard.Rarity) })
             .setColor(CardRarityToColour(randomCard.Rarity))
             .setImage(`attachment://${randomCard.FileName}`);