Fix the droprarity and dropnumber commands

- Update the Image Grid helper to download images that are urls instead of trying (and failing) to load them locally

#425

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

.forgejo/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
     - run: yarn install --frozen-lockfile
     - run: yarn build
     - run: yarn test

package.json

@@ -30,6 +30,7 @@
     "@types/express": "^4.17.20",
     "@types/jest": "^29.0.0",
     "@types/uuid": "^9.0.0",
+    "axios": "^1.8.4",
     "body-parser": "^1.20.2",
     "canvas": "^2.11.2",
     "clone-deep": "^4.0.1",
@@ -40,7 +41,7 @@
     "glob": "^10.3.10",
     "jest": "^29.0.0",
     "jest-mock-extended": "^3.0.0",
-    "jimp": "^0.22.12",
+    "jimp": "^1.6.0",
     "minimatch": "9.0.5",
     "mysql": "^2.18.1",
     "ts-jest": "^29.0.0",

src/client/appLogger.ts

@@ -86,4 +86,12 @@ export default class AppLogger {
     public static LogSilly(label: string, message: string) {
         AppLogger.Logger.silly({ label, message });
     }
+
+    public static CatchError(label: string, error: any) {
+        if (error instanceof Error) {
+            AppLogger.Logger.error({ label, message: error.message });
+        } else {
+            AppLogger.Logger.error({ label, message: error });
+        }
+    }
 }

src/commands/stage/dropnumber.ts

