From 7a72be4e64391c8393c56786cd95e9066d19c680 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Dec 2023 17:32:51 +0000 Subject: [PATCH 1/2] Add console log on drop command error --- src/buttonEvents/Reroll.ts | 36 ++++++++++++++---------------------- src/commands/drop.ts | 35 ++++++++++++++--------------------- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index 274c846..3b86e72 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -27,45 +27,37 @@ 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 quantityClaimed = inventory ? inventory.Quantity : 0; + 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); - 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); - 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`); - } + await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`); } - - CoreClient.ClaimId = claimId; } } \ No newline at end of file diff --git a/src/commands/drop.ts b/src/commands/drop.ts index 9c6646a..5a8ccd9 100644 --- a/src/commands/drop.ts +++ b/src/commands/drop.ts @@ -35,45 +35,38 @@ 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 quantityClaimed = inventory ? inventory.Quantity : 0; + 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); - 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); - 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`); - } + await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`); } - CoreClient.ClaimId = claimId; } } \ No newline at end of file From 0029e4a4561656f4dda7c2dd4d4fd3c129b2f52c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Wed, 13 Dec 2023 17:33:21 +0000 Subject: [PATCH 2/2] Update .env version to 0.3.1 --- .dev.env | 2 +- .prod.env | 2 +- .stage.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dev.env b/.dev.env index 853096a..d1b74b1 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.3.0 DEV +BOT_VER=0.3.1 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index c2d4d52..0755c1e 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.3.0 +BOT_VER=0.3.1 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index 131fe37..4f70991 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.3.0 BETA +BOT_VER=0.3.1 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235