From 8dd4dcff52951cee3a27ba87d27e4c2867d77887 Mon Sep 17 00:00:00 2001 From: Neko Life Date: Thu, 27 May 2021 22:49:16 +0000 Subject: [PATCH] little change, use double dash argument --- cmds/utility/lookup.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/cmds/utility/lookup.js b/cmds/utility/lookup.js index e5324f0..d42ea63 100644 --- a/cmds/utility/lookup.js +++ b/cmds/utility/lookup.js @@ -34,13 +34,12 @@ module.exports = class lookup extends commando.Command { const args = arg.split(/ +/); let [fetchedMember, fetchedRoles, fetchedChannels, memMes] = [[], [], [], ""]; const lowCaseArg0 = args[0].toLowerCase(); - if (lowCaseArg0 === "role") { + if (lowCaseArg0 === "--role") { if (args[1]) { - const cleanRoleID = cleanMentionID(arg.slice("role".length).trim()); - if (!/\D/.test(cleanRoleID)) { + const cleanRoleID = cleanMentionID(arg.slice("--role".length).trim()); + if (/^\d{17,19}$/.test(cleanRoleID)) { fetchedRoles.push(msg.guild.roles.cache.get(cleanRoleID)); - } - if (/\D/.test(cleanRoleID) || fetchedRoles[0] == null) { + } else { fetchedRoles = findRoleRegEx(msg, cleanRoleID); } if (fetchedRoles.length > 1) { @@ -53,13 +52,12 @@ module.exports = class lookup extends commando.Command { } } } else { - if (lowCaseArg0 === "channel") { + if (lowCaseArg0 === "--channel") { if (args[1]) { - const cleanChannelID = cleanMentionID(arg.slice("channel".length).trim()); - if (!/\D/.test(cleanChannelID)) { + const cleanChannelID = cleanMentionID(arg.slice("--channel".length).trim()); + if (/^\d{17,19}$/.test(cleanChannelID)) { fetchedChannels.push(msg.guild.roles.cache.get(cleanChannelID)); - } - if (/\D/.test(cleanChannelID) || fetchedChannels[0] == null) { + } else { fetchedChannels = findChannelRegEx(msg, cleanChannelID); } if (fetchedChannels.length > 1) { @@ -72,10 +70,13 @@ module.exports = class lookup extends commando.Command { } } } else { - if (!/\D/.test(arg)) { - fetchedMember.push(msg.guild.member(arg)); + if (arg.toLowerCase().startsWith("--member")) { + arg = arg.slice("--members".length).trim(); } - if (/\D/.test(arg) || fetchedMember[0] === null) { + arg = cleanMentionID(arg); + if (/^\d{17,19}$/.test(arg)) { + fetchedMember.push(msg.guild.member(arg)); + } else { fetchedMember = findMemberRegEx(msg, arg); } if (fetchedMember.length > 1) {