arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-03 23:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Dragon Fire
2021-06-05 18:31:14 -04:00
parent dfc54d9747
commit 40fb574a8b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/Command.js
+1 -1
View File
@@ -38,7 +38,7 @@ module.exports = class Command {
usage() {
const args = this.args
.map(arg => `${arg.default ? '[' : '<'}${arg.label || arg.name}${arg.default ? ']' : '>'}`).join(' ');
.map(arg => `${arg.default ? '[' : '<'}${arg.label || arg.key}${arg.default ? ']' : '>'}`).join(' ');
return `\`${this.client.commandPrefix}${this.name} ${args}\` or \`@${this.client.user.tag} ${this.name} ${args}\``;
}
framework/Dispatcher.js
+9 -9
View File
@@ -43,31 +43,31 @@ module.exports = class CommandDispatcher {
for (const parsedArg of infinite) {
if (arg.isEmpty(parsedArg, msg, arg)) {
if (arg.default) {
finalResult[arg.name] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
continue;
finalResult[arg.key] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
break;
} else {
return `The "${arg.label || arg.name}" argument is required.`;
return `The "${arg.label || arg.key}" argument is required.`;
}
}
const valid = await arg.validate(parsedArg, msg, arg);
if (!valid) return `An invalid value was provided for one of the "${arg.label || arg.name}" arguments.`;
if (!valid) return `An invalid value was provided for one of the "${arg.label || arg.key}" arguments.`;
parsedArgs.push(await arg.parse(parsedArg, msg, arg));
}
finalResult[arg.name] = parsedArgs;
finalResult[arg.key] = parsedArgs;
break;
}
const parsedArg = parsed._[i];
if (arg.isEmpty(parsedArg, msg, arg)) {
if (arg.default) {
finalResult[arg.name] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
finalResult[arg.key] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
continue;
} else {
return `The "${arg.label || arg.name}" argument is required.`;
return `The "${arg.label || arg.key}" argument is required.`;
}
}
const valid = await arg.validate(parsedArg, msg, arg);
if (!valid) return `An invalid value was provided for the "${arg.label || arg.name}" argument.`;
finalResult[arg.name] = await arg.parse(parsedArg, msg, arg);
if (!valid) return `An invalid value was provided for the "${arg.label || arg.key}" argument.`;
finalResult[arg.key] = await arg.parse(parsedArg, msg, arg);
}
return { command, args: finalResult };
}