From 51826788b1c5f44f2c78b8772d04e27fc98bba5c Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Wed, 20 Mar 2024 00:30:06 -0400
Subject: [PATCH] add oneOf handler

---
 Xiao.js                 |  1 +
 framework/Dispatcher.js | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Xiao.js b/Xiao.js
index 62534645..8ad6616a 100644
--- a/Xiao.js
+++ b/Xiao.js
@@ -398,6 +398,7 @@ client.on('warn', warn => client.logger.warn(warn));
 client.on('commandRun', async command => {
 	if (command.unknown) return;
 	client.logger.info(`[COMMAND] ${command.name} was used.`);
+	if (command.ownerOnly) return;
 	const channel = await client.fetchCommandChannel();
 	if (!channel) return;
 	channel.send(`\`${command.name}\` was used! It has now been used **${formatNumber(command.uses)}** times!`)
diff --git a/framework/Dispatcher.js b/framework/Dispatcher.js
index 2afc53af..3b03a24c 100644
--- a/framework/Dispatcher.js
+++ b/framework/Dispatcher.js
@@ -1,4 +1,5 @@
 const minimist = require('minimist');
+const { stripIndents } = require('common-tags');
 const argRegex = /"([^"]*)"|(\S+)/g;
 
 module.exports = class CommandDispatcher {
@@ -54,7 +55,10 @@ module.exports = class CommandDispatcher {
 				for (const parsedArg of infinite) {
 					const valid = await arg.validate(parsedArg, msg, arg);
 					if (!valid || typeof valid === 'string') {
-						return `An invalid value was provided for one of the "${arg.label || arg.key}" arguments.`;
+						return stripIndents`
+							An invalid value was provided for one of the "${arg.label || arg.key}" arguments.
+							${arg.oneOf ? `It must be one of the following: ${arg.oneOf.map(a => `\`${a}\``)}` : ''}
+						`;
 					}
 					parsedArgs.push(await arg.parse(parsedArg, msg, arg));
 				}
@@ -64,7 +68,10 @@ module.exports = class CommandDispatcher {
 			const parsedArg = i + 1 === command.args.length ? parsed._.slice(i).join(' ') : parsed._[i]?.toString();
 			if (arg.isEmpty(parsedArg, msg, arg)) {
 				if (arg.default === null) {
-					return `The "${arg.label || arg.key}" argument is required.`;
+					return stripIndents`
+						The "${arg.label || arg.key}" argument is required.
+						${arg.oneOf ? `It must be one of the following: ${arg.oneOf.map(a => `\`${a}\``)}` : ''}
+					`;
 				} else {
 					finalResult[arg.key] = typeof arg.default === 'function' ? arg.default(msg) : arg.default;
 					continue;
@@ -72,7 +79,10 @@ module.exports = class CommandDispatcher {
 			}
 			const valid = await arg.validate(parsedArg, msg, arg);
 			if (!valid || typeof valid === 'string') {
-				return `An invalid value was provided for the "${arg.label || arg.key}" argument.`;
+				return stripIndents`
+					An invalid value was provided for the "${arg.label || arg.key}" argument.
+					${arg.oneOf ? `It must be one of the following: ${arg.oneOf.map(a => `\`${a}\``)}` : ''}
+				`;
 			}
 			finalResult[arg.key] = await arg.parse(parsedArg, msg, arg);
 		}