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

diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts
index 77951c3..f4bd52b 100644
--- a/src/commands/moderation/ban.ts
+++ b/src/commands/moderation/ban.ts
@@ -4,9 +4,9 @@ import {
 	BushCommand,
 	Moderation,
 	type ArgType,
-	type BushMessage,
-	type BushSlashMessage,
-	type OptArgType
+	type CommandMessage,
+	type OptArgType,
+	type SlashMessage
 } from '#lib';
 import assert from 'assert';
 import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js';
@@ -71,12 +71,12 @@ export default class BanCommand extends BushCommand {
 	}
 
 	public override async exec(
-		message: BushMessage | BushSlashMessage,
+		message: CommandMessage | SlashMessage,
 		args: {
-			user: ArgType<'user'> | ArgType<'snowflake'>;
+			user: ArgType<'user' | 'snowflake'>;
 			reason_and_duration: OptArgType<'contentWithDuration'> | string;
 			days: OptArgType<'integer'>;
-			force: boolean;
+			force: ArgType<'flag'>;
 		}
 	) {
 		assert(message.inGuild());