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, 2 insertions, 2 deletions

diff --git a/src/inhibitors/command/guild.ts b/src/inhibitors/command/guild.ts
index 69b5df9..8b249ff 100644
--- a/src/inhibitors/command/guild.ts
+++ b/src/inhibitors/command/guild.ts
@@ -1,4 +1,4 @@
-import { BushInhibitor, type BushCommand, type BushMessage, type BushSlashMessage } from '#lib';
+import { BushInhibitor, type BushCommand, type CommandMessage, type SlashMessage } from '#lib';
 
 export default class GuildInhibitor extends BushInhibitor {
 	public constructor() {
@@ -10,7 +10,7 @@ export default class GuildInhibitor extends BushInhibitor {
 		});
 	}
 
-	public override async exec(message: BushMessage | BushSlashMessage, command: BushCommand): Promise<boolean> {
+	public override async exec(message: CommandMessage | SlashMessage, command: BushCommand): Promise<boolean> {
 		if (command.channel === 'guild' && !message.guild) {
 			void client.console.verbose(
 				'guild',