andrew-projects-archive/PokeBot
1
0
Fork 0
mirror of https://github.com/UniverseDevGroup/PokeBot.git synced 2025-01-23 01:42:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Unknown 2018-02-24 11:56:25 -05:00
commit 758ed0d283
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commands/warn.js
View file

@ -1,7 +1,13 @@
exports.run = (bot, msg, args) => {
<<<<<<< HEAD
if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to warn.');
const warnReason = args.slice(1);
const victim = msg.mentions.users.first();
=======
if (!message.author.permissions.has("MANAGE_MESSAGES")) return message.channel.send(':warning: You cannot warn members due to your permission level.');
let warnReason = args.slice(1);
var victim = message.mentions.users.first();
>>>>>>> master
msg.channel.send(`Successfully logged ${victim.user.tag}'s warning.`);