arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-21 14:04:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Dragon Fire
2021-06-05 13:12:22 -04:00
parent dc7a0cd6c7
commit dd05483aee
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/Dispatcher.js
+6 -6
View File
@@ -32,15 +32,15 @@ module.exports = class CommandDispatcher {
}; };
} }
const content = msg.content.replace(this.commandPattern, '').trim(); const content = msg.content.replace(this.commandPattern, '').trim();
const firstResult = (content.match(argRegex) || []).map(m => m.replace(argRegex, '$1$2')); const result = (content.match(argRegex) || []).map(m => m.replace(argRegex, '$1$2'));
const parsed = minimist(firstResult); const parsed = minimist(result);
const result = { flags: [...parsed] }; const finalResult = { flags: parsed };
for (let i = 0; i < command.args.length; i++) { for (let i = 0; i < command.args.length; i++) {
const arg = command.args[i]; const arg = command.args[i];
const parsedArg = result._[i]; const parsedArg = result._[i];
if (arg.isEmpty(parsedArg, msg, arg)) { if (arg.isEmpty(parsedArg, msg, arg)) {
if (arg.default) { if (arg.default) {
result[arg.name] = typeof arg.default === 'function' ? arg.default(msg) : arg.default; finalResult[arg.name] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
continue; continue;
} else { } else {
return `The "${arg.label || arg.name}" argument is required.`; return `The "${arg.label || arg.name}" argument is required.`;
@@ -48,9 +48,9 @@ module.exports = class CommandDispatcher {
} }
const valid = await arg.validate(parsedArg, msg, arg); const valid = await arg.validate(parsedArg, msg, arg);
if (!valid) return `An invalid value was provided for the "${arg.label || arg.name}" argument.`; if (!valid) return `An invalid value was provided for the "${arg.label || arg.name}" argument.`;
result[arg.name] = await arg.parse(parsedArg, msg, arg); finalResult[arg.name] = await arg.parse(parsedArg, msg, arg);
} }
return { command, args: result }; return { command, args: finalResult };
} }
resolveCommand(command) { resolveCommand(command) {