Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions packages/ai/src/configure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,17 @@ const AIConfig: Required<ConfigureAI> = {
const prefixOrPrefixes =
await commandkit.appConfig.getMessageCommandPrefix(message);

const prefixes = Array.isArray(prefixOrPrefixes)
? prefixOrPrefixes
: [prefixOrPrefixes];
const prefixes =
prefixOrPrefixes instanceof RegExp
? prefixOrPrefixes
: Array.isArray(prefixOrPrefixes)
? prefixOrPrefixes
: [prefixOrPrefixes];

const possiblyCommand = prefixes.some((p) => message.content.startsWith(p));
const possiblyCommand =
prefixes instanceof RegExp
? prefixes.test(message.content)
: prefixes.some((p) => message.content.startsWith(p));

// TODO: figure out a workaround for mention prefixes
return (
Expand Down
9 changes: 7 additions & 2 deletions packages/commandkit/src/app/commands/MessageCommandParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ export class MessageCommandParser {
/**
* Creates a new message command parser.
* @param message - The Discord message to parse
* @param prefix - Array of valid command prefixes
* @param prefix - Array of valid command prefixes or a regular expression
* @param schema - Function that returns the options schema for a command
*/
public constructor(
public message: Message,
private prefix: string[],
private prefix: string[] | RegExp,
private schema: (command: string) => MessageCommandOptionsSchema,
) {}

Expand Down Expand Up @@ -123,6 +123,11 @@ export class MessageCommandParser {
* @returns The matched prefix or undefined
*/
public getPrefix() {
if (this.prefix instanceof RegExp) {
const match = this.message.content.match(this.prefix);
return match?.[0];
}

for (const p of this.prefix) {
if (this.message.content.startsWith(p)) {
return p;
Expand Down
13 changes: 11 additions & 2 deletions packages/commandkit/src/app/handlers/AppCommandHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,20 @@ export class AppCommandHandler {
const prefix =
await this.commandkit.appConfig.getMessageCommandPrefix(source);

if (!prefix || !prefix.length) return null;
if (
!prefix ||
((typeof prefix === 'string' || Array.isArray(prefix)) &&
!prefix.length)
)
return null;

parser = new MessageCommandParser(
source,
Array.isArray(prefix) ? prefix : [prefix],
prefix instanceof RegExp
? prefix
: Array.isArray(prefix)
? prefix
: [prefix],
(command: string) => {
// Find the command by name
const loadedCommand = this.findCommandByName(command);
Expand Down
6 changes: 4 additions & 2 deletions packages/commandkit/src/commandkit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export interface CommandKitConfiguration {
* @param message The message to get the command prefix for.
* @returns The command prefix or an array of prefixes.
*/
getMessageCommandPrefix: (message: Message) => Awaitable<string | string[]>;
getMessageCommandPrefix: (
message: Message,
) => Awaitable<string | string[] | RegExp>;
}

/**
Expand Down Expand Up @@ -321,7 +323,7 @@ export class CommandKit extends EventEmitter {
* @param resolver The resolver function.
*/
setPrefixResolver(
resolver: (message: Message) => Awaitable<string | string[]>,
resolver: (message: Message) => Awaitable<string | string[] | RegExp>,
) {
this.appConfig.getMessageCommandPrefix = resolver;
return this;
Expand Down
Loading