From b64d1df0aa91a2062267b1e21427bdfdb017c6f9 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 19 Oct 2023 18:38:12 +0100 Subject: [PATCH] Add quantity claimed to drop embed --- src/buttonEvents/Reroll.ts | 10 +++++++++- src/commands/drop.ts | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index bc91c90..7e37a81 100644 --- a/src/buttonEvents/Reroll.ts +++ b/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}`); diff --git a/src/commands/drop.ts b/src/commands/drop.ts index 7503bf7..260f58e 100644 --- a/src/commands/drop.ts +++ b/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}`); -- 2.43.4