From 891e013e37f3776f1c25c85e4b2df6d59df3307f Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 21 Jan 2024 13:40:06 +0000 Subject: [PATCH 1/4] Move defer reply on reroll command --- src/buttonEvents/Reroll.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index a647acd..e0d0a0b 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -28,11 +28,11 @@ export default class Reroll extends ButtonEvent { } try { + await interaction.deferReply(); + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); const imageFileName = randomCard.card.path.split("/").pop()!; - await interaction.deferReply(); - const attachment = new AttachmentBuilder(image, { name: imageFileName }); const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id); From 88339d0a43fc6ef284fa8861655b6e9bc44c7acb Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 21 Jan 2024 14:13:41 +0000 Subject: [PATCH 2/4] Update claim event to defer the reply --- src/buttonEvents/Claim.ts | 8 +++++--- src/buttonEvents/Reroll.ts | 4 ++-- src/commands/drop.ts | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/buttonEvents/Claim.ts b/src/buttonEvents/Claim.ts index dd9ef5d..a9f8c86 100644 --- a/src/buttonEvents/Claim.ts +++ b/src/buttonEvents/Claim.ts @@ -13,15 +13,17 @@ export default class Claim extends ButtonEvent { const droppedBy = interaction.customId.split(" ")[3]; const userId = interaction.user.id; + await interaction.deferReply(); + const claimed = await eClaim.FetchOneByClaimId(claimId); if (claimed) { - await interaction.reply("This card has already been claimed"); + await interaction.editReply("This card has already been claimed"); return; } if (claimId == CoreClient.ClaimId && userId != droppedBy) { - await interaction.reply("The latest dropped card can only be claimed by the user who dropped it"); + await interaction.editReply("The latest dropped card can only be claimed by the user who dropped it"); return; } @@ -40,6 +42,6 @@ export default class Claim extends ButtonEvent { await claim.Save(eClaim, claim); - await interaction.reply(`Card claimed by ${interaction.user}`); + await interaction.editReply(`Card claimed by ${interaction.user}`); } } \ No newline at end of file diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index e0d0a0b..a265bcb 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -27,9 +27,9 @@ export default class Reroll extends ButtonEvent { return; } - try { - await interaction.deferReply(); + await interaction.deferReply(); + try { const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); const imageFileName = randomCard.card.path.split("/").pop()!; diff --git a/src/commands/drop.ts b/src/commands/drop.ts index b1c3f9f..e671e76 100644 --- a/src/commands/drop.ts +++ b/src/commands/drop.ts @@ -35,9 +35,9 @@ export default class Drop extends Command { return; } - try { - await interaction.deferReply(); + await interaction.deferReply(); + try { const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); const imageFileName = randomCard.card.path.split("/").pop()!; From 25b64df8e96e9ff2e175d06826c7eadf595e9d36 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 21 Jan 2024 14:16:04 +0000 Subject: [PATCH 3/4] 0.4.2 --- .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 07dace6..e90d90a 100644 --- a/.dev.env +++ b/.dev.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.4.1 +BOT_VER=0.4.2 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/.prod.env b/.prod.env index d1230b7..3dc2ddf 100644 --- a/.prod.env +++ b/.prod.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.4.1 +BOT_VER=0.4.2 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1093810443589529631 diff --git a/.stage.env b/.stage.env index c8a3c2c..acadb00 100644 --- a/.stage.env +++ b/.stage.env @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.4.1 +BOT_VER=0.4.2 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=1147976642942214235 From 6c005940851d482f1a3f9683e0dedcc09e238efd Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Sun, 21 Jan 2024 14:16:23 +0000 Subject: [PATCH 4/4] 0.4.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9352625..c69214b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "card-drop", - "version": "0.4.1", + "version": "0.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "card-drop", - "version": "0.4.1", + "version": "0.4.2", "license": "MIT", "dependencies": { "@discordjs/rest": "^2.0.0", diff --git a/package.json b/package.json index 0f8aaaf..f0194d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.4.1", + "version": "0.4.2", "main": "./dist/bot.js", "typings": "./dist", "scripts": {