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

diff --git a/src/lib/common/ConfirmationPrompt.ts b/src/lib/common/ConfirmationPrompt.ts
index c611fd3..c95dbbc 100644
--- a/src/lib/common/ConfirmationPrompt.ts
+++ b/src/lib/common/ConfirmationPrompt.ts
@@ -1,4 +1,4 @@
-import { type BushMessage, type BushSlashMessage } from '#lib';
+import { type CommandMessage, type SlashMessage } from '#lib';
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, type MessageComponentInteraction, type MessageOptions } from 'discord.js';
 
 /**
@@ -13,13 +13,13 @@ export class ConfirmationPrompt {
 	/**
 	 * The message that triggered the command
 	 */
-	protected message: BushMessage | BushSlashMessage;
+	protected message: CommandMessage | SlashMessage;
 
 	/**
 	 * @param message The message to respond to
 	 * @param options The send message options
 	 */
-	protected constructor(message: BushMessage | BushSlashMessage, messageOptions: MessageOptions) {
+	protected constructor(message: CommandMessage | SlashMessage, messageOptions: MessageOptions) {
 		this.message = message;
 		this.messageOptions = messageOptions;
 	}
@@ -71,7 +71,7 @@ export class ConfirmationPrompt {
 	 * @param message The message to respond to
 	 * @param options The send message options
 	 */
-	public static async send(message: BushMessage | BushSlashMessage, sendOptions: MessageOptions): Promise<boolean> {
+	public static async send(message: CommandMessage | SlashMessage, sendOptions: MessageOptions): Promise<boolean> {
 		return new ConfirmationPrompt(message, sendOptions).send();
 	}
 }