diff --git a/src/buttonEvents/Inventory.ts b/src/buttonEvents/Inventory.ts deleted file mode 100644 index 63ea5a4..0000000 --- a/src/buttonEvents/Inventory.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ButtonInteraction } from "discord.js"; -import { ButtonEvent } from "../type/buttonEvent"; -import InventoryHelper from "../helpers/InventoryHelper"; - -export default class Inventory extends ButtonEvent { - public override async execute(interaction: ButtonInteraction) { - const userid = interaction.customId.split(' ')[1]; - const page = interaction.customId.split(' ')[2]; - - try { - const embed = await InventoryHelper.GenerateInventoryPage(interaction.user.username, userid, Number(page)); - - await interaction.update({ - embeds: [ embed.embed ], - components: [ embed.row ], - }); - } catch { - await interaction.reply("No page for user found."); - } - } -} \ No newline at end of file diff --git a/src/client/client.ts b/src/client/client.ts index 85ef43e..5dee253 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -84,7 +84,11 @@ export class CoreClient extends Client { console.log(`Registered Events: ${CoreClient._eventItems.flatMap(x => x.EventType).join(", ")}`); console.log(`Registered Buttons: ${CoreClient._buttonEvents.flatMap(x => x.ButtonId).join(", ")}`); - await super.login(process.env.BOT_TOKEN); + const page = await InventoryHelper.GenerateInventoryPage('125776189666230272', 0); + + console.log(page); + + // await super.login(process.env.BOT_TOKEN); } public static RegisterCommand(name: string, command: Command, environment: Environment = Environment.All, serverId?: string) { diff --git a/src/commands/inventory.ts b/src/commands/inventory.ts index 39d0881..37b23c8 100644 --- a/src/commands/inventory.ts +++ b/src/commands/inventory.ts @@ -1,6 +1,5 @@ import { CommandInteraction, SlashCommandBuilder } from "discord.js"; import { Command } from "../type/command"; -import InventoryHelper from "../helpers/InventoryHelper"; export default class Inventory extends Command { constructor() { @@ -8,31 +7,10 @@ export default class Inventory extends Command { this.CommandBuilder = new SlashCommandBuilder() .setName('inventory') - .setDescription('View your inventory') - .addNumberOption(x => - x - .setName('page') - .setDescription('The page to start with')); + .setDescription('View your inventory'); } public override async execute(interaction: CommandInteraction) { - const page = interaction.options.get('page'); - try { - let pageNumber = 0; - - if (page && page.value) { - pageNumber = Number(page.value) - 1; - } - - const embed = await InventoryHelper.GenerateInventoryPage(interaction.user.username, interaction.user.id, pageNumber); - - await interaction.reply({ - embeds: [ embed.embed ], - components: [ embed.row ], - }); - } catch { - await interaction.reply("No page for user found."); - } } } \ No newline at end of file diff --git a/src/helpers/InventoryHelper.ts b/src/helpers/InventoryHelper.ts index ad4bf85..197a131 100644 --- a/src/helpers/InventoryHelper.ts +++ b/src/helpers/InventoryHelper.ts @@ -20,8 +20,8 @@ interface InventoryPageCards { } export default class InventoryHelper { - public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder }> { - const cardsPerPage = 15; + public static async GenerateInventoryPage(userid: string, page: number): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder }> { + const cardsPerPage = 9; const inventory = await Inventory.FetchAllByUserId(userid); @@ -76,9 +76,9 @@ export default class InventoryHelper { } const embed = new EmbedBuilder() - .setTitle(username) - .setDescription(`**${currentPage.name} (${currentPage.seriesSubpage + 1})**\n${currentPage.cards.map(x => `[${x.id}] ${x.name} (${CardRarityToString(x.type)}) x${x.quantity}`).join('\n')}`) - .setFooter({ text: `Page ${page + 1} of ${pages.length}` }) + .setTitle(`${currentPage.name} (${currentPage.seriesSubpage + 1})`) + .setDescription(currentPage.cards.map(x => `[${x.id}] ${x.name} (${CardRarityToString(x.type)}) x${x.quantity}`).join('\n')) + .setFooter({ text: `Page ${page} of ${pages.length}` }) .setColor(EmbedColours.Ok); const row = new ActionRowBuilder() @@ -92,7 +92,7 @@ export default class InventoryHelper { .setCustomId(`inventory ${userid} ${page + 1}`) .setLabel("Next") .setStyle(ButtonStyle.Primary) - .setDisabled(page + 1 == pages.length)); + .setDisabled(page == pages.length)); return { embed, row }; } diff --git a/src/registry.ts b/src/registry.ts index 679c70e..e602198 100644 --- a/src/registry.ts +++ b/src/registry.ts @@ -1,11 +1,9 @@ import { CoreClient } from "./client/client"; -import { Environment } from "./constants/Environment"; // Global Command Imports import About from "./commands/about"; import Drop from "./commands/drop"; import Gdrivesync from "./commands/gdrivesync"; -import Inventory from "./commands/inventory"; import Resync from "./commands/resync"; // Test Command Imports @@ -14,8 +12,8 @@ import Droprarity from "./commands/stage/droprarity"; // Button Event Imports import Claim from "./buttonEvents/Claim"; -import InventoryButtonEvent from "./buttonEvents/Inventory"; import Reroll from "./buttonEvents/Reroll"; +import { Environment } from "./constants/Environment"; export default class Registry { public static RegisterCommands() { @@ -23,7 +21,6 @@ export default class Registry { CoreClient.RegisterCommand('about', new About()); CoreClient.RegisterCommand('drop', new Drop()); CoreClient.RegisterCommand('gdrivesync', new Gdrivesync()); - CoreClient.RegisterCommand('inventory', new Inventory()); CoreClient.RegisterCommand('resync', new Resync()); // Test Commands @@ -37,7 +34,6 @@ export default class Registry { public static RegisterButtonEvents() { CoreClient.RegisterButtonEvent('claim', new Claim()); - CoreClient.RegisterButtonEvent('inventory', new InventoryButtonEvent); CoreClient.RegisterButtonEvent('reroll', new Reroll()); } } \ No newline at end of file