From aa26766b38efdfec888cafcb22edfb03cfe6bc64 Mon Sep 17 00:00:00 2001
From: MARCROCK22 <57925328+MARCROCK22@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:07:42 -0400
Subject: [PATCH] fix: onInternalError default

---
 src/client/base.ts                | 22 +++++++++++++++-------
 src/client/oninteractioncreate.ts |  4 ++--
 src/client/onmessagecreate.ts     |  2 +-
 src/commands/applications/chat.ts |  3 ++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/client/base.ts b/src/client/base.ts
index 3c8814a..8ef0fc7 100644
--- a/src/client/base.ts
+++ b/src/client/base.ts
@@ -2,7 +2,7 @@ import { join } from 'node:path';
 import { ApiHandler, Router } from '../api';
 import type { Adapter } from '../cache';
 import { Cache, MemoryAdapter } from '../cache';
-import type { Command, CommandContext, OnOptionsReturnObject, RegisteredMiddlewares } from '../commands';
+import type { Command, CommandContext, OnOptionsReturnObject, RegisteredMiddlewares, UsingClient } from '../commands';
 import { IgnoreCommand, type InferWithPrefix, type MiddlewareContext } from '../commands/applications/shared';
 import { CommandHandler } from '../commands/handler';
 import {
@@ -86,19 +86,27 @@ export class BaseClient {
 							context.client.logger.fatal(`${context.command.name}.<onRunError>`, context.author.id, error);
 						},
 						onOptionsError(context: CommandContext<{}, never>, metadata: OnOptionsReturnObject): any {
-							context.client.logger.fatal(`${context.command}.<onOptionsError>`, context.author.id, metadata);
+							context.client.logger.fatal(`${context.command.name}.<onOptionsError>`, context.author.id, metadata);
 						},
 						onMiddlewaresError(context: CommandContext<{}, never>, error: string): any {
-							context.client.logger.fatal(`${context.command}.<onMiddlewaresError>`, context.author.id, error);
+							context.client.logger.fatal(`${context.command.name}.<onMiddlewaresError>`, context.author.id, error);
 						},
 						onBotPermissionsFail(context: CommandContext<{}, never>, permissions: PermissionStrings): any {
-							context.client.logger.fatal(`${context.command}.<onBotPermissionsFail>`, context.author.id, permissions);
+							context.client.logger.fatal(
+								`${context.command.name}.<onBotPermissionsFail>`,
+								context.author.id,
+								permissions,
+							);
 						},
 						onPermissionsFail(context: CommandContext<{}, never>, permissions: PermissionStrings): any {
-							context.client.logger.fatal(`${context.command}.<onPermissionsFail>`, context.author.id, permissions);
+							context.client.logger.fatal(
+								`${context.command.name}.<onPermissionsFail>`,
+								context.author.id,
+								permissions,
+							);
 						},
-						onInternalError(context: CommandContext, error?: unknown): any {
-							context.client.logger.fatal(`${context.command}.<onInternalError>`, error);
+						onInternalError(client: UsingClient, command: Command, error?: unknown): any {
+							client.logger.fatal(`${command.name}.<onInternalError>`, error);
 						},
 					},
 				},
diff --git a/src/client/oninteractioncreate.ts b/src/client/oninteractioncreate.ts
index 1963057..ef3d9d6 100644
--- a/src/client/oninteractioncreate.ts
+++ b/src/client/oninteractioncreate.ts
@@ -63,7 +63,7 @@ export async function onInteractionCreate(
 					}
 				} catch (error) {
 					try {
-						await optionsResolver.getCommand()?.onInternalError?.(interaction, error);
+						await optionsResolver.getCommand()?.onInternalError?.(self, optionsResolver.getCommand()!, error);
 					} catch {
 						// supress error
 					}
@@ -191,7 +191,7 @@ export async function onInteractionCreate(
 								}
 							} catch (error) {
 								try {
-									await command.onInternalError?.(context, error);
+									await command.onInternalError?.(self, context.command, error);
 								} catch {
 									// supress error
 								}
diff --git a/src/client/onmessagecreate.ts b/src/client/onmessagecreate.ts
index 61b4327..cc6f4c5 100644
--- a/src/client/onmessagecreate.ts
+++ b/src/client/onmessagecreate.ts
@@ -185,7 +185,7 @@ export async function onMessageCreate(
 		}
 	} catch (error) {
 		try {
-			await command.onInternalError?.(context, error);
+			await command.onInternalError?.(self, context.command, error);
 		} catch {
 			// supress error
 		}
diff --git a/src/commands/applications/chat.ts b/src/commands/applications/chat.ts
index a9172cc..f35e1a6 100644
--- a/src/commands/applications/chat.ts
+++ b/src/commands/applications/chat.ts
@@ -20,6 +20,7 @@ import type {
 	OnOptionsReturnObject,
 	PassFunction,
 	StopFunction,
+	UsingClient,
 } from './shared';
 
 export interface ReturnOptionsTypes {
@@ -283,7 +284,7 @@ class BaseCommand {
 	onMiddlewaresError?(context: CommandContext, error: string): any;
 	onBotPermissionsFail?(context: CommandContext, permissions: PermissionStrings): any;
 	onPermissionsFail?(context: CommandContext, permissions: PermissionStrings): any;
-	onInternalError?(client: CommandContext | AutocompleteInteraction, error?: unknown): any;
+	onInternalError?(client: UsingClient, command: Command | SubCommand, error?: unknown): any;
 }
 
 export class Command extends BaseCommand {