From 804de13da797c8b034e3fe12802abddab08a98e1 Mon Sep 17 00:00:00 2001 From: Abheek Dhawan Date: Fri, 2 Apr 2021 21:36:40 -0500 Subject: [PATCH] Use promise for ban --- index.js | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/index.js b/index.js index f3c0254..59fc34b 100644 --- a/index.js +++ b/index.js @@ -102,6 +102,8 @@ client.on("message", async message => { ban(message); } else if (message.content.toLowerCase().startsWith(`${prefix}kick`)) { kick(message); + } else if (message.content.toLowerCase().startsWith(`${prefix}addrole`)) { + addRole(message); } }); @@ -134,25 +136,27 @@ async function ban(message) { let verificationEmbed = new Discord.MessageEmbed() .setTitle(`Are you sure you would like to ban \`${member.user.tag}\`?`) - .setDescription("React to your message to verify") + .setDescription("React to this message to verify") .setThumbnail(member.user.avatarURL()) .setColor("fda172") .setTimestamp(); - message.channel.send(verificationEmbed).catch(console.error); - message.react('👍'); - message.react('👎'); - const filter = (reaction, user) => { - return ['👍', '👎'].includes(reaction.emoji.name) && message.guild.members.cache.get(user.id).hasPermission('ADMINISTRATOR') && !user.bot; - }; - message.awaitReactions(filter, { max: 1, time: 60000, errors: ['time'] }) - .then(userReaction => { - const reaction = userReaction.first(); - if (reaction.emoji.name === '👍') { - message.guild.members.ban(member.user).then(user => message.reply(`<@${user.id}> has been banned!`)).catch(() => message.channel.send(`Unfortunately, I don't have the ability to ban ${member.user.username}, likely because their role is higher than mine.`)); - } else { - message.reply(`phew! ${member}'s safe!`); - } - }).catch(verificationEmbed => { verificationEmbed.edit("TIMEOUT") }); + message.channel.send(verificationEmbed).catch(console.error) + .then(verificationEmbed => { + verificationEmbed.react('👍'); + verificationEmbed.react('👎'); + const filter = (reaction, user) => { + return ['👍', '👎'].includes(reaction.emoji.name) && message.guild.members.cache.get(user.id).hasPermission('ADMINISTRATOR') && !user.bot; + }; + verificationEmbed.awaitReactions(filter, { max: 1, time: 60000, errors: ['time'] }) + .then(userReaction => { + const reaction = userReaction.first(); + if (reaction.emoji.name === '👍') { + message.guild.members.ban(member.user).then(user => message.reply(`<@${user.id}> has been banned!`)).catch(() => message.channel.send(`Unfortunately, I don't have the ability to ban ${member.user.username}, likely because their role is higher than mine.`)); + } else { + message.reply(`phew! ${member}'s safe!`); + } + }).catch(verificationEmbed => { verificationEmbed.edit("TIMEOUT") }); + }).catch(console.error); } async function kick(message) { @@ -184,7 +188,7 @@ async function kick(message) { const verificationEmbed = new Discord.MessageEmbed() .setTitle(`Are you sure you would like to kick \`${member.user.tag}\`?`) - .setDescription("React to your message to verify") + .setDescription("React to this message to verify") .setThumbnail(member.user.avatarURL()) .setColor("fda172") .setTimestamp();