From c58df6789651c3ccd0c9844004e5306947c9804e Mon Sep 17 00:00:00 2001 From: Emily J Date: Sun, 7 Mar 2021 01:15:07 +1100 Subject: [PATCH] accept user ID's --- bot/commands/Configuration/blocklist.js | 32 ++++++++++++++------- bot/commands/Utility/avatar.js | 38 ++++++++++++++----------- bot/commands/Utility/userinfo.js | 24 +++++++++------- bot/util/functions.js | 2 +- 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/bot/commands/Configuration/blocklist.js b/bot/commands/Configuration/blocklist.js index dcea09a..f4c1db9 100644 --- a/bot/commands/Configuration/blocklist.js +++ b/bot/commands/Configuration/blocklist.js @@ -36,7 +36,9 @@ module.exports = class { return; } - if (action.toLowerCase() !== 'add' || action.toLowerCase() !== 'remove') { + action = action.toLowerCase(); + + if (action !== 'add' & action !== 'remove') { return message.channel.createMessage(`${client.emojis.userError} You didn't specify a valid action. Usage: \`${this.help.usage}\``); } @@ -44,17 +46,27 @@ module.exports = class { `${client.emojis.userError} You didn't specify a user. Usage: \`${message.prefix + this.help.usage}\`` ); - let member = message.mentions[0]; + let member; - if (!member) member = await message.channel.guild.searchMembers(user.join(' '), 2); + if (message.mentions.length > 0) { + member = await client.functions.getMember(message.channel.guild, message.mentions[0].id); + } else { + member = await client.functions.validateUserID(message.channel.guild, user[0]); - if (member.length > 1) return message.channel.createMessage( - `${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.` - ); - - action = action.toLowerCase(); - - member = member[0]; + if (!member) { + member = await message.channel.guild.searchMembers(user.join(' '), 2); + + if (member.length === 0) return message.channel.createMessage( + `${client.emojis.userError} No users found. Check for mispellings, or ping the user instead.` + ); + + if (member.length > 1) return message.channel.createMessage( + `${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.` + ); + + member = member[0]; + } + } const blocklist = data.guild.blocklist; diff --git a/bot/commands/Utility/avatar.js b/bot/commands/Utility/avatar.js index 661215a..48bf31e 100644 --- a/bot/commands/Utility/avatar.js +++ b/bot/commands/Utility/avatar.js @@ -18,30 +18,34 @@ module.exports = class { async run (client, message, args, data) { //eslint-disable-line no-unused-vars - let user = message.author; + let member = message.member; if (args[0]) { - user = message.mentions[0]; + if (message.mentions.length > 0) { + member = await client.functions.getMember(message.channel.guild, message.mentions[0].id); + } else { + member = await client.functions.validateUserID(message.channel.guild, args[0]); - if (!user) { - user = await message.channel.guild.searchMembers(args.join(' '), 2); - - if (user.length < 1) return message.channel.createMessage( - `${client.emojis.userError} No users found. Check for mispellings, or ping the user instead.` - ); - - if (user.length > 1) return message.channel.createMessage( - `${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.` - ); - - user = user[0].user; + if (!member) { + member = await message.channel.guild.searchMembers(args.join(' '), 2); + + if (member.length === 0) return message.channel.createMessage( + `${client.emojis.userError} No users found. Check for mispellings, or ping the user instead.` + ); + + if (member.length > 1) return message.channel.createMessage( + `${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.` + ); + + member = member[0]; + } } } const embed = new client.RichEmbed() - .setTitle(user.username + '#' + user.discriminator) - .setColour(client.functions.displayHexColour(message.channel.guild, user.id)) - .setImage(user.avatarURL); + .setTitle(member.user.username + '#' + member.user.discriminator) + .setColour(client.functions.displayHexColour(message.channel.guild, member)) + .setImage(member.user.avatarURL); message.channel.createMessage({ embed: embed }); } diff --git a/bot/commands/Utility/userinfo.js b/bot/commands/Utility/userinfo.js index c10f17f..f1e2dfe 100644 --- a/bot/commands/Utility/userinfo.js +++ b/bot/commands/Utility/userinfo.js @@ -26,17 +26,21 @@ module.exports = class { if (message.mentions.length > 0) { member = await client.functions.getMember(message.channel.guild, message.mentions[0].id); } else { - member = await message.channel.guild.searchMembers(args.join(' '), 2); + member = await client.functions.validateUserID(message.channel.guild, args[0]); + + if (!member) { + member = await message.channel.guild.searchMembers(args.join(' '), 2); - if (member.length === 0) return message.channel.createMessage( - `${client.emojis.userError} No users found. Check for mispellings, or ping the user instead.` - ); - - if (member.length > 1) return message.channel.createMessage( - `${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.` - ); - - member = member[0]; + if (member.length === 0) return message.channel.createMessage( + `${client.emojis.userError} No users found. Check for mispellings, or ping the user instead.` + ); + + if (member.length > 1) return message.channel.createMessage( + `${client.emojis.userError} Found more than one user, try refining your search or pinging the user instead.` + ); + + member = member[0]; + } } } diff --git a/bot/util/functions.js b/bot/util/functions.js index d41dac1..b672f3c 100644 --- a/bot/util/functions.js +++ b/bot/util/functions.js @@ -72,7 +72,7 @@ class Functions { let hexadecimal = object.color.toString(16); while (hexadecimal.length < 6) { hexadecimal = '0' + hexadecimal; - }; + } return '#' + hexadecimal; }