forked from Supositware/Haha-Yes
Revert "Show a message instead of error when an argument is required"
This reverts commit 97254f619c
.
This commit is contained in:
parent
6983ea58b7
commit
26db60e95f
1 changed files with 3 additions and 17 deletions
|
@ -305,7 +305,7 @@ export default {
|
||||||
let isOptOut = await db.optout.findOne({ where: { userID: message.author.id } });
|
let isOptOut = await db.optout.findOne({ where: { userID: message.author.id } });
|
||||||
|
|
||||||
if (commandName === 'optout') {
|
if (commandName === 'optout') {
|
||||||
isOptOut = true;
|
isOptOut = true
|
||||||
}
|
}
|
||||||
|
|
||||||
const timestamp = new Date();
|
const timestamp = new Date();
|
||||||
|
@ -402,16 +402,10 @@ export default {
|
||||||
});
|
});
|
||||||
|
|
||||||
const argsLength = command.data.options.length - argsToDelete;
|
const argsLength = command.data.options.length - argsToDelete;
|
||||||
const missingRequired = [];
|
|
||||||
|
|
||||||
for (let i = 0, j = 0; i < argsLength; i++, j++) {
|
for (let i = 0, j = 0; i < argsLength; i++, j++) {
|
||||||
const arg = command.data.options[j];
|
|
||||||
|
|
||||||
if (arg.required && !messageArgs[i]) {
|
|
||||||
missingRequired.push({ name: arg.name, description: arg.description });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!messageArgs[i]) continue;
|
if (!messageArgs[i]) continue;
|
||||||
|
const arg = command.data.options[j];
|
||||||
|
|
||||||
if (arg.type === ApplicationCommandOptionType.Attachment) continue;
|
if (arg.type === ApplicationCommandOptionType.Attachment) continue;
|
||||||
|
|
||||||
|
@ -443,14 +437,6 @@ export default {
|
||||||
console.log(`[${timestamp.toISOString()}] \x1b[33m⤷\x1b[0m with args ${JSON.stringify(args)}`);
|
console.log(`[${timestamp.toISOString()}] \x1b[33m⤷\x1b[0m with args ${JSON.stringify(args)}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (missingRequired) {
|
|
||||||
let missingMsg = '';
|
|
||||||
missingRequired.forEach(arg => {
|
|
||||||
missingMsg += `${arg.name} | ${arg.description}\n`;
|
|
||||||
});
|
|
||||||
return message.reply(`You are missing a required argument!\n\`${missingMsg}\``);
|
|
||||||
}
|
|
||||||
|
|
||||||
await command.execute(message, args, client)
|
await command.execute(message, args, client)
|
||||||
.then(async () => {
|
.then(async () => {
|
||||||
const hasPrallelLimit = await ratelimiter.checkParallel(message.author, commandName, command);
|
const hasPrallelLimit = await ratelimiter.checkParallel(message.author, commandName, command);
|
||||||
|
|
Loading…
Reference in a new issue