@@ -1,4 +1,4 @@
-import { AttachmentBuilder, CacheType, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js";
+import { AttachmentBuilder, CacheType, CommandInteraction, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../type/command";
 import { readFileSync } from "fs";
 import Inventory from "../../database/entities/app/Inventory";
@@ -6,6 +6,7 @@ import { v4 } from "uuid";
 import { CoreClient } from "../../client/client";
 import path from "path";
 import CardDropHelperMetadata from "../../helpers/CardDropHelperMetadata";
+import AppLogger from "../../client/appLogger";
 
 export default class Dropnumber extends Command {
     constructor() {
@@ -43,43 +44,39 @@ export default class Dropnumber extends Command {
         const series = CoreClient.Cards
             .find(x => x.cards.includes(card))!;
 
-        const files = [];
-        let imageFileName = "";
+        const claimId = v4();
 
-        if (!(card.path.startsWith("http://") || card.path.startsWith("https://"))) {
-            const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
-            imageFileName = card.path.split("/").pop()!;
-
-            const attachment = new AttachmentBuilder(image, { name: imageFileName });
-
-            files.push(attachment);
-        }
 
         await interaction.deferReply();
 
-        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id);
-        const quantityClaimed = inventory ? inventory.Quantity : 0;
-
-        const embed = CardDropHelperMetadata.GenerateDropEmbed({ card, series }, quantityClaimed, imageFileName);
-
-        const claimId = v4();
-
-        const row = CardDropHelperMetadata.GenerateDropButtons({ card, series }, claimId, interaction.user.id);
-
         try {
+            const files = [];
+            let imageFileName = "";
+
+            if (!(card.path.startsWith("http://") || card.path.startsWith("https://"))) {
+                const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
+                imageFileName = card.path.split("/").pop()!;
+
+                const attachment = new AttachmentBuilder(image, { name: imageFileName });
+
+                files.push(attachment);
+            }
+
+            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id);
+            const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+            const embed = CardDropHelperMetadata.GenerateDropEmbed({ card, series }, quantityClaimed, imageFileName);
+
+            const row = CardDropHelperMetadata.GenerateDropButtons({ card, series }, claimId, interaction.user.id);
+
             await interaction.editReply({
                 embeds: [ embed ],
                 files: files,
                 components: [ row ],
             });
         } catch (e) {
-            console.error(e);
-
-            if (e instanceof DiscordAPIError) {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
-            } else {
-                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
-            }
+            AppLogger.CatchError("Droprarity", e);
+            await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening");
         }
 
         CoreClient.ClaimId = claimId;

src/commands/stage/droprarity.ts

@@ -1,12 +1,13 @@
-import { AttachmentBuilder, CacheType, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js";
+import { AttachmentBuilder, CacheType, CommandInteraction, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../type/command";
-import { CardRarity, CardRarityParse } from "../../constants/CardRarity";
+import { CardRarity, CardRarityChoices, CardRarityParse } from "../../constants/CardRarity";
 import { readFileSync } from "fs";
 import Inventory from "../../database/entities/app/Inventory";
 import { v4 } from "uuid";
 import { CoreClient } from "../../client/client";
 import CardDropHelperMetadata from "../../helpers/CardDropHelperMetadata";
 import path from "path";
+import AppLogger from "../../client/appLogger";
 
 export default class Droprarity extends Command {
     constructor() {
@@ -19,7 +20,8 @@ export default class Droprarity extends Command {
                 x
                     .setName("rarity")
                     .setDescription("The rarity you want to summon")
-                    .setRequired(true));
+                    .setRequired(true)
+                    .setChoices(CardRarityChoices));
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
@@ -39,48 +41,45 @@ export default class Droprarity extends Command {
             return;
         }
 
-        const card = await CardDropHelperMetadata.GetRandomCardByRarity(rarityType);
+        const card = CardDropHelperMetadata.GetRandomCardByRarity(rarityType);
 
         if (!card) {
             await interaction.reply("Card not found");
             return;
         }
 
-        const files = [];
-        let imageFileName = "";
-
-        if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) {
-            const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
-            imageFileName = card.card.path.split("/").pop()!;
-
-            const attachment = new AttachmentBuilder(image, { name: imageFileName });
-
-            files.push(attachment);
-        }
-
-        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.card.id);
-        const quantityClaimed = inventory ? inventory.Quantity : 0;
-
-        const embed = CardDropHelperMetadata.GenerateDropEmbed(card, quantityClaimed, imageFileName);
-
         const claimId = v4();
 
-        const row = CardDropHelperMetadata.GenerateDropButtons(card, claimId, interaction.user.id);
+        await interaction.deferReply();
 
         try {
+            const files = [];
+            let imageFileName = "";
+
+            if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) {
+                const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
+                imageFileName = card.card.path.split("/").pop()!;
+
+                const attachment = new AttachmentBuilder(image, { name: imageFileName });
+
+                files.push(attachment);
+            }
+
+            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.card.id);
+            const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(card, quantityClaimed, imageFileName);
+
+            const row = CardDropHelperMetadata.GenerateDropButtons(card, claimId, interaction.user.id);
+
             await interaction.editReply({
                 embeds: [ embed ],
                 files: files,
                 components: [ row ],
             });
         } catch (e) {
-            console.error(e);
-
-            if (e instanceof DiscordAPIError) {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
-            } else {
-                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
-            }
+            AppLogger.CatchError("Droprarity", e);
+            await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening");
         }
 
         CoreClient.ClaimId = claimId;

src/constants/CardRarity.ts

@@ -9,6 +9,29 @@ export enum CardRarity {
     Legendary,
 }
 
+export const CardRarityChoices = [
+    {
+        name: "Bronze",
+        value: "bronze",
+    },
+    {
+        name: "Silver",
+        value: "silver",
+    },
+    {
+        name: "Gold",
+        value: "gold",
+    },
+    {
+        name: "Manga",
+        value: "manga",
+    },
+    {
+        name: "Legendary",
+        value: "legendary",
+    },
+];
+
 export function CardRarityToString(rarity: CardRarity): string {
     switch (rarity) {
     case CardRarity.Unknown:

src/helpers/ImageHelper.ts

@@ -3,7 +3,8 @@ import path from "path";
 import AppLogger from "../client/appLogger";
 import {existsSync} from "fs";
 import Inventory from "../database/entities/app/Inventory";
-import Jimp from "jimp";
+import { Bitmap, Jimp } from "jimp";
+import axios from "axios";
 
 interface CardInput {
     id: string;
@@ -29,14 +30,24 @@ export default class ImageHelper {
 
             const filePath = path.join(process.env.DATA_DIR!, "cards", card.path);
 
-            const exists = existsSync(filePath);
+            let bitmap: Bitmap;
 
-            if (!exists) {
+            if (existsSync(filePath)) {
+                const data = await Jimp.read(filePath);
+
+                bitmap = data.bitmap;
+            } else if (card.path.startsWith("http://") || card.path.startsWith("https://")) {
+                const response = await axios.get(card.path, { responseType: "arraybuffer" });
+                const buffer = Buffer.from(response.data);
+                const data = await Jimp.fromBuffer(buffer);
+
+                bitmap = data.bitmap;
+            } else {
                 AppLogger.LogError("ImageHelper/GenerateCardImageGrid", `Failed to load image from path ${card.path}`);
                 continue;
             }
 
-            const imageData = await Jimp.read(filePath);
+            const imageData = Jimp.fromBitmap(bitmap);
 
             if (userId != null) {
                 const claimed = await Inventory.FetchOneByCardNumberAndUserId(userId, card.id);
@@ -46,7 +57,7 @@ export default class ImageHelper {
                 }
             }
 
-            const image = await loadImage(await imageData.getBufferAsync("image/png"));
+            const image = await loadImage(await imageData.getBuffer("image/png"));
 
             const x = i % gridWidth;
             const y = Math.floor(i / gridWidth);