.dev.env

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.3.1
+BOT_VER=0.3.0 DEV
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060

.prod.env

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.3.1
+BOT_VER=0.3.0
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1093810443589529631

.stage.env

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.3.1
+BOT_VER=0.3.0 BETA
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=1147976642942214235

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "card-drop",
-  "version": "0.3.1",
+  "version": "0.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "card-drop",
-      "version": "0.3.1",
+      "version": "0.2.1",
       "license": "MIT",
       "dependencies": {
         "@discordjs/rest": "^2.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.3.1",
+  "version": "0.2.1",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {

src/buttonEvents/Reroll.ts

@@ -27,37 +27,45 @@ export default class Reroll extends ButtonEvent {
             return;
         }
 
+        let image: Buffer;
+        const imageFileName = randomCard.card.path.split("/").pop()!;
+
         try {
-            let image: Buffer;
-            const imageFileName = randomCard.card.path.split("/").pop()!;
-
             image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
+        } catch {
+            await interaction.reply(`Unable to fetch image for card ${randomCard.card.id}`);
+            return;
+        }
 
-            await interaction.deferReply();
+        await interaction.deferReply();
 
-            const attachment = new AttachmentBuilder(image, { name: imageFileName });
+        const attachment = new AttachmentBuilder(image, { name: imageFileName });
 
-            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
-            const quantityClaimed = inventory ? inventory.Quantity : 0;
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
 
-            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
+        const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
 
-            const claimId = v4();
+        const claimId = v4();
 
-            const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
+        const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
 
+        try {
             await interaction.editReply({
                 embeds: [ embed ],
                 files: [ attachment ],
                 components: [ row ],
             });
-
-            CoreClient.ClaimId = claimId;
-
         } catch (e) {
             console.error(e);
 
-            await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`);
+            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`);
+            }
         }
+
+        CoreClient.ClaimId = claimId;
     }
 }

src/commands/drop.ts

@@ -35,38 +35,45 @@ export default class Drop extends Command {
             return;
         }
 
+        let image: Buffer;
+        const imageFileName = randomCard.card.path.split("/").pop()!;
+
         try {
-            let image: Buffer;
-            const imageFileName = randomCard.card.path.split("/").pop()!;
-
             image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
+        } catch {
+            await interaction.reply(`Unable to fetch image for card ${randomCard.card.id}`);
+            return;
+        }
 
-            await interaction.deferReply();
+        await interaction.deferReply();
 
-            const attachment = new AttachmentBuilder(image, { name: imageFileName });
+        const attachment = new AttachmentBuilder(image, { name: imageFileName });
 
-            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
-            const quantityClaimed = inventory ? inventory.Quantity : 0;
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
 
-            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
+        const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
 
-            const claimId = v4();
+        const claimId = v4();
 
-            const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
+        const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
 
+        try {
             await interaction.editReply({
                 embeds: [ embed ],
                 files: [ attachment ],
                 components: [ row ],
             });
-
-            CoreClient.ClaimId = claimId;
-
         } catch (e) {
             console.error(e);
 
-            await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`);
+            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`);
+            }
         }
 
+        CoreClient.ClaimId = claimId;
     }
 }