From 9547631cfc0ea4067a5a7ada819ea6b3f59a4b09 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Fri, 9 Mar 2018 20:45:14 -0500 Subject: Revert "Merge branch 'master' of https://github.com/PokeWorld/PokeBot" This reverts commit 54505ce7eb1aee434a19c5c5bd30f4f7b888c407. --- commands/Moderation/ban.js | 2 +- commands/Moderation/kick.js | 2 +- commands/Moderation/purge.js | 2 +- commands/Moderation/softban.js | 2 +- commands/Moderation/timeout.js | 40 ---------------------------------------- commands/Moderation/warn.js | 2 +- commands/Pokemon/forcedrop.js | 2 +- 7 files changed, 6 insertions(+), 46 deletions(-) diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js index a863341..29cd566 100644 --- a/commands/Moderation/ban.js +++ b/commands/Moderation/ban.js @@ -19,7 +19,7 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permission to ban members.'); + if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permssion to ban members.'); if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permssion to ban members.'); const member = msg.mentions.members.first(); diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js index ccd3379..ee7bf99 100644 --- a/commands/Moderation/kick.js +++ b/commands/Moderation/kick.js @@ -19,7 +19,7 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.member.hasPermission('KICK_MEMBERS')) return msg.reply('You don\'t have permission to kick members.'); + if (!msg.member.hasPermission('KICK_MEMBERS')) return msg.reply('You don\'t have permssion to kick members.'); if (!msg.guild.member(bot.user).hasPermission('KICK_MEMBERS')) return msg.reply('I don\'t have permssion to kick members.'); const member = msg.mentions.members.first(); diff --git a/commands/Moderation/purge.js b/commands/Moderation/purge.js index 1e81a3e..fbb381d 100644 --- a/commands/Moderation/purge.js +++ b/commands/Moderation/purge.js @@ -19,7 +19,7 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permission to manage messages.'); + if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to manage messages.'); if (!msg.guild.member(bot.user).hasPermission('MANAGE_MESSAGES')) return msg.reply('I don\'t have permssion to manage messages.'); const user = msg.mentions.users.first(); diff --git a/commands/Moderation/softban.js b/commands/Moderation/softban.js index 9193b79..69a7fd3 100644 --- a/commands/Moderation/softban.js +++ b/commands/Moderation/softban.js @@ -19,7 +19,7 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permission to ban members.'); + if (!msg.member.hasPermission('BAN_MEMBERS')) return msg.reply('You don\'t have permssion to ban members.'); if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permssion to ban members.'); const member = msg.mentions.members.first(); diff --git a/commands/Moderation/timeout.js b/commands/Moderation/timeout.js index c74ecf0..b78e059 100644 --- a/commands/Moderation/timeout.js +++ b/commands/Moderation/timeout.js @@ -18,7 +18,6 @@ * * *************************************/ -<<<<<<< HEAD exports.run = async (bot, msg) => { 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.'); @@ -56,42 +55,3 @@ exports.help = { description: 'Put a user in time-out', usage: '@user', }; -======= -exports.run = async (bot, msg, args) => { - 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?'); - - member.addRole(msg.guild.roles.find('name', 'Timeout')); - - const { RichEmbed } = require('discord.js'); - try { - const embed = new RichEmbed() - .setColor(0x00ae86) - .setAuthor(member.user.tag, member.user.avatarURL) - .setTitle(`Time Out: **${member.user.tag}**`) - .setDescription(`*${member.user.tag}* was placed in time-out by *${msg.author.tag}*.`) - .addField('Moderator', msg.author.tag) - .setTimestamp() - .setFooter(`${msg.author.tag} put ${member.user.tag} in time-out.`, msg.author.avatarURL); - msg.guild.channels.find('name', 'logs').send({ embed }); - } - catch (err) { - console.error(err.stack); - } - }; - - exports.conf = { - aliases: [], - guildOnly: true, - }; - - exports.help = { - name: 'timeout', - description: 'Put a user in time-out', - usage: '@user', - }; - ->>>>>>> 4d253ab491041e147e9943d8820ba06f611df2d5 diff --git a/commands/Moderation/warn.js b/commands/Moderation/warn.js index c3d173a..b47fa3f 100644 --- a/commands/Moderation/warn.js +++ b/commands/Moderation/warn.js @@ -19,7 +19,7 @@ * *************************************/ exports.run = (bot, msg, args) => { - if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permission to warn.'); + if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to warn.'); args.shift(); const warnReason = args.join(' '); const victim = msg.mentions.members.first(); diff --git a/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js index 3421e9b..1c2131f 100644 --- a/commands/Pokemon/forcedrop.js +++ b/commands/Pokemon/forcedrop.js @@ -19,7 +19,7 @@ * *************************************/ exports.run = async (bot, msg) => { - if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permission to drop gyms.'); + if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to ban members.'); if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); -- cgit v1.2.3