Skip to content

Fix command delays #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix command delays #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
327f4b3
Fix command delays
DocRevive Oct 10, 2022
6b6bf01
undo previous, new approach
DocRevive Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions src/CommandManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,9 @@ export class CommandManager<
const filterContext = context[0];

for (const command of this.commands) {
const argString = this.takeCommandArguments(command, str);
if (argString === null) continue;

if (command.preFilters.length) {
let passed = false;
for (const filter of command.preFilters) {
Expand All @@ -261,7 +264,7 @@ export class CommandManager<
if (!passed) continue;
}

const matchedCommand = await this.tryMatchingCommand(command, str, filterContext as TContext);
const matchedCommand = await this.tryMatchingSignature(command, argString, filterContext as TContext);
if (matchedCommand === null) continue;

if (isError(matchedCommand)) {
Expand Down Expand Up @@ -295,13 +298,9 @@ export class CommandManager<
}

/**
* Attempts to match the given command to a string.
* Returns the argument string of the string if it matches the provided command, otherwise null.
*/
public async tryMatchingCommand(
command: ICommandDefinition<TContext, TConfigExtra>,
str: string,
context: TContext,
): Promise<TOrError<IMatchedCommand<TContext, TConfigExtra>> | null> {
public takeCommandArguments(command: ICommandDefinition<TContext, TConfigExtra>, str: string): string | null {
if (command.prefix) {
const prefixMatch = str.match(command.prefix);
if (!prefixMatch) return null;
Expand All @@ -316,8 +315,17 @@ export class CommandManager<
str = str.slice(triggerMatch[0].length);
}
}
if (!matchedTrigger) return null;
return matchedTrigger ? str : null;
}

/**
* Attempts to match the given command's signature to an argument string.
*/
public async tryMatchingSignature(
command: ICommandDefinition<TContext, TConfigExtra>,
str: string,
context: TContext,
): Promise<TOrError<IMatchedCommand<TContext, TConfigExtra>> | null> {
const parsedArguments = parseArguments(str);
const signatures = command.signatures.length > 0 ? command.signatures : [{}];
const safeSignatures = signatures.map((s) => toSafeSignature(s));
Expand Down