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, 5 deletions

diff --git a/src/commands/moderation/block.ts b/src/commands/moderation/block.ts
index 722f08b..16beb6f 100644
--- a/src/commands/moderation/block.ts
+++ b/src/commands/moderation/block.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';
@@ -58,15 +58,16 @@ export default class BlockCommand extends BushCommand {
 	}
 
 	public override async exec(
-		message: BushMessage | BushSlashMessage,
+		message: CommandMessage | SlashMessage,
 		args: {
 			user: ArgType<'user'>;
 			reason_and_duration: OptArgType<'contentWithDuration'> | string;
-			force?: ArgType<'boolean'>;
+			force: ArgType<'flag'>;
 		}
 	) {
 		assert(message.inGuild());
 		assert(message.member);
+		assert(message.channel);
 
 		if (!message.channel.isTextBased())
 			return message.util.send(`${util.emojis.error} This command can only be used in text based channels.`);