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

3 files changed, 8 insertions, 10 deletions

diff --git a/src/context-menu-commands/message/viewRaw.ts b/src/context-menu-commands/message/viewRaw.ts
index c283635..6cfe552 100644
--- a/src/context-menu-commands/message/viewRaw.ts
+++ b/src/context-menu-commands/message/viewRaw.ts
@@ -1,7 +1,6 @@
 import { ViewRawCommand } from '#commands';
-import { type BushMessage } from '#lib';
 import { ContextMenuCommand } from 'discord-akairo';
-import { ApplicationCommandType, type ContextMenuCommandInteraction } from 'discord.js';
+import { ApplicationCommandType, type ContextMenuCommandInteraction, type Message } from 'discord.js';
 
 export default class ViewRawContextMenuCommand extends ContextMenuCommand {
 	public constructor() {
@@ -14,7 +13,7 @@ export default class ViewRawContextMenuCommand extends ContextMenuCommand {
 
 	public override async exec(interaction: ContextMenuCommandInteraction) {
 		await interaction.deferReply({ ephemeral: true });
-		const embed = await ViewRawCommand.getRawData(interaction.options.getMessage('message') as BushMessage, {
+		const embed = await ViewRawCommand.getRawData(interaction.options.getMessage('message') as Message, {
 			json: false,
 			js: false
 		});
diff --git a/src/context-menu-commands/user/modlog.ts b/src/context-menu-commands/user/modlog.ts
index ac156cd..bdb311f 100644
--- a/src/context-menu-commands/user/modlog.ts
+++ b/src/context-menu-commands/user/modlog.ts
@@ -1,6 +1,6 @@
 import { ModlogCommand } from '#commands';
-import { BushCommandUtil, BushSlashMessage } from '#lib';
-import { ContextMenuCommand } from 'discord-akairo';
+import { SlashMessage } from '#lib';
+import { CommandUtil, ContextMenuCommand } from 'discord-akairo';
 import { ApplicationCommandType, type ContextMenuCommandInteraction } from 'discord.js';
 
 export default class ModlogContextMenuCommand extends ContextMenuCommand {
@@ -25,8 +25,8 @@ export default class ModlogContextMenuCommand extends ContextMenuCommand {
 			});
 
 		await interaction.deferReply({ ephemeral: true });
-		const pseudoMessage = new BushSlashMessage(client, interaction as any);
-		pseudoMessage.util = new BushCommandUtil(client.commandHandler, pseudoMessage);
+		const pseudoMessage = new SlashMessage(client, interaction as any);
+		pseudoMessage.util = new CommandUtil(client.commandHandler, pseudoMessage);
 
 		void new ModlogCommand().exec(pseudoMessage, { search: interaction.targetId, hidden: false });
 	}
diff --git a/src/context-menu-commands/user/userInfo.ts b/src/context-menu-commands/user/userInfo.ts
index 8ecde92..80e9883 100644
--- a/src/context-menu-commands/user/userInfo.ts
+++ b/src/context-menu-commands/user/userInfo.ts
@@ -1,7 +1,6 @@
 import { UserInfoCommand } from '#commands';
-import { type BushGuild } from '#lib';
 import { ContextMenuCommand } from 'discord-akairo';
-import { ApplicationCommandType, type ContextMenuCommandInteraction } from 'discord.js';
+import { ApplicationCommandType, type ContextMenuCommandInteraction, type Guild } from 'discord.js';
 
 export default class UserInfoContextMenuCommand extends ContextMenuCommand {
 	public constructor() {
@@ -18,7 +17,7 @@ export default class UserInfoContextMenuCommand extends ContextMenuCommand {
 		const user = await client.users.fetch(interaction.targetId).catch(() => null);
 		if (!user) return interaction.reply(`⁉ I couldn't find that user`);
 
-		const guild = interaction.guild as BushGuild;
+		const guild = interaction.guild as Guild;
 
 		const member = await guild.members.fetch(interaction.targetId).catch(() => null);
 		if (!member) return interaction.reply(`${util.format.input(user.tag)} doesn't appear to be a member of this server anymore.`);