From 108eb0c251e8d8904b1d3263284999bda45fd2e7 Mon Sep 17 00:00:00 2001 From: Barrca <60709314+FBarrca@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:31:13 -0800 Subject: [PATCH] Clean the parsing --- src/modules/commands/parser.ts | 12 ++++++------ src/modules/commands/source.ts | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/modules/commands/parser.ts b/src/modules/commands/parser.ts index dd50744..ad4d79d 100644 --- a/src/modules/commands/parser.ts +++ b/src/modules/commands/parser.ts @@ -2,11 +2,11 @@ import { SlashCommand } from "./source"; export function parseCommand(userInput: string, prefix: string, customCommands: SlashCommand[]): string { -for (const command of customCommands) { - const commandPattern = `${prefix}${command.keyword}`; - if (userInput.startsWith(commandPattern)) { - return userInput.replace(commandPattern, command.prompt).trim(); + for (const command of customCommands) { + const commandPattern = `${prefix}${command.keyword}`; + if (userInput.includes(commandPattern)) { + return userInput.replace(commandPattern, command.prompt); + } } -} -return userInput; // Return original text if no command matches + return userInput; // Return original text if no command matches } diff --git a/src/modules/commands/source.ts b/src/modules/commands/source.ts index 4493248..8aad7e8 100644 --- a/src/modules/commands/source.ts +++ b/src/modules/commands/source.ts @@ -20,8 +20,6 @@ function createSlashCommandSource(options: { customCommands: [] }) { const { prefix, customCommands } = options; - console.log(prefix, customCommands) - return (context: CompletionContext) => { let word = context.matchBefore(new RegExp(`^\\${prefix}\\w*`)) if (!word || (word.from == word.to && !context.explicit))