From 1e1664473287fda10faca57bc6dceb0d8b4afd2c Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 28 Dec 2023 16:23:44 +0000 Subject: [PATCH] Start of eslint fix --- package.json | 1 + src/Functions/CardMetadataFunction.ts | 10 +- src/bot.ts | 6 +- src/buttonEvents/Claim.ts | 10 +- src/buttonEvents/Inventory.ts | 4 +- src/buttonEvents/Reroll.ts | 10 +- src/client/client.ts | 275 ++++++++++++++++-- src/client/interactionCreate/Button.ts | 4 +- .../interactionCreate/ChatInputCommand.ts | 2 +- src/client/util.ts | 74 ++--- src/commands/about.ts | 6 +- src/commands/drop.ts | 16 +- src/commands/gdrivesync.ts | 16 +- src/commands/inventory.ts | 10 +- src/commands/resync.ts | 14 +- src/commands/stage/dropnumber.ts | 20 +- src/commands/stage/droprarity.ts | 22 +- src/constants/CardRarity.ts | 72 ++--- src/contracts/AppBaseEntity.ts | 6 +- src/contracts/EventExecutors.ts | 19 ++ src/contracts/ICommandItem.ts | 6 +- src/contracts/IEventItem.ts | 9 - src/contracts/IGDriveFolderListing.ts | 4 +- src/contracts/SeriesMetadata.ts | 2 +- src/database/entities/app/Claim.ts | 4 +- src/database/entities/app/Config.ts | 4 +- src/database/entities/app/Inventory.ts | 8 +- .../app/0.1.5/1694609771821-CreateClaim.ts | 14 +- .../app/0.1/1693769942868-CreateBase.ts | 8 +- .../app/0.2/1699814500650-createConfig.ts | 8 +- src/helpers/CardDropHelperMetadata.ts | 4 +- src/helpers/InventoryHelper.ts | 7 +- src/helpers/MigrationHelper.ts | 4 +- src/helpers/StringTools.ts | 10 +- src/helpers/TimeLengthInput.ts | 12 +- src/hooks/ReloadDB.ts | 2 +- src/registry.ts | 20 +- src/type/buttonEvent.ts | 6 +- src/type/command.ts | 10 +- src/webhooks.ts | 2 +- 40 files changed, 477 insertions(+), 264 deletions(-) create mode 100644 src/contracts/EventExecutors.ts delete mode 100644 src/contracts/IEventItem.ts diff --git a/package.json b/package.json index f3f67dc..18f9505 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "start": "node ./dist/bot.js", "test": "jest --passWithNoTests", "lint": "eslint .", + "lint:fix": "eslint . --fix", "db:up": "typeorm migration:run -d dist/database/dataSources/appDataSource.js", "db:down": "typeorm migration:revert -d dist/database/dataSources/appDataSource.js", "db:create": "typeorm migration:create ./src/database/migrations/app/new", diff --git a/src/Functions/CardMetadataFunction.ts b/src/Functions/CardMetadataFunction.ts index 1d52a27..5a62bfa 100644 --- a/src/Functions/CardMetadataFunction.ts +++ b/src/Functions/CardMetadataFunction.ts @@ -2,12 +2,12 @@ import { readFileSync } from "fs"; import path from "path"; import Config from "../database/entities/app/Config"; import { glob } from "glob"; -import SeriesMetadata from "../contracts/SeriesMetadata"; +import { SeriesMetadata } from "../contracts/SeriesMetadata"; import { CoreClient } from "../client/client"; export default class CardMetadataFunction { public static async Execute(overrideSafeMode: boolean = false): Promise { - if (!overrideSafeMode && await Config.GetValue('safemode') == "true") return false; + if (!overrideSafeMode && await Config.GetValue("safemode") == "true") return false; try { CoreClient.Cards = await this.FindMetadataJSONs(); @@ -16,7 +16,7 @@ export default class CardMetadataFunction { } catch (e) { console.error(e); - await Config.SetValue('safemode', 'true'); + await Config.SetValue("safemode", "true"); return false; } @@ -26,9 +26,9 @@ export default class CardMetadataFunction { private static async FindMetadataJSONs(): Promise { const res: SeriesMetadata[] = []; - const seriesJSONs = await glob(path.join(process.cwd(), 'cards', '/**/*.json')); + const seriesJSONs = await glob(path.join(process.cwd(), "cards", "/**/*.json")); - for (let jsonPath of seriesJSONs) { + for (const jsonPath of seriesJSONs) { console.log(`Reading file ${jsonPath}`); const jsonFile = readFileSync(jsonPath); const parsedJson: SeriesMetadata[] = JSON.parse(jsonFile.toString()); diff --git a/src/bot.ts b/src/bot.ts index 8bddbf4..aea4ffc 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -22,7 +22,7 @@ const requiredConfigs: string[] = [ "DB_LOGGING", "EXPRESS_PORT", "GDRIVESYNC_WHITELIST", -] +]; requiredConfigs.forEach(config => { if (!process.env[config]) { @@ -39,7 +39,7 @@ Registry.RegisterCommands(); Registry.RegisterEvents(); Registry.RegisterButtonEvents(); -if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') { +if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") { console.log("Card directory not found, syncing..."); CoreClient.AllowDrops = false; @@ -49,7 +49,7 @@ if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && proc console.error(error.code); throw `Error while running sync command. Code: ${error.code}`; } else { - console.log('Synced successfully.'); + console.log("Synced successfully."); CoreClient.AllowDrops = true; } }); diff --git a/src/buttonEvents/Claim.ts b/src/buttonEvents/Claim.ts index 0db89fe..dd9ef5d 100644 --- a/src/buttonEvents/Claim.ts +++ b/src/buttonEvents/Claim.ts @@ -8,20 +8,20 @@ export default class Claim extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { if (!interaction.guild || !interaction.guildId) return; - const cardNumber = interaction.customId.split(' ')[1]; - const claimId = interaction.customId.split(' ')[2]; - const droppedBy = interaction.customId.split(' ')[3]; + const cardNumber = interaction.customId.split(" ")[1]; + const claimId = interaction.customId.split(" ")[2]; + const droppedBy = interaction.customId.split(" ")[3]; const userId = interaction.user.id; const claimed = await eClaim.FetchOneByClaimId(claimId); if (claimed) { - await interaction.reply('This card has already been claimed'); + await interaction.reply("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.reply("The latest dropped card can only be claimed by the user who dropped it"); return; } diff --git a/src/buttonEvents/Inventory.ts b/src/buttonEvents/Inventory.ts index 63ea5a4..6a71029 100644 --- a/src/buttonEvents/Inventory.ts +++ b/src/buttonEvents/Inventory.ts @@ -4,8 +4,8 @@ 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]; + const userid = interaction.customId.split(" ")[1]; + const page = interaction.customId.split(" ")[2]; try { const embed = await InventoryHelper.GenerateInventoryPage(interaction.user.username, userid, Number(page)); diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index 3b86e72..f353b24 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -11,19 +11,19 @@ import path from "path"; export default class Reroll extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { if (!CoreClient.AllowDrops) { - await interaction.reply('Bot is currently syncing, please wait until its done.'); + await interaction.reply("Bot is currently syncing, please wait until its done."); return; } - if (await Config.GetValue('safemode') == "true") { - await interaction.reply('Safe Mode has been activated, please resync to continue.'); + if (await Config.GetValue("safemode") == "true") { + await interaction.reply("Safe Mode has been activated, please resync to continue."); return; } const randomCard = CardDropHelperMetadata.GetRandomCard(); if (!randomCard) { - await interaction.reply('Unable to fetch card, please try again.'); + await interaction.reply("Unable to fetch card, please try again."); return; } @@ -31,7 +31,7 @@ export default class Reroll extends ButtonEvent { let image: Buffer; const imageFileName = randomCard.card.path.split("/").pop()!; - image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path)); + image = readFileSync(path.join(process.cwd(), "cards", randomCard.card.path)); await interaction.deferReply(); diff --git a/src/client/client.ts b/src/client/client.ts index 85ef43e..0dbd3d1 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -1,8 +1,8 @@ -import { Client } from "discord.js"; +import { Client, DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js"; import * as dotenv from "dotenv"; import { EventType } from "../constants/EventType"; import ICommandItem from "../contracts/ICommandItem"; -import IEventItem from "../contracts/IEventItem"; +import EventExecutors from "../contracts/EventExecutors"; import { Command } from "../type/command"; import { Events } from "./events"; @@ -13,12 +13,12 @@ import AppDataSource from "../database/dataSources/appDataSource"; import { Environment } from "../constants/Environment"; import Webhooks from "../webhooks"; import CardMetadataFunction from "../Functions/CardMetadataFunction"; -import SeriesMetadata from "../contracts/SeriesMetadata"; +import { SeriesMetadata } from "../contracts/SeriesMetadata"; import InventoryHelper from "../helpers/InventoryHelper"; export class CoreClient extends Client { private static _commandItems: ICommandItem[]; - private static _eventItems: IEventItem[]; + private static _eventExecutors: EventExecutors; private static _buttonEvents: IButtonEventItem[]; private _events: Events; @@ -34,8 +34,8 @@ export class CoreClient extends Client { return this._commandItems; } - public static get eventItems(): IEventItem[] { - return this._eventItems; + public static get eventExecutors(): EventExecutors { + return this._eventExecutors; } public static get buttonEvents(): IButtonEventItem[] { @@ -47,7 +47,6 @@ export class CoreClient extends Client { dotenv.config(); CoreClient._commandItems = []; - CoreClient._eventItems = []; CoreClient._buttonEvents = []; this._events = new Events(); @@ -75,15 +74,11 @@ export class CoreClient extends Client { await CardMetadataFunction.Execute(true); - this._util.loadEvents(this, CoreClient._eventItems); + this._util.loadEvents(this, CoreClient._eventExecutors); this._util.loadSlashCommands(this); this._webhooks.start(); - console.log(`Registered Commands: ${CoreClient._commandItems.flatMap(x => x.Name).join(", ")}`); - 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); } @@ -100,15 +95,255 @@ export class CoreClient extends Client { } } - public static RegisterEvent(eventType: EventType, func: Function, environment: Environment = Environment.All) { - const item: IEventItem = { - EventType: eventType, - ExecutionFunction: func, - Environment: environment, - }; + public static RegisterChannelCreateEvent(fn: (channel: NonThreadGuildBasedChannel) => void) { + if (this._eventExecutors) { + this._eventExecutors.ChannelCreate.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [ fn ], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } - if (environment &= CoreClient.Environment) { - CoreClient._eventItems.push(item); + public static RegisterChannelDeleteEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) { + if (this._eventExecutors) { + this._eventExecutors.ChannelDelete.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [ fn ], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterChannelUpdateEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) { + if (this._eventExecutors) { + this._eventExecutors.ChannelCreate.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [ fn ], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterGuildBanAddEvent(fn: (ban: GuildBan) => void) { + if (this._eventExecutors) { + this._eventExecutors.GuildBanAdd.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [ fn ], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterGuildBanRemoveEvent(fn: (channel: GuildBan) => void) { + if (this._eventExecutors) { + this._eventExecutors.GuildBanRemove.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [ fn ], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterGuildCreateEvent(fn: (guild: Guild) => void) { + if (this._eventExecutors) { + this._eventExecutors.GuildCreate.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [ fn ], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterGuildMemberAddEvent(fn: (member: GuildMember) => void) { + if (this._eventExecutors) { + this._eventExecutors.GuildMemberAdd.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [ fn ], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterGuildMemberRemoveEvent(fn: (member: GuildMember | PartialGuildMember) => void) { + if (this._eventExecutors) { + this._eventExecutors.GuildMemberRemove.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [ fn ], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static GuildMemebrUpdate(fn: (oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void) { + if (this._eventExecutors) { + this._eventExecutors.GuildMemebrUpdate.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [ fn ], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterMessageCreateEvent(fn: (message: Message) => void) { + if (this._eventExecutors) { + this._eventExecutors.MessageCreate.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [ fn ], + MessageDelete: [], + MessageUpdate: [], + }; + } + } + + public static RegisterMessageDeleteEvent(fn: (message: Message | PartialMessage) => void) { + if (this._eventExecutors) { + this._eventExecutors.MessageDelete.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [ fn ], + MessageUpdate: [], + }; + } + } + + public static RegisterMessageUpdateEvent(fn: (oldMessage: Message | PartialMessage, newMessage: Message | PartialMessage) => void) { + if (this._eventExecutors) { + this._eventExecutors.MessageUpdate.push(fn); + } else { + this._eventExecutors = { + ChannelCreate: [], + ChannelDelete: [], + ChannelUpdate: [], + GuildBanAdd: [], + GuildBanRemove: [], + GuildCreate: [], + GuildMemberAdd: [], + GuildMemberRemove: [], + GuildMemebrUpdate: [], + MessageCreate: [], + MessageDelete: [], + MessageUpdate: [ fn ], + }; } } diff --git a/src/client/interactionCreate/Button.ts b/src/client/interactionCreate/Button.ts index 165e426..ce71b46 100644 --- a/src/client/interactionCreate/Button.ts +++ b/src/client/interactionCreate/Button.ts @@ -5,10 +5,10 @@ export default class Button { public static async onButtonClicked(interaction: ButtonInteraction) { if (!interaction.isButton) return; - const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(' ')[0]); + const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(" ")[0]); if (!item) { - await interaction.reply('Event not found'); + await interaction.reply("Event not found"); return; } diff --git a/src/client/interactionCreate/ChatInputCommand.ts b/src/client/interactionCreate/ChatInputCommand.ts index d483f1d..3890744 100644 --- a/src/client/interactionCreate/ChatInputCommand.ts +++ b/src/client/interactionCreate/ChatInputCommand.ts @@ -13,7 +13,7 @@ export default class ChatInputCommand { if (!itemForServer) { if (!item) { - await interaction.reply('Command not found'); + await interaction.reply("Command not found"); return; } diff --git a/src/client/util.ts b/src/client/util.ts index 41b7f27..9720a7b 100644 --- a/src/client/util.ts +++ b/src/client/util.ts @@ -1,6 +1,6 @@ import { Client, REST, Routes, SlashCommandBuilder } from "discord.js"; import { EventType } from "../constants/EventType"; -import IEventItem from "../contracts/IEventItem"; +import EventExecutors from "../contracts/EventExecutors"; import { CoreClient } from "./client"; export class Util { @@ -10,9 +10,9 @@ export class Util { const globalCommands = registeredCommands.filter(x => !x.ServerId); const guildCommands = registeredCommands.filter(x => x.ServerId); - const globalCommandData: SlashCommandBuilder[] = []; + const globalCommandData: Omit[] = []; - for (let command of globalCommands) { + for (const command of globalCommands) { if (!command.Command.CommandBuilder) continue; if (command.Environment &= CoreClient.Environment) { @@ -22,13 +22,13 @@ export class Util { const guildIds: string[] = []; - for (let command of guildCommands) { + for (const command of guildCommands) { if (!guildIds.find(x => x == command.ServerId)) { guildIds.push(command.ServerId!); } } - const rest = new REST({ version: '10' }).setToken(process.env.BOT_TOKEN!); + const rest = new REST({ version: "10" }).setToken(process.env.BOT_TOKEN!); rest.put( Routes.applicationCommands(process.env.BOT_CLIENTID!), @@ -37,10 +37,10 @@ export class Util { } ); - for (let guild of guildIds) { - const guildCommandData: SlashCommandBuilder[] = []; + for (const guild of guildIds) { + const guildCommandData: Omit[] = []; - for (let command of guildCommands.filter(x => x.ServerId == guild)) { + for (const command of guildCommands.filter(x => x.ServerId == guild)) { if (!command.Command.CommandBuilder) continue; if (command.Environment &= CoreClient.Environment) { @@ -55,53 +55,23 @@ export class Util { { body: guildCommandData } - ) + ); } } // Load the events - loadEvents(client: Client, events: IEventItem[]) { - events.forEach((e) => { - switch(e.EventType) { - case EventType.ChannelCreate: - client.on('channelCreate', (channel) => e.ExecutionFunction(channel)); - break; - case EventType.ChannelDelete: - client.on('channelDelete', (channel) => e.ExecutionFunction(channel)); - break; - case EventType.ChannelUpdate: - client.on('channelUpdate', (channel) => e.ExecutionFunction(channel)); - break; - case EventType.GuildBanAdd: - client.on('guildBanAdd', (ban) => e.ExecutionFunction(ban)); - break; - case EventType.GuildBanRemove: - client.on('guildBanRemove', (ban) => e.ExecutionFunction(ban)); - break; - case EventType.GuildCreate: - client.on('guildCreate', (guild) => e.ExecutionFunction(guild)); - break; - case EventType.GuildMemberAdd: - client.on('guildMemberAdd', (member) => e.ExecutionFunction(member)); - break; - case EventType.GuildMemberRemove: - client.on('guildMemberRemove', (member) => e.ExecutionFunction(member)); - break; - case EventType.GuildMemberUpdate: - client.on('guildMemberUpdate', (oldMember, newMember) => e.ExecutionFunction(oldMember, newMember)); - break; - case EventType.MessageCreate: - client.on('messageCreate', (message) => e.ExecutionFunction(message)); - break; - case EventType.MessageDelete: - client.on('messageDelete', (message) => e.ExecutionFunction(message)); - break; - case EventType.MessageUpdate: - client.on('messageUpdate', (oldMessage, newMessage) => e.ExecutionFunction(oldMessage, newMessage)); - break; - default: - console.error('Event not implemented.'); - } - }); + loadEvents(client: Client, events: EventExecutors) { + client.on("channelCreate", (channel) => events.ChannelCreate.forEach((fn) => fn(channel))); + client.on("channelDelete", (channel) => events.ChannelDelete.forEach((fn) => fn(channel))); + client.on("channelUpdate", (channel) => events.ChannelUpdate.forEach((fn) => fn(channel))); + client.on("guildBanAdd", (ban) => events.GuildBanAdd.forEach((fn) => fn(ban))); + client.on("guildBanRemove", (ban) => events.GuildBanRemove.forEach((fn) => fn(ban))); + client.on("guildCreate", (guild) => events.GuildCreate.forEach((fn) => fn(guild))); + client.on("guildMemberAdd", (member) => events.GuildMemberAdd.forEach((fn) => fn(member))); + client.on("guildMemberRemove", (member) => events.GuildMemberRemove.forEach((fn) => fn(member))); + client.on("guildMemberUpdate", (oldMember, newMember) => events.GuildMemebrUpdate.forEach((fn) => fn(oldMember, newMember))); + client.on("messageCreate", (message) => events.MessageCreate.forEach((fn) => fn(message))); + client.on("messageDelete", (message) => events.MessageDelete.forEach((fn) => fn(message))); + client.on("messageUpdate", (oldMessage, newMessage) => events.MessageUpdate.forEach((fn) => fn(oldMessage, newMessage))); } } diff --git a/src/commands/about.ts b/src/commands/about.ts index 6e065cc..3bfcdac 100644 --- a/src/commands/about.ts +++ b/src/commands/about.ts @@ -6,9 +6,9 @@ export default class About extends Command { constructor() { super(); - super.CommandBuilder = new SlashCommandBuilder() - .setName('about') - .setDescription('About Bot'); + this.CommandBuilder = new SlashCommandBuilder() + .setName("about") + .setDescription("About Bot"); } public override async execute(interaction: CommandInteraction) { diff --git a/src/commands/drop.ts b/src/commands/drop.ts index 2ecd936..c2a613c 100644 --- a/src/commands/drop.ts +++ b/src/commands/drop.ts @@ -12,26 +12,26 @@ export default class Drop extends Command { constructor() { super(); - super.CommandBuilder = new SlashCommandBuilder() - .setName('drop') - .setDescription('Summon a new card drop'); + this.CommandBuilder = new SlashCommandBuilder() + .setName("drop") + .setDescription("Summon a new card drop"); } public override async execute(interaction: CommandInteraction) { if (!CoreClient.AllowDrops) { - await interaction.reply('Bot is currently syncing, please wait until its done.'); + await interaction.reply("Bot is currently syncing, please wait until its done."); return; } - if (await Config.GetValue('safemode') == "true") { - await interaction.reply('Safe Mode has been activated, please resync to continue.'); + if (await Config.GetValue("safemode") == "true") { + await interaction.reply("Safe Mode has been activated, please resync to continue."); return; } const randomCard = CardDropHelperMetadata.GetRandomCard(); if (!randomCard) { - await interaction.reply('Unable to fetch card, please try again.'); + await interaction.reply("Unable to fetch card, please try again."); return; } @@ -39,7 +39,7 @@ export default class Drop extends Command { let image: Buffer; const imageFileName = randomCard.card.path.split("/").pop()!; - image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path)); + image = readFileSync(path.join(process.cwd(), "cards", randomCard.card.path)); await interaction.deferReply(); diff --git a/src/commands/gdrivesync.ts b/src/commands/gdrivesync.ts index 8b60722..697e492 100644 --- a/src/commands/gdrivesync.ts +++ b/src/commands/gdrivesync.ts @@ -9,37 +9,37 @@ export default class Gdrivesync extends Command { constructor() { super(); - super.CommandBuilder = new SlashCommandBuilder() - .setName('gdrivesync') - .setDescription('Sync google drive to the bot') + this.CommandBuilder = new SlashCommandBuilder() + .setName("gdrivesync") + .setDescription("Sync google drive to the bot") .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator); } public override async execute(interaction: CommandInteraction) { if (!interaction.isChatInputCommand()) return; - const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(','); + const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(","); if (!whitelistedUsers.find(x => x == interaction.user.id)) { await interaction.reply("Only whitelisted users can use this command."); return; } - await interaction.reply('Syncing, this might take a while...'); + await interaction.reply("Syncing, this might take a while..."); CoreClient.AllowDrops = false; exec(`rclone sync card-drop-gdrive: ${process.cwd()}/cards`, async (error: ExecException | null) => { if (error) { await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`); - await Config.SetValue('safemode', 'true'); + await Config.SetValue("safemode", "true"); } else { await CardMetadataFunction.Execute(); - await interaction.editReply('Synced successfully.'); + await interaction.editReply("Synced successfully."); CoreClient.AllowDrops = true; - await Config.SetValue('safemode', 'false'); + await Config.SetValue("safemode", "false"); } }); } diff --git a/src/commands/inventory.ts b/src/commands/inventory.ts index 39d0881..7ab951f 100644 --- a/src/commands/inventory.ts +++ b/src/commands/inventory.ts @@ -7,16 +7,16 @@ export default class Inventory extends Command { super(); this.CommandBuilder = new SlashCommandBuilder() - .setName('inventory') - .setDescription('View your inventory') + .setName("inventory") + .setDescription("View your inventory") .addNumberOption(x => x - .setName('page') - .setDescription('The page to start with')); + .setName("page") + .setDescription("The page to start with")); } public override async execute(interaction: CommandInteraction) { - const page = interaction.options.get('page'); + const page = interaction.options.get("page"); try { let pageNumber = 0; diff --git a/src/commands/resync.ts b/src/commands/resync.ts index f1684b6..ace4c39 100644 --- a/src/commands/resync.ts +++ b/src/commands/resync.ts @@ -7,27 +7,27 @@ export default class Resync extends Command { constructor() { super(); - super.CommandBuilder = new SlashCommandBuilder() - .setName('resync') - .setDescription('Resync the card database') + this.CommandBuilder = new SlashCommandBuilder() + .setName("resync") + .setDescription("Resync the card database") .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator); } public override async execute(interaction: CommandInteraction) { if (!interaction.isChatInputCommand()) return; - const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(','); + const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(","); if (!whitelistedUsers.find(x => x == interaction.user.id)) { await interaction.reply("Only whitelisted users can use this command."); return; } - let result = await CardMetadataFunction.Execute(true); + const result = await CardMetadataFunction.Execute(true); if (result) { - if (await Config.GetValue('safemode') == "true") { - await Config.SetValue('safemode', 'false'); + if (await Config.GetValue("safemode") == "true") { + await Config.SetValue("safemode", "false"); await interaction.reply("Resynced database and disabled safe mode."); return; diff --git a/src/commands/stage/dropnumber.ts b/src/commands/stage/dropnumber.ts index a7de021..2306ed9 100644 --- a/src/commands/stage/dropnumber.ts +++ b/src/commands/stage/dropnumber.ts @@ -11,23 +11,23 @@ export default class Dropnumber extends Command { constructor() { super(); - super.CommandBuilder = new SlashCommandBuilder() - .setName('dropnumber') - .setDescription('(TEST) Summon a specific card') + this.CommandBuilder = new SlashCommandBuilder() + .setName("dropnumber") + .setDescription("(TEST) Summon a specific card") .addStringOption(x => x - .setName('cardnumber') - .setDescription('The card number to summon') + .setName("cardnumber") + .setDescription("The card number to summon") .setRequired(true)); } public override async execute(interaction: CommandInteraction) { if (!interaction.isChatInputCommand()) return; - const cardNumber = interaction.options.get('cardnumber'); + const cardNumber = interaction.options.get("cardnumber"); if (!cardNumber || !cardNumber.value) { - await interaction.reply('Card Number is required'); + await interaction.reply("Card Number is required"); return; } @@ -36,7 +36,7 @@ export default class Dropnumber extends Command { .find(x => x.id == cardNumber.value); if (!card) { - await interaction.reply('Card not found'); + await interaction.reply("Card not found"); return; } @@ -47,7 +47,7 @@ export default class Dropnumber extends Command { const imageFileName = card.path.split("/").pop()!; try { - image = readFileSync(path.join(process.cwd(), 'cards', card.path)); + image = readFileSync(path.join(process.cwd(), "cards", card.path)); } catch { await interaction.reply(`Unable to fetch image for card ${card.id}`); return; @@ -78,7 +78,7 @@ export default class Dropnumber extends Command { 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. Code: UNKNOWN"); } } diff --git a/src/commands/stage/droprarity.ts b/src/commands/stage/droprarity.ts index efe431f..5247546 100644 --- a/src/commands/stage/droprarity.ts +++ b/src/commands/stage/droprarity.ts @@ -12,37 +12,37 @@ export default class Droprarity extends Command { constructor() { super(); - super.CommandBuilder = new SlashCommandBuilder() - .setName('droprarity') - .setDescription('(TEST) Summon a random card of a specific rarity') + this.CommandBuilder = new SlashCommandBuilder() + .setName("droprarity") + .setDescription("(TEST) Summon a random card of a specific rarity") .addStringOption(x => x - .setName('rarity') - .setDescription('The rarity you want to summon') + .setName("rarity") + .setDescription("The rarity you want to summon") .setRequired(true)); } public override async execute(interaction: CommandInteraction) { if (!interaction.isChatInputCommand()) return; - const rarity = interaction.options.get('rarity'); + const rarity = interaction.options.get("rarity"); if (!rarity || !rarity.value) { - await interaction.reply('Rarity is required'); + await interaction.reply("Rarity is required"); return; } const rarityType = CardRarityParse(rarity.value.toString()); if (rarityType == CardRarity.Unknown) { - await interaction.reply('Invalid rarity'); + await interaction.reply("Invalid rarity"); return; } const card = await CardDropHelperMetadata.GetRandomCardByRarity(rarityType); if (!card) { - await interaction.reply('Card not found'); + await interaction.reply("Card not found"); return; } @@ -50,7 +50,7 @@ export default class Droprarity extends Command { const imageFileName = card.card.path.split("/").pop()!; try { - image = readFileSync(path.join(process.cwd(), 'cards', card.card.path)); + image = readFileSync(path.join(process.cwd(), "cards", card.card.path)); } catch { await interaction.reply(`Unable to fetch image for card ${card.card.id}`); return; @@ -81,7 +81,7 @@ export default class Droprarity extends Command { 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. Code: UNKNOWN"); } } diff --git a/src/constants/CardRarity.ts b/src/constants/CardRarity.ts index 629130a..8202a12 100644 --- a/src/constants/CardRarity.ts +++ b/src/constants/CardRarity.ts @@ -11,51 +11,51 @@ export enum CardRarity { export function CardRarityToString(rarity: CardRarity): string { switch (rarity) { - case CardRarity.Unknown: - return "Unknown"; - case CardRarity.Bronze: - return "Bronze"; - case CardRarity.Silver: - return "Silver"; - case CardRarity.Gold: - return "Gold"; - case CardRarity.Legendary: - return "Legendary"; - case CardRarity.Manga: - return "Manga"; + case CardRarity.Unknown: + return "Unknown"; + case CardRarity.Bronze: + return "Bronze"; + case CardRarity.Silver: + return "Silver"; + case CardRarity.Gold: + return "Gold"; + case CardRarity.Legendary: + return "Legendary"; + case CardRarity.Manga: + return "Manga"; } } export function CardRarityToColour(rarity: CardRarity): number { switch (rarity) { - case CardRarity.Unknown: - return EmbedColours.Grey; - case CardRarity.Bronze: - return EmbedColours.BronzeCard; - case CardRarity.Silver: - return EmbedColours.SilverCard; - case CardRarity.Gold: - return EmbedColours.GoldCard; - case CardRarity.Legendary: - return EmbedColours.LegendaryCard; - case CardRarity.Manga: - return EmbedColours.MangaCard; + case CardRarity.Unknown: + return EmbedColours.Grey; + case CardRarity.Bronze: + return EmbedColours.BronzeCard; + case CardRarity.Silver: + return EmbedColours.SilverCard; + case CardRarity.Gold: + return EmbedColours.GoldCard; + case CardRarity.Legendary: + return EmbedColours.LegendaryCard; + case CardRarity.Manga: + return EmbedColours.MangaCard; } } export function CardRarityParse(rarity: string): CardRarity { switch (rarity.toLowerCase()) { - case "bronze": - return CardRarity.Bronze; - case "silver": - return CardRarity.Silver; - case "gold": - return CardRarity.Gold; - case "legendary": - return CardRarity.Legendary; - case "manga": - return CardRarity.Manga; - default: - return CardRarity.Unknown; + case "bronze": + return CardRarity.Bronze; + case "silver": + return CardRarity.Silver; + case "gold": + return CardRarity.Gold; + case "legendary": + return CardRarity.Legendary; + case "manga": + return CardRarity.Manga; + default: + return CardRarity.Unknown; } } \ No newline at end of file diff --git a/src/contracts/AppBaseEntity.ts b/src/contracts/AppBaseEntity.ts index 8419f00..b9ca565 100644 --- a/src/contracts/AppBaseEntity.ts +++ b/src/contracts/AppBaseEntity.ts @@ -11,13 +11,13 @@ export default class AppBaseEntity { } @PrimaryColumn() - Id: string; + Id: string; @Column() - WhenCreated: Date; + WhenCreated: Date; @Column() - WhenUpdated: Date; + WhenUpdated: Date; public async Save(target: EntityTarget, entity: DeepPartial): Promise { this.WhenUpdated = new Date(); diff --git a/src/contracts/EventExecutors.ts b/src/contracts/EventExecutors.ts new file mode 100644 index 0000000..0696f45 --- /dev/null +++ b/src/contracts/EventExecutors.ts @@ -0,0 +1,19 @@ + +import { DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js"; + +interface EventExecutors { + ChannelCreate: ((channel: NonThreadGuildBasedChannel) => void)[], + ChannelDelete: ((channel: DMChannel | NonThreadGuildBasedChannel) => void)[], + ChannelUpdate: ((channel: DMChannel | NonThreadGuildBasedChannel) => void)[], + GuildBanAdd: ((ban: GuildBan) => void)[], + GuildBanRemove: ((ban: GuildBan) => void)[], + GuildCreate: ((guild: Guild) => void)[], + GuildMemberAdd: ((member: GuildMember) => void)[], + GuildMemberRemove: ((member: GuildMember | PartialGuildMember) => void)[], + GuildMemebrUpdate: ((oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void)[], + MessageCreate: ((message: Message) => void)[], + MessageDelete: ((message: Message | PartialMessage) => void)[], + MessageUpdate: ((oldMessage: Message | PartialMessage, newMessage: Message | PartialMessage) => void)[], +} + +export default EventExecutors; \ No newline at end of file diff --git a/src/contracts/ICommandItem.ts b/src/contracts/ICommandItem.ts index 3ebc670..0524a8d 100644 --- a/src/contracts/ICommandItem.ts +++ b/src/contracts/ICommandItem.ts @@ -1,9 +1,11 @@ import { Environment } from "../constants/Environment"; import { Command } from "../type/command"; -export default interface ICommandItem { +interface ICommandItem { Name: string, Command: Command, Environment: Environment, ServerId?: string, -} \ No newline at end of file +} + +export default ICommandItem; \ No newline at end of file diff --git a/src/contracts/IEventItem.ts b/src/contracts/IEventItem.ts deleted file mode 100644 index b7cc7bf..0000000 --- a/src/contracts/IEventItem.ts +++ /dev/null @@ -1,9 +0,0 @@ - -import { Environment } from "../constants/Environment"; -import { EventType } from "../constants/EventType"; - -export default interface IEventItem { - EventType: EventType, - ExecutionFunction: Function, - Environment: Environment, -} \ No newline at end of file diff --git a/src/contracts/IGDriveFolderListing.ts b/src/contracts/IGDriveFolderListing.ts index 95e8609..1187bca 100644 --- a/src/contracts/IGDriveFolderListing.ts +++ b/src/contracts/IGDriveFolderListing.ts @@ -1,4 +1,4 @@ -export default interface IGDriveFolderListing { +export interface IGDriveFolderListing { id: string, name: string, -}; \ No newline at end of file +} \ No newline at end of file diff --git a/src/contracts/SeriesMetadata.ts b/src/contracts/SeriesMetadata.ts index 3ef95c0..c363028 100644 --- a/src/contracts/SeriesMetadata.ts +++ b/src/contracts/SeriesMetadata.ts @@ -1,6 +1,6 @@ import { CardRarity } from "../constants/CardRarity"; -export default interface SeriesMetadata { +export interface SeriesMetadata { id: number, name: string, cards: CardMetadata[], diff --git a/src/database/entities/app/Claim.ts b/src/database/entities/app/Claim.ts index b4cde5e..7cdee38 100644 --- a/src/database/entities/app/Claim.ts +++ b/src/database/entities/app/Claim.ts @@ -12,10 +12,10 @@ export default class Claim extends AppBaseEntity { } @Column() - ClaimId: string; + ClaimId: string; @ManyToOne(() => Inventory, x => x.Claims) - Inventory: Inventory; + Inventory: Inventory; public SetInventory(inventory: Inventory) { this.Inventory = inventory; diff --git a/src/database/entities/app/Config.ts b/src/database/entities/app/Config.ts index 50915d0..e97728a 100644 --- a/src/database/entities/app/Config.ts +++ b/src/database/entities/app/Config.ts @@ -12,10 +12,10 @@ export default class Config extends AppBaseEntity { } @Column() - Key: string; + Key: string; @Column() - Value: string; + Value: string; public SetValue(value: string) { this.Value = value; diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts index cfe8c3d..bde4450 100644 --- a/src/database/entities/app/Inventory.ts +++ b/src/database/entities/app/Inventory.ts @@ -14,16 +14,16 @@ export default class Inventory extends AppBaseEntity { } @Column() - UserId: string; + UserId: string; @Column() - CardNumber: string; + CardNumber: string; @Column() - Quantity: number; + Quantity: number; @OneToMany(() => Claim, x => x.Inventory) - Claims: Claim[]; + Claims: Claim[]; public SetQuantity(quantity: number) { this.Quantity = quantity; diff --git a/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts b/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts index 22fe74c..ed048c7 100644 --- a/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts +++ b/src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts @@ -1,17 +1,17 @@ -import { MigrationInterface, QueryRunner } from "typeorm" -import MigrationHelper from "../../../../helpers/MigrationHelper" +import { MigrationInterface, QueryRunner } from "typeorm"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class CreateClaim1694609771821 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - MigrationHelper.Up('1694609771821-CreateClaim', '0.1.5', [ - '01-CreateClaim', - '02-MoveToClaim', - '03-AlterInventory', + MigrationHelper.Up("1694609771821-CreateClaim", "0.1.5", [ + "01-CreateClaim", + "02-MoveToClaim", + "03-AlterInventory", ], queryRunner); } - public async down(queryRunner: QueryRunner): Promise { + public async down(): Promise { } } diff --git a/src/database/migrations/app/0.1/1693769942868-CreateBase.ts b/src/database/migrations/app/0.1/1693769942868-CreateBase.ts index 709cd3d..006aa55 100644 --- a/src/database/migrations/app/0.1/1693769942868-CreateBase.ts +++ b/src/database/migrations/app/0.1/1693769942868-CreateBase.ts @@ -1,15 +1,15 @@ -import { MigrationInterface, QueryRunner } from "typeorm" -import MigrationHelper from "../../../../helpers/MigrationHelper" +import { MigrationInterface, QueryRunner } from "typeorm"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class CreateBase1693769942868 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - MigrationHelper.Up('1693769942868-CreateBase', '0.1', [ + MigrationHelper.Up("1693769942868-CreateBase", "0.1", [ "01-table/Inventory", ], queryRunner); } - public async down(queryRunner: QueryRunner): Promise { + public async down(): Promise { } } diff --git a/src/database/migrations/app/0.2/1699814500650-createConfig.ts b/src/database/migrations/app/0.2/1699814500650-createConfig.ts index 0a1f22e..2725eee 100644 --- a/src/database/migrations/app/0.2/1699814500650-createConfig.ts +++ b/src/database/migrations/app/0.2/1699814500650-createConfig.ts @@ -1,15 +1,15 @@ -import { MigrationInterface, QueryRunner } from "typeorm" -import MigrationHelper from "../../../../helpers/MigrationHelper" +import { MigrationInterface, QueryRunner } from "typeorm"; +import MigrationHelper from "../../../../helpers/MigrationHelper"; export class CreateConfig1699814500650 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - MigrationHelper.Up('1699814500650-createConfig', '0.2', [ + MigrationHelper.Up("1699814500650-createConfig", "0.2", [ "01-table/Config", ], queryRunner); } - public async down(queryRunner: QueryRunner): Promise { + public async down(): Promise { } } diff --git a/src/helpers/CardDropHelperMetadata.ts b/src/helpers/CardDropHelperMetadata.ts index 9d26609..38d8304 100644 --- a/src/helpers/CardDropHelperMetadata.ts +++ b/src/helpers/CardDropHelperMetadata.ts @@ -47,7 +47,7 @@ export default class CardDropHelperMetadata { }; } - public static GenerateDropEmbed(drop: DropResult, quantityClaimed: Number, imageFileName: string): EmbedBuilder { + public static GenerateDropEmbed(drop: DropResult, quantityClaimed: number, imageFileName: string): EmbedBuilder { let description = ""; description += `Series: ${drop.series.name}\n`; description += `Claimed: ${quantityClaimed}\n`; @@ -68,7 +68,7 @@ export default class CardDropHelperMetadata { .setLabel("Claim") .setStyle(ButtonStyle.Primary), new ButtonBuilder() - .setCustomId(`reroll`) + .setCustomId("reroll") .setLabel("Reroll") .setStyle(ButtonStyle.Secondary)); } diff --git a/src/helpers/InventoryHelper.ts b/src/helpers/InventoryHelper.ts index ad4bf85..3f4e4e9 100644 --- a/src/helpers/InventoryHelper.ts +++ b/src/helpers/InventoryHelper.ts @@ -1,7 +1,6 @@ import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js"; import Inventory from "../database/entities/app/Inventory"; import { CoreClient } from "../client/client"; -import SeriesMetadata from "../contracts/SeriesMetadata"; import EmbedColours from "../constants/EmbedColours"; import { CardRarity, CardRarityToString } from "../constants/CardRarity"; @@ -37,14 +36,14 @@ export default class InventoryHelper { const pages: InventoryPage[] = []; - for (let series of allSeriesClaimed) { + for (const series of allSeriesClaimed) { const seriesCards = series.cards; for (let i = 0; i < seriesCards.length; i+= cardsPerPage) { const cards = series.cards.slice(i, i + cardsPerPage); const pageCards: InventoryPageCards[] = []; - for (let card of cards) { + for (const card of cards) { const item = inventory.find(x => x.CardNumber == card.id); if (!item) { @@ -77,7 +76,7 @@ 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')}`) + .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}` }) .setColor(EmbedColours.Ok); diff --git a/src/helpers/MigrationHelper.ts b/src/helpers/MigrationHelper.ts index 69fee4a..5946cb1 100644 --- a/src/helpers/MigrationHelper.ts +++ b/src/helpers/MigrationHelper.ts @@ -3,7 +3,7 @@ import { QueryRunner } from "typeorm"; export default class MigrationHelper { public static Up(migrationName: string, version: string, queryFiles: string[], queryRunner: QueryRunner) { - for (let path of queryFiles) { + for (const path of queryFiles) { const query = readFileSync(`${process.cwd()}/database/${version}/${migrationName}/Up/${path}.sql`).toString(); queryRunner.query(query); @@ -11,7 +11,7 @@ export default class MigrationHelper { } public static Down(migrationName: string, version: string, queryFiles: string[], queryRunner: QueryRunner) { - for (let path of queryFiles) { + for (const path of queryFiles) { const query = readFileSync(`${process.cwd()}/database/${version}/${migrationName}/Down/${path}.sql`).toString(); queryRunner.query(query); diff --git a/src/helpers/StringTools.ts b/src/helpers/StringTools.ts index 0254dc5..cb5591a 100644 --- a/src/helpers/StringTools.ts +++ b/src/helpers/StringTools.ts @@ -1,7 +1,7 @@ export default class StringTools { public static Capitalise(str: string): string { const words = str.split(" "); - let result: string[] = []; + const result: string[] = []; words.forEach(word => { const firstLetter = word.substring(0, 1).toUpperCase(); @@ -26,17 +26,17 @@ export default class StringTools { public static RandomString(length: number) { let result = ""; - const characters = 'abcdefghkmnpqrstuvwxyz23456789'; + const characters = "abcdefghkmnpqrstuvwxyz23456789"; const charactersLength = characters.length; - for ( var i = 0; i < length; i++ ) { - result += characters.charAt(Math.floor(Math.random() * charactersLength)); + for ( let i = 0; i < length; i++ ) { + result += characters.charAt(Math.floor(Math.random() * charactersLength)); } return result; } public static ReplaceAll(str: string, find: string, replace: string) { - return str.replace(new RegExp(find, 'g'), replace); + return str.replace(new RegExp(find, "g"), replace); } } \ No newline at end of file diff --git a/src/helpers/TimeLengthInput.ts b/src/helpers/TimeLengthInput.ts index 95befa6..d1d8734 100644 --- a/src/helpers/TimeLengthInput.ts +++ b/src/helpers/TimeLengthInput.ts @@ -4,23 +4,23 @@ export default class TimeLengthInput { public readonly value: string; constructor(input: string) { - this.value = StringTools.ReplaceAll(input, ',', ''); + this.value = StringTools.ReplaceAll(input, ",", ""); } public GetDays(): number { - return this.GetValue('d'); + return this.GetValue("d"); } public GetHours(): number { - return this.GetValue('h'); + return this.GetValue("h"); } public GetMinutes(): number { - return this.GetValue('m'); + return this.GetValue("m"); } public GetSeconds(): number { - return this.GetValue('s'); + return this.GetValue("s"); } public GetMilliseconds(): number { @@ -106,7 +106,7 @@ export default class TimeLengthInput { } private GetValue(designation: string): number { - const valueSplit = this.value.split(' '); + const valueSplit = this.value.split(" "); const desString = valueSplit.find(x => x.charAt(x.length - 1) == designation); diff --git a/src/hooks/ReloadDB.ts b/src/hooks/ReloadDB.ts index 72da369..0f1c026 100644 --- a/src/hooks/ReloadDB.ts +++ b/src/hooks/ReloadDB.ts @@ -2,7 +2,7 @@ import { Request, Response } from "express"; import CardMetadataFunction from "../Functions/CardMetadataFunction"; export default async function ReloadDB(req: Request, res: Response) { - console.log('Reloading Card DB...'); + console.log("Reloading Card DB..."); await CardMetadataFunction.Execute(); diff --git a/src/registry.ts b/src/registry.ts index 679c70e..ab4dfad 100644 --- a/src/registry.ts +++ b/src/registry.ts @@ -20,15 +20,15 @@ import Reroll from "./buttonEvents/Reroll"; export default class Registry { public static RegisterCommands() { // Global Commands - 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()); + 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 - CoreClient.RegisterCommand('dropnumber', new Dropnumber(), Environment.Test); - CoreClient.RegisterCommand('droprarity', new Droprarity(), Environment.Test); + CoreClient.RegisterCommand("dropnumber", new Dropnumber(), Environment.Test); + CoreClient.RegisterCommand("droprarity", new Droprarity(), Environment.Test); } public static RegisterEvents() { @@ -36,8 +36,8 @@ export default class Registry { } public static RegisterButtonEvents() { - CoreClient.RegisterButtonEvent('claim', new Claim()); - CoreClient.RegisterButtonEvent('inventory', new InventoryButtonEvent); - CoreClient.RegisterButtonEvent('reroll', new Reroll()); + CoreClient.RegisterButtonEvent("claim", new Claim()); + CoreClient.RegisterButtonEvent("inventory", new InventoryButtonEvent); + CoreClient.RegisterButtonEvent("reroll", new Reroll()); } } \ No newline at end of file diff --git a/src/type/buttonEvent.ts b/src/type/buttonEvent.ts index 3a691cf..8a45bd0 100644 --- a/src/type/buttonEvent.ts +++ b/src/type/buttonEvent.ts @@ -1,7 +1,5 @@ import { ButtonInteraction } from "discord.js"; -export class ButtonEvent { - public execute(interaction: ButtonInteraction) { - - } +export abstract class ButtonEvent { + abstract execute(interaction: ButtonInteraction): Promise; } \ No newline at end of file diff --git a/src/type/command.ts b/src/type/command.ts index 10d091d..20f5e3a 100644 --- a/src/type/command.ts +++ b/src/type/command.ts @@ -1,9 +1,7 @@ -import { CommandInteraction } from "discord.js"; +import { CommandInteraction, SlashCommandBuilder } from "discord.js"; -export class Command { - public CommandBuilder: any; - - public execute(interaction: CommandInteraction) { +export abstract class Command { + public CommandBuilder: Omit; - } + abstract execute(interaction: CommandInteraction): Promise; } diff --git a/src/webhooks.ts b/src/webhooks.ts index ec30720..cccb598 100644 --- a/src/webhooks.ts +++ b/src/webhooks.ts @@ -19,7 +19,7 @@ export default class Webhooks { } private setupRoutes() { - this.app.post('/api/reload-db', ReloadDB); + this.app.post("/api/reload-db", ReloadDB); } private setupListen() {