From a059959fb5a65921197135523873d1871c392778 Mon Sep 17 00:00:00 2001
From: MARCROCK22 <57925328+MARCROCK22@users.noreply.github.com>
Date: Tue, 26 Mar 2024 18:45:45 -0400
Subject: [PATCH] fix: onFail callback

---
 src/components/handler.ts | 12 +++++-------
 src/events/handler.ts     |  9 +++------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/components/handler.ts b/src/components/handler.ts
index f30fb60..c655b4d 100644
--- a/src/components/handler.ts
+++ b/src/components/handler.ts
@@ -19,6 +19,8 @@ export interface ComponentHandlerLike {
 	readonly commands: (ComponentCommand | ModalCommand)[];
 	readonly modals: Map<string, ModalSubmitCallback> | LimitedCollection<string, ModalSubmitCallback>;
 
+	onFail: ComponentHandler['onFail'];
+
 	createComponentCollector: ComponentHandler['createComponentCollector'];
 
 	hasModal: ComponentHandler['hasModal'];
@@ -37,7 +39,7 @@ export interface ComponentHandlerLike {
 }
 
 export class ComponentHandler extends BaseHandler {
-	onFail?: OnFailCallback;
+	onFail: OnFailCallback = err => this.logger.warn('<Client>.components.onFail', err);
 	readonly values = new Map<string, COMPONENTS>();
 	// 10 minutes timeout, because discord dont send an event when the user cancel the modal
 	readonly modals = new LimitedCollection<string, ModalSubmitCallback>({ expire: 60e3 * 10 });
@@ -51,10 +53,6 @@ export class ComponentHandler extends BaseHandler {
 		super(logger);
 	}
 
-	set OnFail(cb: OnFailCallback) {
-		this.onFail = cb;
-	}
-
 	createComponentCollector(messageId: string, options: ListenerOptions = {}) {
 		this.values.set(messageId, {
 			components: [],
@@ -229,7 +227,7 @@ export class ComponentHandler extends BaseHandler {
 					break;
 				}
 			} catch (e) {
-				await this.onFail?.(e);
+				await this.onFail(e);
 			}
 		}
 	}
@@ -242,7 +240,7 @@ export class ComponentHandler extends BaseHandler {
 					break;
 				}
 			} catch (e) {
-				await this.onFail?.(e);
+				await this.onFail(e);
 			}
 		}
 	}
diff --git a/src/events/handler.ts b/src/events/handler.ts
index 13e606c..fbde850 100644
--- a/src/events/handler.ts
+++ b/src/events/handler.ts
@@ -26,18 +26,15 @@ export interface EventHandlerLike {
 	reload: EventHandler['reload'];
 	reloadAll: EventHandler['reloadAll'];
 	values: EventHandler['values'];
+	onFail: EventHandler['onFail'];
 }
 
 export class EventHandler extends BaseHandler {
-	protected onFail: OnFailCallback = err => this.logger.warn('<Client>.events.OnFail', err);
+	onFail: OnFailCallback = err => this.logger.warn('<Client>.events.onFail', err);
 	protected filter = (path: string) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts'));
 
 	values: Partial<Record<GatewayEvents, EventValue>> = {};
 
-	set OnFail(cb: OnFailCallback) {
-		this.onFail = cb;
-	}
-
 	async load(eventsDir: string) {
 		for (const i of await this.loadFilesK<ClientEvent>(await this.getFiles(eventsDir))) {
 			const instance = i.file;
@@ -108,7 +105,7 @@ export class EventHandler extends BaseHandler {
 			const hook = await RawEvents[name]?.(client, packet as never);
 			await Event.run(...[hook, client, shardId]);
 		} catch (e) {
-			await this.onFail?.(e);
+			await this.onFail(e);
 		}
 	}