diff --git a/src/buttonEvents/Inventory.ts b/src/buttonEvents/Inventory.ts index 4bfffc1..44f5374 100644 --- a/src/buttonEvents/Inventory.ts +++ b/src/buttonEvents/Inventory.ts @@ -20,6 +20,7 @@ export default class Inventory extends ButtonEvent { const embed = await InventoryHelper.GenerateInventoryPage(member.user.username, member.user.id, Number(page)); await interaction.update({ + content: `${member.user.username} - ${member.user.id}`, embeds: [ embed.embed ], components: [ embed.row ], }); diff --git a/src/commands/view.ts b/src/commands/view.ts deleted file mode 100644 index 8f89eb4..0000000 --- a/src/commands/view.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { AttachmentBuilder, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js"; -import { Command } from "../type/command"; -import { CoreClient } from "../client/client"; -import { readFileSync } from "fs"; -import path from "path"; -import Inventory from "../database/entities/app/Inventory"; -import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata"; - -export default class View extends Command { - constructor() { - super(); - - this.CommandBuilder = new SlashCommandBuilder() - .setName("view") - .setDescription("View a specific command") - .addStringOption(x => - x - .setName("cardnumber") - .setDescription("The card number to view") - .setRequired(true)); - } - - public override async execute(interaction: CommandInteraction) { - const cardNumber = interaction.options.get("cardnumber"); - - if (!cardNumber || !cardNumber.value) { - await interaction.reply("Card number is required."); - return; - } - - const card = CoreClient.Cards - .flatMap(x => x.cards) - .find(x => x.id == cardNumber.value); - - if (!card) { - await interaction.reply("Card not found."); - return; - } - - const series = CoreClient.Cards - .find(x => x.cards.includes(card))!; - - let image: Buffer; - const imageFileName = card.path.split("/").pop()!; - - try { - image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); - } catch { - await interaction.reply(`Unable to fetch image for card ${card.id}.`); - return; - } - - await interaction.deferReply(); - - const attachment = new AttachmentBuilder(image, { name: imageFileName }); - - const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id); - const quantityClaimed = inventory ? inventory.Quantity : 0; - - const embed = CardDropHelperMetadata.GenerateDropEmbed({ card, series }, quantityClaimed, imageFileName); - - try { - await interaction.editReply({ - embeds: [ embed ], - files: [ attachment ], - }); - } 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."); - } - } - } -} \ No newline at end of file diff --git a/src/helpers/CardDropHelperMetadata.ts b/src/helpers/CardDropHelperMetadata.ts index 762648d..27eebb8 100644 --- a/src/helpers/CardDropHelperMetadata.ts +++ b/src/helpers/CardDropHelperMetadata.ts @@ -63,7 +63,7 @@ export default class CardDropHelperMetadata { return new EmbedBuilder() .setTitle(drop.card.name) .setDescription(description) - .setFooter({ text: `${CardRarityToString(drop.card.type)} ยท ${drop.card.id}` }) + .setFooter({ text: CardRarityToString(drop.card.type) }) .setColor(CardRarityToColour(drop.card.type)) .setImage(`attachment://${imageFileName}`); } diff --git a/src/registry.ts b/src/registry.ts index 2fc657d..a7cf494 100644 --- a/src/registry.ts +++ b/src/registry.ts @@ -8,7 +8,6 @@ import Gdrivesync from "./commands/gdrivesync"; import Give from "./commands/give"; import Inventory from "./commands/inventory"; import Resync from "./commands/resync"; -import View from "./commands/view"; // Test Command Imports import Dropnumber from "./commands/stage/dropnumber"; @@ -28,7 +27,6 @@ export default class Registry { CoreClient.RegisterCommand("give", new Give()); CoreClient.RegisterCommand("inventory", new Inventory()); CoreClient.RegisterCommand("resync", new Resync()); - CoreClient.RegisterCommand("view", new View()); // Test Commands CoreClient.RegisterCommand("dropnumber", new Dropnumber(), Environment.Test);