From 7031fa12ba79281edc49df972311c13ad0e8fa53 Mon Sep 17 00:00:00 2001 From: Justin Date: Sat, 2 Nov 2019 11:02:19 -0400 Subject: es-lint settings added + linted all files --- commands/Moderation/ban.js | 39 ++++++++++++++------------ commands/Moderation/interrogate.js | 29 +++++++++++-------- commands/Moderation/jail.js | 29 +++++++++++-------- commands/Moderation/kick.js | 24 ++++++++++------ commands/Moderation/lswarns.js | 14 ++++++---- commands/Moderation/purge.js | 28 +++++++++++++------ commands/Moderation/setLogs.js | 14 ++++++---- commands/Moderation/setSuggestions.js | 14 ++++++---- commands/Moderation/softban.js | 52 +++++++++++++++++++---------------- commands/Moderation/timeout.js | 33 ++++++++++++++-------- commands/Moderation/warn.js | 21 +++++++------- 11 files changed, 177 insertions(+), 120 deletions(-) (limited to 'commands/Moderation') diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js index 593d9e7..a4da613 100644 --- a/commands/Moderation/ban.js +++ b/commands/Moderation/ban.js @@ -8,21 +8,25 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permission to ban members.'); + if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) { + return msg.reply('I don\'t have permission to ban members.'); + } const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who am I gonna ban? (Remember to @mention them)'); + if (!member) { + return msg.reply('Who am I gonna ban? (Remember to @mention them)'); + } const reason = args.join(' ').slice(3 + member.user.id.length); - await member.ban({ days: 7, reason: msg.author.tag + (reason ? ': ' + reason : '') }) - .catch(err => { - msg.reply('There was an error.'); return console.error(err.stack); - }) - .then(() => { - msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); - }); + try { + await member.ban({days: 7, reason: msg.author.tag + (reason ? `: ${ reason}` : '')}); + msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); + + } catch(err) { + msg.reply('There was an error.'); return console.error(err.stack); + } - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); try { const embed = new RichEmbed() .setColor(0x00ae86) @@ -34,25 +38,26 @@ exports.run = async (bot, msg, args) => { .setTimestamp() .setFooter(`${msg.author.tag} banned ${member.user.tag}`, msg.author.avatarURL); const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id); - msg.guild.channels.find('id', logChannel).send({ embed }); - } - catch (err) { + msg.guild.channels.find('id', logChannel).send({embed}); + } catch (err) { console.error(err.stack); } }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('BAN_MEMBERS')) return 'You don\'t have permission to ban members.'; + if (!member.hasPermission('BAN_MEMBERS')) { + return 'You don\'t have permission to ban members.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'ban', description: 'Ban a user from this server.', - usage: '@user <...reason>', + usage: '@user <...reason>' }; diff --git a/commands/Moderation/interrogate.js b/commands/Moderation/interrogate.js index 39c10a1..2706f69 100644 --- a/commands/Moderation/interrogate.js +++ b/commands/Moderation/interrogate.js @@ -8,16 +8,22 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + if (msg.guild.id != '417088992329334792') { + return msg.reply('This is a PokeWorld exclusive command. Sorry!'); + } - if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot interrogate anyone.'); + if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) { + return msg.reply('I cannot interrogate anyone.'); + } const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who shall I interrogate? (Remember to @mention them)'); + if (!member) { + return msg.reply('Who shall I interrogate? (Remember to @mention them)'); + } member.addRole(msg.guild.roles.find('name', 'Interrogation')); - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); try { const embed = new RichEmbed() .setColor(0x00ae86) @@ -28,25 +34,26 @@ exports.run = async (bot, msg) => { .setTimestamp() .setFooter(`${msg.author.tag} interrogated ${member.user.tag}.`, msg.author.avatarURL); const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id); - msg.guild.channels.find('id', logChannel).send({ embed }); - } - catch (err) { + msg.guild.channels.find('id', logChannel).send({embed}); + } catch (err) { console.error(err.stack); } }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('BAN_MEMBERS')) return 'You don\'t have permission to interrogate others. Rip-off detectives...'; + if (!member.hasPermission('BAN_MEMBERS')) { + return 'You don\'t have permission to interrogate others. Rip-off detectives...'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'interrogate', description: 'Interrogate a suspect/user.', - usage: '@user', + usage: '@user' }; diff --git a/commands/Moderation/jail.js b/commands/Moderation/jail.js index 87d18da..6cb65b9 100644 --- a/commands/Moderation/jail.js +++ b/commands/Moderation/jail.js @@ -8,16 +8,22 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + if (msg.guild.id != '417088992329334792') { + return msg.reply('This is a PokeWorld exclusive command. Sorry!'); + } - if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in jail.'); + if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) { + return msg.reply('I cannot put anyone in jail.'); + } const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who do I put in jail? (Remember to @mention them)'); + if (!member) { + return msg.reply('Who do I put in jail? (Remember to @mention them)'); + } member.addRole(msg.guild.roles.find('name', 'Jail')); - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); try { const embed = new RichEmbed() .setColor(0x00ae86) @@ -28,25 +34,26 @@ exports.run = async (bot, msg) => { .setTimestamp() .setFooter(`${msg.author.tag} put ${member.user.tag} in jail.`, msg.author.avatarURL); const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id); - msg.guild.channels.find('id', logChannel).send({ embed }); - } - catch (err) { + msg.guild.channels.find('id', logChannel).send({embed}); + } catch (err) { console.error(err.stack); } }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('BAN_MEMBERS')) return 'You don\'t have permission to put members in jail.'; + if (!member.hasPermission('BAN_MEMBERS')) { + return 'You don\'t have permission to put members in jail.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'jail', description: 'Jail a user.', - usage: '@user', + usage: '@user' }; diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js index 3ee88ea..386e5cb 100644 --- a/commands/Moderation/kick.js +++ b/commands/Moderation/kick.js @@ -8,29 +8,37 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.guild.member(bot.user).hasPermission('KICK_MEMBERS')) return msg.reply('I don\'t have permission to kick members.'); + if (!msg.guild.member(bot.user).hasPermission('KICK_MEMBERS')) { + return msg.reply('I don\'t have permission to kick members.'); + } const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who am I gonna kick? (Remember to @mention them)'); + if (!member) { + return msg.reply('Who am I gonna kick? (Remember to @mention them)'); + } const reason = args.join(' ').slice(3 + member.user.id.length); - await member.kick(msg.author.tag + ': ' + (reason ? ': ' + reason : '')) - .catch(err => { msg.reply('There was an error.'); console.error(err.stack);}); + await member.kick(`${msg.author.tag}: ${reason ? `: ${reason}` : ''}`) + .catch(err => { + msg.reply('There was an error.'); console.error(err.stack); + }); msg.channel.send(`Alright, I kicked **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('KICK_MEMBERS')) return 'You don\'t have permission to kick members.'; + if (!member.hasPermission('KICK_MEMBERS')) { + return 'You don\'t have permission to kick members.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'kick', description: 'Kick a user out of the server.', - usage: '@user <...reason>', + usage: '@user <...reason>' }; diff --git a/commands/Moderation/lswarns.js b/commands/Moderation/lswarns.js index 732184d..7b39d12 100644 --- a/commands/Moderation/lswarns.js +++ b/commands/Moderation/lswarns.js @@ -9,24 +9,26 @@ exports.run = async (bot, msg) => { const db = require('quick.db'); - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); const warns = await db.fetch(`warns_${msg.guild.id}_${msg.author.id}`); - if (!warns) return await msg.reply('You don\'t have any warnings in this server.'); + if (!warns) { + return msg.reply('You don\'t have any warnings in this server.'); + } const embed = new RichEmbed() .setTitle('Warns'); for (let i = 0; i < warns.count; i++) { - embed.addField('Warning #' + i + 1, warns.reasons[i]); + embed.addField(`Warning #${ i }${1}`, warns.reasons[i]); } - msg.channel.send({ embed }); + msg.channel.send({embed}); }; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'lswarns', - description: 'Shows all the warnings a user has.', + description: 'Shows all the warnings a user has.' }; diff --git a/commands/Moderation/purge.js b/commands/Moderation/purge.js index f244960..073d4bc 100644 --- a/commands/Moderation/purge.js +++ b/commands/Moderation/purge.js @@ -8,17 +8,25 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.guild.member(bot.user).hasPermission('MANAGE_MESSAGES')) return msg.reply('I don\'t have permission to manage messages.'); + if (!msg.guild.member(bot.user).hasPermission('MANAGE_MESSAGES')) { + return msg.reply('I don\'t have permission to manage messages.'); + } const user = msg.mentions.users.first(); const amount = parseInt(args[0]) ? parseInt(args[0]) : parseInt(args[1]); - if (!amount) return msg.reply('How many message shall I delete?'); - if (!amount && !user) return msg.reply('Tell me the user and amount or the just the amount of messages to purge.'); - if (amount > 100 || amount < 3) return msg.reply('Choose an amount less than 98 and greater than 1'); + if (!amount) { + return msg.reply('How many message shall I delete?'); + } + if (!amount && !user) { + return msg.reply('Tell me the user and amount or the just the amount of messages to purge.'); + } + if (amount > 100 || amount < 3) { + return msg.reply('Choose an amount less than 98 and greater than 1'); + } msg.delete(); - let msgs = await msg.channel.fetchMessages({ limit: amount }); + let msgs = await msg.channel.fetchMessages({limit: amount}); if (user) { const filterBy = user ? user.id : bot.user.id; msgs = msgs.filter(m => m.author.id === filterBy).array().slice(0, amount); @@ -27,17 +35,19 @@ exports.run = async (bot, msg, args) => { }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('MANAGE_MESSAGES')) return 'You don\'t have permission to manage messages.'; + if (!member.hasPermission('MANAGE_MESSAGES')) { + return 'You don\'t have permission to manage messages.'; + } return true; -} +}; exports.conf = { aliases: ['prune', 'rm'], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'purge', description: 'Get rid of messages quickly.', - usage: '@user ', + usage: '@user ' }; diff --git a/commands/Moderation/setLogs.js b/commands/Moderation/setLogs.js index e951c45..1eed5e6 100644 --- a/commands/Moderation/setLogs.js +++ b/commands/Moderation/setLogs.js @@ -7,24 +7,26 @@ * * *************************************/ -exports.run = async (bot, msg, args) => { +exports.run = (bot, msg, args) => { bot.plugins.settings.setStr('logs', args[0], msg.guild.id); - msg.reply('Alright, I have set the log channel to ' + args[0]); + msg.reply(`Alright, I have set the log channel to ${args[0]}`); }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('MANAGE_MESSAGES')) return 'You don\'t have permission to manage messages.'; + if (!member.hasPermission('MANAGE_MESSAGES')) { + return 'You don\'t have permission to manage messages.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'setLogs', description: 'Set\'s the Log Channel.', - usage: '', + usage: '' }; diff --git a/commands/Moderation/setSuggestions.js b/commands/Moderation/setSuggestions.js index ff5691e..258f202 100644 --- a/commands/Moderation/setSuggestions.js +++ b/commands/Moderation/setSuggestions.js @@ -7,24 +7,26 @@ * * *************************************/ -exports.run = async (bot, msg, args) => { +exports.run = (bot, msg, args) => { bot.plugins.settings.setStr('suggestions', args[0], msg.guild.id); - msg.reply('Alright, I have set the suggestions channel to ' + args[0]); + msg.reply(`Alright, I have set the suggestions channel to ${args[0]}`); }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('MANAGE_MESSAGES')) return 'You don\'t have permission to manage messages.'; + if (!member.hasPermission('MANAGE_MESSAGES')) { + return 'You don\'t have permission to manage messages.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'setSuggestions', description: 'Set\'s the Suggestions Channel.', - usage: '', + usage: '' }; diff --git a/commands/Moderation/softban.js b/commands/Moderation/softban.js index 7c5119b..3bbab28 100644 --- a/commands/Moderation/softban.js +++ b/commands/Moderation/softban.js @@ -8,27 +8,30 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permission to ban members.'); + if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) { + return msg.reply('I don\'t have permission to ban members.'); + } const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who am I gonna softban?'); + if (!member) { + return msg.reply('Who am I gonna softban?'); + } const reason = args.join(' ').slice(3 + member.user.id.length); + try { + await member.ban({days: 7, reason: `${msg.author.tag }: ${ reason ? reason : ''}`}); + msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); + } catch(err) { + msg.reply('There was an error.'); + return console.error(err.stack); + } + try{ + await msg.guild.unban(member.user.id); + } catch(err) { + msg.reply('There was an error.'); + return console.error(err.stack); + } - await member.ban({ days: 7, reason: msg.author.tag + ': ' + (reason ? reason : '') }) - .catch(err => { - msg.reply('There was an error.'); - return console.error(err.stack); - }) - .then(() => { - msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); - }); - await msg.guild.unban(member.user.id) - .catch(err => { - msg.reply('There was an error.'); - return console.error(err.stack); - }); - - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); try { const embed = new RichEmbed() .setColor(0x00ae86) @@ -40,26 +43,27 @@ exports.run = async (bot, msg, args) => { .setTimestamp() .setFooter(`${msg.author.tag} softbanned ${member.user.tag}`, msg.author.avatarURL); const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id); - msg.guild.channels.find('id', logChannel).send({ embed }); - } - catch (err) { + msg.guild.channels.find('id', logChannel).send({embed}); + } catch (err) { console.error(err.stack); } }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('BAN_MEMBERS')) return 'You don\'t have permission to ban members.'; + if (!member.hasPermission('BAN_MEMBERS')) { + return 'You don\'t have permission to ban members.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'softban', description: 'Kick the user and delete their messages.', - usage: '@user <...reason>', + usage: '@user <...reason>' }; diff --git a/commands/Moderation/timeout.js b/commands/Moderation/timeout.js index d8722a8..84020cd 100644 --- a/commands/Moderation/timeout.js +++ b/commands/Moderation/timeout.js @@ -8,17 +8,25 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + if (msg.guild.id != '417088992329334792') { + return msg.reply('This is a PokeWorld exclusive command. Sorry!'); + } - if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permission to put members in time-out..'); - if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in time-out.'); + if (!msg.member.hasPermission('BAN_MEMBERS')) { + return msg.reply('You don\'t have permission to put members in time-out..'); + } + if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) { + return msg.reply('I cannot put anyone in time-out.'); + } const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who do I put in time-out?'); + if (!member) { + return msg.reply('Who do I put in time-out?'); + } member.addRole(msg.guild.roles.find('name', 'Timeout')); - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); try { const embed = new RichEmbed() .setColor(0x00ae86) @@ -29,25 +37,26 @@ exports.run = async (bot, msg) => { .setTimestamp() .setFooter(`${msg.author.tag} put ${member.user.tag} in time-out.`, msg.author.avatarURL); const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id); - msg.guild.channels.find('id', logChannel).send({ embed }); - } - catch (err) { + msg.guild.channels.find('id', logChannel).send({embed}); + } catch (err) { console.error(err.stack); } }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('BAN_MEMBERS')) return 'You don\'t have permission to put members in time-out..'; + if (!member.hasPermission('BAN_MEMBERS')) { + return 'You don\'t have permission to put members in time-out..'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'timeout', description: 'Put a user in time-out', - usage: '@user', + usage: '@user' }; diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js index b8548a3..5dcd5ef 100644 --- a/commands/Moderation/warn.js +++ b/commands/Moderation/warn.js @@ -21,13 +21,12 @@ exports.run = async (bot, msg, args) => { if (warns) { const reasons = warns.reasons; reasons.push(warnReason); - await db.set(`warns_${msg.guild.id}_${victim.user.id}`, { count : warns.count + 1, reasons : reasons }); - } - else { - await db.set(`warns_${msg.guild.id}_${victim.user.id}`, { count : 1, reasons : [warnReason]}); + await db.set(`warns_${msg.guild.id}_${victim.user.id}`, {count : warns.count + 1, reasons : reasons}); + } else { + await db.set(`warns_${msg.guild.id}_${victim.user.id}`, {count : 1, reasons : [warnReason]}); } - const { RichEmbed } = require('discord.js'); + const {RichEmbed} = require('discord.js'); const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id); bot.channels.find('id', logChannel).send( new RichEmbed() @@ -38,22 +37,24 @@ exports.run = async (bot, msg, args) => { .addField('ID', victim.id, true) .addField('Created Account', victim.user.createdAt, true) .setTimestamp() - .setFooter('Warned by: ' + msg.author.tag, msg.author.avatarURL) + .setFooter(`Warned by: ${msg.author.tag}`, msg.author.avatarURL) ); }; exports.checkPermission = (bot, member) => { - if (!member.hasPermission('MANAGE_MESSAGES')) return 'You don\'t have permission to warn.'; + if (!member.hasPermission('MANAGE_MESSAGES')) { + return 'You don\'t have permission to warn.'; + } return true; -} +}; exports.conf = { aliases: [], - guildOnly: true, + guildOnly: true }; exports.help = { name: 'warn', description: 'Logs a warning to the user.', - usage : '@user ', + usage : '@user ' }; -- cgit v1.2.3