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

6 files changed, 27 insertions, 26 deletions

diff --git a/src/commands/config/_customAutomodPhrases.ts b/src/commands/config/_customAutomodPhrases.ts
index bd9bab5..13887ae 100644
--- a/src/commands/config/_customAutomodPhrases.ts
+++ b/src/commands/config/_customAutomodPhrases.ts
@@ -1,5 +1,5 @@
-// import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib';
-// import { PermissionFlagsBits } from 'discord.js';
+// import { BushCommand, type ArgType, type CommandMessage, type OptArgType, type SlashMessage } from '#lib';
+// import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js';
 
 // export default class CustomAutomodPhrasesCommand extends BushCommand {
 // 	public constructor() {
@@ -36,7 +36,7 @@
 // 	}
 
 // 	public override async exec(
-// 		message: BushMessage | BushSlashMessage,
-// 		args: { required_argument: string; optional_argument: string }
+// 		message: CommandMessage | SlashMessage,
+// 		args: { required_argument: ArgType<'string'>; optional_argument: OptArgType<'string'> }
 // 	) {}
 // }
diff --git a/src/commands/config/blacklist.ts b/src/commands/config/blacklist.ts
index ba2d24a..de457c0 100644
--- a/src/commands/config/blacklist.ts
+++ b/src/commands/config/blacklist.ts
@@ -1,6 +1,6 @@
-import { AllowedMentions, BushCommand, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
+import { AllowedMentions, BushCommand, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
 import assert from 'assert';
-import { ApplicationCommandOptionType, PermissionFlagsBits, User } from 'discord.js';
+import { ApplicationCommandOptionType, GuildMember, PermissionFlagsBits, User } from 'discord.js';
 
 export default class BlacklistCommand extends BushCommand {
 	public constructor() {
@@ -47,11 +47,11 @@ export default class BlacklistCommand extends BushCommand {
 	}
 
 	public override async exec(
-		message: BushMessage | BushSlashMessage,
+		message: CommandMessage | SlashMessage,
 		args: {
 			action?: 'blacklist' | 'unblacklist';
-			target: ArgType<'channel'> | ArgType<'user'> | string; // there is no way to combine channel and user in slash commands without making subcommands
-			global: ArgType<'boolean'>;
+			target: ArgType<'channel' | 'user'> | string; // there is no way to combine channel and user in slash commands without making subcommands
+			global: ArgType<'flag'>;
 		}
 	) {
 		let action: 'blacklist' | 'unblacklist' | 'toggle' =
@@ -88,7 +88,7 @@ export default class BlacklistCommand extends BushCommand {
 
 		const success = await (global
 			? util.setGlobal(key, newValue)
-			: message.guild!.setSetting(key, newValue, message.member!)
+			: message.guild!.setSetting(key, newValue, message.member as GuildMember)
 		).catch(() => false);
 
 		if (!success)
diff --git a/src/commands/config/config.ts b/src/commands/config/config.ts
index e203d12..689a3af 100644
--- a/src/commands/config/config.ts
+++ b/src/commands/config/config.ts
@@ -4,12 +4,13 @@ import {
 	guildSettingsObj,
 	settingsArr,
 	type ArgType,
-	type BushMessage,
-	type BushSlashMessage,
+	type CommandMessage,
 	type GuildSettings,
-	type GuildSettingType
+	type GuildSettingType,
+	type SlashMessage
 } from '#lib';
 import assert from 'assert';
+
 import { type ArgumentGeneratorReturn, type SlashOption } from 'discord-akairo';
 import {
 	ActionRowBuilder,
@@ -149,7 +150,7 @@ export default class ConfigCommand extends BushCommand {
 		});
 	}
 
-	public override *args(message: BushMessage): ArgumentGeneratorReturn {
+	public override *args(message: CommandMessage): ArgumentGeneratorReturn {
 		const optional = message.util.parsed!.alias === 'settings';
 		const setting: GuildSettings = yield {
 			id: 'setting',
@@ -205,13 +206,13 @@ export default class ConfigCommand extends BushCommand {
 	}
 
 	public override async exec(
-		message: BushMessage | BushSlashMessage,
+		message: CommandMessage | SlashMessage,
 		args: {
 			setting?: GuildSettings;
 			subcommandGroup?: GuildSettings;
 			action?: Action;
 			subcommand?: Action;
-			value: ArgType<'channel'> | ArgType<'role'> | string;
+			value: ArgType<'channel' | 'role'> | string;
 		}
 	) {
 		assert(message.inGuild());
@@ -305,7 +306,7 @@ export default class ConfigCommand extends BushCommand {
 	}
 
 	public async generateMessageOptions(
-		message: BushMessage | BushSlashMessage,
+		message: CommandMessage | SlashMessage,
 		setting?: undefined | keyof typeof guildSettingsObj
 	): Promise<MessageOptions & InteractionUpdateOptions> {
 		assert(message.inGuild());
diff --git a/src/commands/config/disable.ts b/src/commands/config/disable.ts
index dea7b0f..373b5f6 100644
--- a/src/commands/config/disable.ts
+++ b/src/commands/config/disable.ts
@@ -1,4 +1,4 @@
-import { AllowedMentions, BushCommand, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
+import { AllowedMentions, BushCommand, type ArgType, type CommandMessage, type SlashMessage } from '#lib';
 import assert from 'assert';
 import { ApplicationCommandOptionType, AutocompleteInteraction, PermissionFlagsBits } from 'discord.js';
 import Fuse from 'fuse.js';
@@ -54,8 +54,8 @@ export default class DisableCommand extends BushCommand {
 	}
 
 	public override async exec(
-		message: BushMessage | BushSlashMessage,
-		args: { action?: 'enable' | 'disable'; command: ArgType<'commandAlias'> | string; global: boolean }
+		message: CommandMessage | SlashMessage,
+		args: { action?: 'enable' | 'disable'; command: ArgType<'commandAlias'> | string; global: ArgType<'flag'> }
 	) {
 		assert(message.inGuild());
 
diff --git a/src/commands/config/features.ts b/src/commands/config/features.ts
index 2eee0fe..95ae544 100644
--- a/src/commands/config/features.ts
+++ b/src/commands/config/features.ts
@@ -2,9 +2,9 @@ import {
 	BushCommand,
 	guildFeaturesArr,
 	guildFeaturesObj,
-	type BushMessage,
-	type BushSlashMessage,
-	type GuildFeatures
+	type CommandMessage,
+	type GuildFeatures,
+	type SlashMessage
 } from '#lib';
 import assert from 'assert';
 import {
@@ -32,7 +32,7 @@ export default class FeaturesCommand extends BushCommand {
 		});
 	}
 
-	public override async exec(message: BushMessage | BushSlashMessage) {
+	public override async exec(message: CommandMessage | SlashMessage) {
 		assert(message.inGuild());
 
 		const featureEmbed = new EmbedBuilder().setTitle(`${message.guild.name}'s Features`).setColor(util.colors.default);
diff --git a/src/commands/config/log.ts b/src/commands/config/log.ts
index f99f007..7c76bdf 100644
--- a/src/commands/config/log.ts
+++ b/src/commands/config/log.ts
@@ -1,4 +1,4 @@
-import { BushCommand, guildLogsArr, type ArgType, type BushMessage, type BushSlashMessage, type GuildLogType } from '#lib';
+import { BushCommand, guildLogsArr, type ArgType, type CommandMessage, type GuildLogType, type SlashMessage } from '#lib';
 import assert from 'assert';
 import { ArgumentGeneratorReturn } from 'discord-akairo';
 import { ApplicationCommandOptionType, ChannelType, PermissionFlagsBits } from 'discord.js';
@@ -70,7 +70,7 @@ export default class LogCommand extends BushCommand {
 	}
 
 	public override async exec(
-		message: BushMessage | BushSlashMessage,
+		message: CommandMessage | SlashMessage,
 		args: { log_type: GuildLogType; channel: ArgType<'textChannel'> }
 	) {
 		assert(message.inGuild());