remove the war crimes that I previously committed

- Remove custom typings and replace with declaration merging
- Fix the typings for args
- Replace all discord-api-types imports with discord.js imports
- Fix discord.js breaking changes

1 files changed, 151 insertions, 149 deletions

diff --git a/src/commands/dev/test.ts b/src/commands/dev/test.ts
index 2d7b1f8..d54d544 100644
--- a/src/commands/dev/test.ts
+++ b/src/commands/dev/test.ts
@@ -1,11 +1,11 @@
-import { BushCommand, ButtonPaginator, Shared, type BushMessage } from '#lib';
-import { Routes } from 'discord-api-types/rest/v9';
+import { BushCommand, ButtonPaginator, OptArgType, Shared, type CommandMessage } from '#lib';
 import {
 	ActionRowBuilder,
 	ButtonBuilder,
 	ButtonStyle,
 	EmbedBuilder,
 	GatewayDispatchEvents,
+	Routes,
 	type ApplicationCommand,
 	type Collection
 } from 'discord.js';
@@ -38,7 +38,7 @@ export default class TestCommand extends BushCommand {
 		});
 	}
 
-	public override async exec(message: BushMessage, args: { feature: string }) {
+	public override async exec(message: CommandMessage, args: { feature: OptArgType<'string'> }) {
 		const responses = [
 			'Yes master.',
 			'Test it your self bitch, I am hungry.',
@@ -51,166 +51,168 @@ export default class TestCommand extends BushCommand {
 			return await message.util.reply(responses[Math.floor(Math.random() * responses.length)]);
 		}
 
-		if (['button', 'buttons'].includes(args.feature?.toLowerCase())) {
-			const buttonRow = new ActionRowBuilder<ButtonBuilder>().addComponents([
-				new ButtonBuilder({ style: ButtonStyle.Primary, customId: 'primaryButton', label: 'Primary' }),
-				new ButtonBuilder({ style: ButtonStyle.Secondary, customId: 'secondaryButton', label: 'Secondary' }),
-				new ButtonBuilder({ style: ButtonStyle.Success, customId: 'successButton', label: 'Success' }),
-				new ButtonBuilder({ style: ButtonStyle.Danger, customId: 'dangerButton', label: 'Danger' }),
-				new ButtonBuilder({ style: ButtonStyle.Link, label: 'Link', url: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ' })
-			]);
-			return await message.util.reply({ content: 'buttons', components: [buttonRow] });
-		} else if (['embed', 'button embed'].includes(args.feature?.toLowerCase())) {
-			const embed = new EmbedBuilder()
-				.addFields([{ name: 'Field Name', value: 'Field Content' }])
-				.setAuthor({ name: 'Author', iconURL: 'https://www.w3schools.com/w3css/img_snowtops.jpg', url: 'https://google.com/' })
-				.setColor(message.member?.displayColor ?? util.colors.default)
-				.setDescription('Description')
-				.setFooter({ text: 'Footer', iconURL: message.author.avatarURL() ?? undefined })
-				.setURL('https://duckduckgo.com/')
-				.setTimestamp()
-				.setImage('https://media.sproutsocial.com/uploads/2017/02/10x-featured-social-media-image-size.png')
-				.setThumbnail(
-					'https://images.unsplash.com/photo-1501183007986-d0d080b147f9?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2134&q=80'
-				)
-				.setTitle('Title');
+		if (args.feature) {
+			if (['button', 'buttons'].includes(args.feature?.toLowerCase())) {
+				const buttonRow = new ActionRowBuilder<ButtonBuilder>().addComponents([
+					new ButtonBuilder({ style: ButtonStyle.Primary, customId: 'primaryButton', label: 'Primary' }),
+					new ButtonBuilder({ style: ButtonStyle.Secondary, customId: 'secondaryButton', label: 'Secondary' }),
+					new ButtonBuilder({ style: ButtonStyle.Success, customId: 'successButton', label: 'Success' }),
+					new ButtonBuilder({ style: ButtonStyle.Danger, customId: 'dangerButton', label: 'Danger' }),
+					new ButtonBuilder({ style: ButtonStyle.Link, label: 'Link', url: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ' })
+				]);
+				return await message.util.reply({ content: 'buttons', components: [buttonRow] });
+			} else if (['embed', 'button embed'].includes(args.feature?.toLowerCase())) {
+				const embed = new EmbedBuilder()
+					.addFields([{ name: 'Field Name', value: 'Field Content' }])
+					.setAuthor({ name: 'Author', iconURL: 'https://www.w3schools.com/w3css/img_snowtops.jpg', url: 'https://google.com/' })
+					.setColor(message.member?.displayColor ?? util.colors.default)
+					.setDescription('Description')
+					.setFooter({ text: 'Footer', iconURL: message.author.avatarURL() ?? undefined })
+					.setURL('https://duckduckgo.com/')
+					.setTimestamp()
+					.setImage('https://media.sproutsocial.com/uploads/2017/02/10x-featured-social-media-image-size.png')
+					.setThumbnail(
+						'https://images.unsplash.com/photo-1501183007986-d0d080b147f9?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2134&q=80'
+					)
+					.setTitle('Title');
 
-			const buttonRow = new ActionRowBuilder<ButtonBuilder>().addComponents([
-				new ButtonBuilder({ style: ButtonStyle.Link, label: 'Link', url: 'https://google.com/' })
-			]);
-			return await message.util.reply({ content: 'Test', embeds: [embed], components: [buttonRow] });
-		} else if (['lots of buttons'].includes(args.feature?.toLowerCase())) {
-			const buttonRows: ActionRowBuilder<ButtonBuilder>[] = [];
-			for (let a = 1; a <= 5; a++) {
-				const row = new ActionRowBuilder<ButtonBuilder>();
-				for (let b = 1; b <= 5; b++) {
-					const id = (a + 5 * (b - 1)).toString();
-					const button = new ButtonBuilder({ style: ButtonStyle.Primary, customId: id, label: id });
-					row.addComponents([button]);
+				const buttonRow = new ActionRowBuilder<ButtonBuilder>().addComponents([
+					new ButtonBuilder({ style: ButtonStyle.Link, label: 'Link', url: 'https://google.com/' })
+				]);
+				return await message.util.reply({ content: 'Test', embeds: [embed], components: [buttonRow] });
+			} else if (['lots of buttons'].includes(args.feature?.toLowerCase())) {
+				const buttonRows: ActionRowBuilder<ButtonBuilder>[] = [];
+				for (let a = 1; a <= 5; a++) {
+					const row = new ActionRowBuilder<ButtonBuilder>();
+					for (let b = 1; b <= 5; b++) {
+						const id = (a + 5 * (b - 1)).toString();
+						const button = new ButtonBuilder({ style: ButtonStyle.Primary, customId: id, label: id });
+						row.addComponents([button]);
+					}
+					buttonRows.push(row);
 				}
-				buttonRows.push(row);
-			}
-			return await message.util.reply({ content: 'buttons', components: buttonRows });
-		} else if (['paginate'].includes(args.feature?.toLowerCase())) {
-			const embeds = [];
-			for (let i = 1; i <= 5; i++) {
-				embeds.push(new EmbedBuilder().setDescription(i.toString()));
-			}
-			return await ButtonPaginator.send(message, embeds);
-		} else if (['lots of embeds'].includes(args.feature?.toLowerCase())) {
-			const description = 'This is a description.';
-			const _avatar = message.author.avatarURL() ?? undefined;
-			const author = { name: 'This is a author', iconURL: _avatar };
-			const footer = { text: 'This is a footer', iconURL: _avatar };
-			const fields = Array(25)
-				.fill(0)
-				.map((_, i) => ({ name: `Field ${i}`, value: 'Field Value' }));
-			const c = util.colors;
-			const o = { description, author, footer, fields, time: Date.now() };
+				return await message.util.reply({ content: 'buttons', components: buttonRows });
+			} else if (['paginate'].includes(args.feature?.toLowerCase())) {
+				const embeds = [];
+				for (let i = 1; i <= 5; i++) {
+					embeds.push(new EmbedBuilder().setDescription(i.toString()));
+				}
+				return await ButtonPaginator.send(message, embeds);
+			} else if (['lots of embeds'].includes(args.feature?.toLowerCase())) {
+				const description = 'This is a description.';
+				const _avatar = message.author.avatarURL() ?? undefined;
+				const author = { name: 'This is a author', iconURL: _avatar };
+				const footer = { text: 'This is a footer', iconURL: _avatar };
+				const fields = Array(25)
+					.fill(0)
+					.map((_, i) => ({ name: `Field ${i}`, value: 'Field Value' }));
+				const c = util.colors;
+				const o = { description, author, footer, fields, time: Date.now() };
 
-			const colors = [c.red, c.orange, c.gold, c.yellow, c.green, c.darkGreen, c.aqua, c.blue, c.purple, c.pink];
+				const colors = [c.red, c.orange, c.gold, c.yellow, c.green, c.darkGreen, c.aqua, c.blue, c.purple, c.pink];
 
-			const embeds = colors.map((c, i) => ({ ...o, title: `Embed Title ${i}`, color: c }));
+				const embeds = colors.map((c, i) => ({ ...o, title: `Embed Title ${i}`, color: c }));
 
-			const ButtonRows: ActionRowBuilder<ButtonBuilder>[] = [];
-			for (let a = 1; a <= 5; a++) {
-				const row = new ActionRowBuilder<ButtonBuilder>();
-				for (let b = 1; b <= 5; b++) {
-					const id = (a + 5 * (b - 1)).toString();
-					const button = new ButtonBuilder({ style: ButtonStyle.Secondary, customId: id, label: id });
-					row.addComponents([button]);
+				const ButtonRows: ActionRowBuilder<ButtonBuilder>[] = [];
+				for (let a = 1; a <= 5; a++) {
+					const row = new ActionRowBuilder<ButtonBuilder>();
+					for (let b = 1; b <= 5; b++) {
+						const id = (a + 5 * (b - 1)).toString();
+						const button = new ButtonBuilder({ style: ButtonStyle.Secondary, customId: id, label: id });
+						row.addComponents([button]);
+					}
+					ButtonRows.push(row);
 				}
-				ButtonRows.push(row);
-			}
-			return await message.util.reply({ content: 'this is content', components: ButtonRows, embeds });
-		} else if (['delete slash commands'].includes(args.feature?.toLowerCase())) {
-			if (!message.guild) return await message.util.reply(`${util.emojis.error} This test can only be run in a guild.`);
-			await client.guilds.fetch();
-			const promises: Promise<Collection<string, ApplicationCommand>>[] = [];
-			client.guilds.cache.each((guild) => {
-				promises.push(guild.commands.set([]));
-			});
-			await Promise.all(promises);
+				return await message.util.reply({ content: 'this is content', components: ButtonRows, embeds });
+			} else if (['delete slash commands'].includes(args.feature?.toLowerCase())) {
+				if (!message.guild) return await message.util.reply(`${util.emojis.error} This test can only be run in a guild.`);
+				await client.guilds.fetch();
+				const promises: Promise<Collection<string, ApplicationCommand>>[] = [];
+				client.guilds.cache.each((guild) => {
+					promises.push(guild.commands.set([]));
+				});
+				await Promise.all(promises);
 
-			await client.application!.commands.fetch();
-			await client.application!.commands.set([]);
+				await client.application!.commands.fetch();
+				await client.application!.commands.set([]);
 
-			return await message.util.reply(`${util.emojis.success} Removed guild commands and global commands.`);
-		} else if (['drop down', 'drop downs', 'select menu', 'select menus'].includes(args.feature?.toLowerCase())) {
-			return message.util.reply(`${util.emojis.error} no`);
-		} else if (['sync automod'].includes(args.feature?.toLowerCase())) {
-			const row = (await Shared.findByPk(0))!;
-			row.badLinks = badLinksArray;
-			row.badLinksSecret = badLinksSecretArray;
-			row.badWords = badWords;
-			await row.save();
-			return await message.util.reply(`${util.emojis.success} Synced automod.`);
-		} else if (['modal'].includes(args.feature?.toLowerCase())) {
-			const m = await message.util.reply({
-				content: 'Click for modal',
-				components: [
-					new ActionRowBuilder<ButtonBuilder>().addComponents([
-						new ButtonBuilder({ style: ButtonStyle.Primary, label: 'Modal', customId: 'test;modal' })
-					])
-				]
-			});
+				return await message.util.reply(`${util.emojis.success} Removed guild commands and global commands.`);
+			} else if (['drop down', 'drop downs', 'select menu', 'select menus'].includes(args.feature?.toLowerCase())) {
+				return message.util.reply(`${util.emojis.error} no`);
+			} else if (['sync automod'].includes(args.feature?.toLowerCase())) {
+				const row = (await Shared.findByPk(0))!;
+				row.badLinks = badLinksArray;
+				row.badLinksSecret = badLinksSecretArray;
+				row.badWords = badWords;
+				await row.save();
+				return await message.util.reply(`${util.emojis.success} Synced automod.`);
+			} else if (['modal'].includes(args.feature?.toLowerCase())) {
+				const m = await message.util.reply({
+					content: 'Click for modal',
+					components: [
+						new ActionRowBuilder<ButtonBuilder>().addComponents([
+							new ButtonBuilder({ style: ButtonStyle.Primary, label: 'Modal', customId: 'test;modal' })
+						])
+					]
+				});
 
-			// eslint-disable-next-line @typescript-eslint/no-misused-promises
-			client.ws.on(GatewayDispatchEvents.InteractionCreate, async (i: any) => {
-				if (i?.data?.custom_id !== 'test;modal' || i?.data?.component_type !== 2) return;
-				if (i?.message?.id !== m.id) return;
+				// eslint-disable-next-line @typescript-eslint/no-misused-promises
+				client.ws.on(GatewayDispatchEvents.InteractionCreate, async (i: any) => {
+					if (i?.data?.custom_id !== 'test;modal' || i?.data?.component_type !== 2) return;
+					if (i?.message?.id !== m.id) return;
 
-				const text = { type: 4, style: 1, min_length: 1, max_length: 4000, required: true };
+					const text = { type: 4, style: 1, min_length: 1, max_length: 4000, required: true };
 
-				await this.client.rest.post(Routes.interactionCallback(i.id, i.token), {
-					body: {
-						type: 9,
-						data: {
-							custom_id: 'test;login',
-							title: 'Login (real)',
-							components: [
-								{
-									type: 1,
-									components: [
-										{
-											...text,
-											custom_id: 'test;login;email',
-											label: 'Email',
-											placeholder: 'Email'
-										}
-									]
-								},
-								{
-									type: 1,
-									components: [
-										{
-											...text,
-											custom_id: 'test;login;password',
-											label: 'Password',
-											placeholder: 'Password'
-										}
-									]
-								},
-								{
-									type: 1,
-									components: [
-										{
-											...text,
-											custom_id: 'test;login;2fa',
-											label: 'Enter Discord Auth Code',
-											min_length: 6,
-											max_length: 6,
-											placeholder: '6-digit authentication code'
-										}
-									]
-								}
-							]
+					await this.client.rest.post(Routes.interactionCallback(i.id, i.token), {
+						body: {
+							type: 9,
+							data: {
+								custom_id: 'test;login',
+								title: 'Login (real)',
+								components: [
+									{
+										type: 1,
+										components: [
+											{
+												...text,
+												custom_id: 'test;login;email',
+												label: 'Email',
+												placeholder: 'Email'
+											}
+										]
+									},
+									{
+										type: 1,
+										components: [
+											{
+												...text,
+												custom_id: 'test;login;password',
+												label: 'Password',
+												placeholder: 'Password'
+											}
+										]
+									},
+									{
+										type: 1,
+										components: [
+											{
+												...text,
+												custom_id: 'test;login;2fa',
+												label: 'Enter Discord Auth Code',
+												min_length: 6,
+												max_length: 6,
+												placeholder: '6-digit authentication code'
+											}
+										]
+									}
+								]
+							}
 						}
-					}
+					});
 				});
-			});
 
-			return;
+				return;
+			}
 		}
 		return await message.util.reply(responses[Math.floor(Math.random() * responses.length)]);
 	}