fix(accepted events): ensure duration isn't destructured when not ava…

…ilable
sapphiredev · Jan 22, 2022 · 1269305 · 1269305
1 parent 85b241e
commit 1269305
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/listeners/application-commands/chat-input/CoreChatInputCommandAccepted.ts b/src/listeners/application-commands/chat-input/CoreChatInputCommandAccepted.ts
@@ -14,20 +14,20 @@ export class CoreListener extends Listener<typeof Events.ChatInputCommandAccepte
 
 		const result = await fromAsync(async () => {
 			this.container.client.emit(Events.ChatInputCommandRun, interaction, command, { ...payload });
+
 			const stopwatch = new Stopwatch();
 			const result = await command.chatInputRun(interaction, context);
 			const { duration } = stopwatch.stop();
+
 			this.container.client.emit(Events.ChatInputCommandSuccess, { ...payload, result, duration });
 
-			return { result, duration };
+			return duration;
 		});
 
-		const { duration } = result.value ?? { duration: -1 };
-
 		if (isErr(result)) {
-			this.container.client.emit(Events.ChatInputCommandError, result.error, { ...payload, duration });
+			this.container.client.emit(Events.ChatInputCommandError, result.error, { ...payload, duration: result.value ?? -1 });
 		}
 
-		this.container.client.emit(Events.ChatInputCommandFinish, interaction, command, { ...payload, duration });
+		this.container.client.emit(Events.ChatInputCommandFinish, interaction, command, { ...payload, duration: result.value ?? -1 });
 	}
 }
diff --git a/src/listeners/application-commands/context-menu/CoreContextMenuCommandAccepted.ts b/src/listeners/application-commands/context-menu/CoreContextMenuCommandAccepted.ts
@@ -14,21 +14,20 @@ export class CoreListener extends Listener<typeof Events.ContextMenuCommandAccep
 
 		const result = await fromAsync(async () => {
 			this.container.client.emit(Events.ContextMenuCommandRun, interaction, command, { ...payload });
+
 			const stopwatch = new Stopwatch();
 			const result = await command.contextMenuRun(interaction, context);
 			const { duration } = stopwatch.stop();
 
 			this.container.client.emit(Events.ContextMenuCommandSuccess, { ...payload, result, duration });
 
-			return { result, duration };
+			return duration;
 		});
 
-		const { duration } = result.value ?? { duration: -1 };
-
 		if (isErr(result)) {
-			this.container.client.emit(Events.ContextMenuCommandError, result.error, { ...payload, duration });
+			this.container.client.emit(Events.ContextMenuCommandError, result.error, { ...payload, duration: result.value ?? -1 });
 		}
 
-		this.container.client.emit(Events.ContextMenuCommandFinish, interaction, command, { ...payload, duration });
+		this.container.client.emit(Events.ContextMenuCommandFinish, interaction, command, { ...payload, duration: result.value ?? -1 });
 	}
 }
diff --git a/src/optional-listeners/message-command-listeners/CoreMessageCommandAccepted.ts b/src/optional-listeners/message-command-listeners/CoreMessageCommandAccepted.ts
@@ -15,20 +15,20 @@ export class CoreListener extends Listener<typeof Events.MessageCommandAccepted>
 
 		const result = await fromAsync(async () => {
 			message.client.emit(Events.MessageCommandRun, message, command, { ...payload, args });
+
 			const stopwatch = new Stopwatch();
 			const result = await command.messageRun(message, args, context);
 			const { duration } = stopwatch.stop();
+
 			message.client.emit(Events.MessageCommandSuccess, { ...payload, args, result, duration });
 
-			return { result, duration };
+			return duration;
 		});
 
-		const { duration } = result.value ?? { duration: -1 };
-
 		if (isErr(result)) {
-			message.client.emit(Events.MessageCommandError, result.error, { ...payload, args, duration });
+			message.client.emit(Events.MessageCommandError, result.error, { ...payload, args, duration: result.value ?? -1 });
 		}
 
-		message.client.emit(Events.MessageCommandFinish, message, command, { ...payload, args, duration });
+		message.client.emit(Events.MessageCommandFinish, message, command, { ...payload, args, duration: result.value ?? -1 });
 	}
 }