feat: rework guards and command execution

paradoxuum · Feb 9, 2024 · 093175b · 093175b
1 parent d043c44
commit 093175b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 41 deletions.
diff --git a/src/client/command.ts b/src/client/command.ts
@@ -27,10 +27,6 @@ export class SharedCommand extends ExecutableCommand {
 		);
 	}
 
-	execute(interaction: CommandInteraction, args: string[]) {
-		return this.getCommandCallback(interaction, args)();
-	}
-
 	toString() {
 		return `SharedCommand{path=${this.path}}`;
 	}
@@ -49,6 +45,7 @@ export class ServerCommand extends BaseCommand {
 		const [success, data] = pcall(() =>
 			Remotes.Execute.InvokeServer(this.path.toString(), args.join(" ")),
 		);
+
 		if (!success) {
 			interaction.error("An error occurred.");
 			return;

diff --git a/src/shared/core/command.ts b/src/shared/core/command.ts
@@ -134,7 +134,23 @@ export class ExecutableCommand extends BaseCommand {
 	}
 
 	execute(interaction: CommandInteraction, args: string[]) {
-		return this.getCommandCallback(interaction, args)();
+		for (const guard of this.guards) {
+			if (!guard(interaction)) return;
+		}
+
+		if (interaction.isReplyReceived()) return;
+
+		const transformedArgs = this.transformArgs(args);
+		if (transformedArgs.isErr()) {
+			interaction.error(transformedArgs.unwrapErr());
+			return;
+		}
+
+		return this.func(
+			this.commandClass,
+			interaction,
+			...transformedArgs.unwrap(),
+		);
 	}
 
 	transformArgs(args: string[]): Result<unknown[], string> {
@@ -182,36 +198,6 @@ export class ExecutableCommand extends BaseCommand {
 	toString() {
 		return `ExecutableCommand{path=${this.path}}`;
 	}
-
-	protected getCommandCallback(
-		interaction: CommandInteraction,
-		args: string[],
-	) {
-		const guardCount = this.guards.size();
-		let nextIndex = 0;
-		const runNext = () => {
-			if (nextIndex < guardCount) {
-				this.guards[nextIndex++](runNext, interaction);
-				return;
-			}
-
-			if (interaction.isReplyReceived()) return;
-
-			const transformedArgs = this.transformArgs(args);
-			if (transformedArgs.isErr()) {
-				interaction.error(transformedArgs.unwrapErr());
-				return;
-			}
-
-			return this.func(
-				this.commandClass,
-				interaction,
-				...transformedArgs.unwrap(),
-			);
-		};
-
-		return runNext;
-	}
 }
 
 export class CommandGroup {

diff --git a/src/shared/core/dispatcher.ts b/src/shared/core/dispatcher.ts
@@ -4,7 +4,6 @@ import { CommandPath } from "./path";
 import { BaseRegistry } from "./registry";
 
 const DEFAULT_REPLY_TEXT = "Command executed.";
-const ERROR_TEXT = "An error occurred.";
 
 export abstract class BaseDispatcher {
 	constructor(private readonly registry: BaseRegistry) {}
@@ -25,7 +24,10 @@ export abstract class BaseDispatcher {
 		const args = splitStringBySpace(text);
 
 		command.execute(interaction, args);
-		if (!interaction.isReplyReceived()) interaction.reply(DEFAULT_REPLY_TEXT);
+		if (!interaction.isReplyReceived()) {
+			interaction.reply(DEFAULT_REPLY_TEXT);
+		}
+
 		return interaction;
 	}
 }
diff --git a/src/shared/types.ts b/src/shared/types.ts
@@ -2,10 +2,7 @@ import { Result } from "@rbxts/rust-classes";
 import { t } from "@rbxts/t";
 import { CommandInteraction } from "./core/interaction";
 
-export type CommandGuard = (
-	runNext: () => void,
-	interaction: CommandInteraction,
-) => void;
+export type CommandGuard = (interaction: CommandInteraction) => boolean;
 
 export interface CommanderOptions {
 	groups?: GroupOptions[];