This commit is contained in:
Dragon Fire
2024-03-24 00:45:20 -04:00
parent ee6c27a7ce
commit 3a6c5224ed
3 changed files with 1 additions and 6 deletions
-2
View File
@@ -80,7 +80,6 @@ module.exports = class CommandDispatcher {
continue; continue;
} }
} }
console.log(parsedArg);
const valid = await arg.validate(parsedArg, msg, arg); const valid = await arg.validate(parsedArg, msg, arg);
if (!valid || typeof valid === 'string') { if (!valid || typeof valid === 'string') {
return stripIndents` return stripIndents`
@@ -88,7 +87,6 @@ module.exports = class CommandDispatcher {
${arg.invalidText} ${arg.invalidText}
`; `;
} }
console.log(parsedArg);
finalResult[arg.key] = await arg.parse(parsedArg, msg, arg); finalResult[arg.key] = await arg.parse(parsedArg, msg, arg);
} }
return { command, args: finalResult }; return { command, args: finalResult };
-2
View File
@@ -16,7 +16,6 @@ module.exports = class ArgumentUnionType extends ArgumentType {
async validate(val, msg, arg) { async validate(val, msg, arg) {
let results = this.types.map(type => !type.isEmpty(val, msg, arg) && type.validate(val, msg, arg)); let results = this.types.map(type => !type.isEmpty(val, msg, arg) && type.validate(val, msg, arg));
results = await Promise.all(results); results = await Promise.all(results);
console.log(results);
if (results.some(valid => valid && typeof valid !== 'string')) return true; if (results.some(valid => valid && typeof valid !== 'string')) return true;
const errors = results.filter(valid => typeof valid === 'string'); const errors = results.filter(valid => typeof valid === 'string');
if (errors.length > 0) return errors.join('\n'); if (errors.length > 0) return errors.join('\n');
@@ -26,7 +25,6 @@ module.exports = class ArgumentUnionType extends ArgumentType {
async parse(val, msg, arg) { async parse(val, msg, arg) {
let results = this.types.map(type => !type.isEmpty(val, msg, arg) && type.validate(val, msg, arg)); let results = this.types.map(type => !type.isEmpty(val, msg, arg) && type.validate(val, msg, arg));
results = await Promise.all(results); results = await Promise.all(results);
console.log(results);
for (let i = 0; i < results.length; i++) { for (let i = 0; i < results.length; i++) {
if (results[i] && typeof results[i] !== 'string') return this.types[i].parse(val, msg, arg); if (results[i] && typeof results[i] !== 'string') return this.types[i].parse(val, msg, arg);
} }
+1 -2
View File
@@ -7,8 +7,7 @@ module.exports = class DefaultEmojiArgumentType extends ArgumentType {
} }
validate(value) { validate(value) {
if (!emojiRegex.test(value)) return false; return emojiRegex.test(value);
return true;
} }
parse(value) { parse(value) {