diff options
| author | pokesudenk <thisis@notarealema.il> | 2018-02-24 13:26:47 -0500 |
|---|---|---|
| committer | pokesudenk <thisis@notarealema.il> | 2018-02-24 13:26:47 -0500 |
| commit | c54f7c7c85af4c6f268b88033ef9bd84464e3aeb (patch) | |
| tree | 60ed992ae8550b3e90f5cfc3ecdd2996ed9d1570 /commands | |
| parent | 6947ffa5846d132f406c14489a0072f199a0561b (diff) | |
| parent | c6c21db700ff63690ff10b050a3b99c9c034a7a4 (diff) | |
| download | PokeBot-c54f7c7c85af4c6f268b88033ef9bd84464e3aeb.tar.gz PokeBot-c54f7c7c85af4c6f268b88033ef9bd84464e3aeb.tar.bz2 PokeBot-c54f7c7c85af4c6f268b88033ef9bd84464e3aeb.zip | |
Merge branch 'master' of https://github.com/PokeWorld/PokeBot
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/ban.js | 4 | ||||
| -rw-r--r-- | commands/join.js | 6 | ||||
| -rw-r--r-- | commands/softban.js | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/commands/ban.js b/commands/ban.js index 33c9277..74d8447 100644 --- a/commands/ban.js +++ b/commands/ban.js @@ -16,8 +16,8 @@ exports.run = async (bot, msg, args) => { .setColor(0x00ae86) .setAuthor(member.user.tag, member.user.avatarURL) .setTitle(`:hammer: **${member.user.tag}**`) - .setDescription(`*${member.user.tag}}* was banned from the server by *${msg.author.tag}*.`) - .addField('Reason', reason) + .setDescription(`*${member.user.tag}* was banned from the server by *${msg.author.tag}*.`) + .addField('Reason', reason ? reason : '*none*') .addField('Moderator', msg.author.tag) .setTimestamp() .setFooter(`${msg.author.tag} banned ${member.user.tag}`, msg.author.avatarURL); diff --git a/commands/join.js b/commands/join.js index b7fd916..dc3ba84 100644 --- a/commands/join.js +++ b/commands/join.js @@ -6,17 +6,17 @@ exports.run = async (bot, msg, args) => { { case 'mystic': { msg.member.addRole(msg.guild.roles.find('name', 'Mystic')); - msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you are have '}joined team Mystic.`); + msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Mystic.`); break; } case 'valor' : { msg.member.addRole(msg.guild.roles.find('name', 'Valor')); - msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you are have '}joined team Valor.`); + msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Valor.`); break; } case 'instinct' : { msg.member.addRole(msg.guild.roles.find('name', 'Instinct')); - msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you are have '}joined team Instinct.`); + msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Instinct.`); break; } default : { diff --git a/commands/softban.js b/commands/softban.js index ff5d4b5..8c4fee0 100644 --- a/commands/softban.js +++ b/commands/softban.js @@ -6,7 +6,7 @@ exports.run = async (bot, msg, args) => { if (!member) return await msg.reply('Who am I gonna softban?'); const reason = args.join(' ').slice(3 + member.user.id.length); - await member.ban({ days: 7, reason: msg.author.tag + ': ' + (reason ? ': ' + reason : '') }) + await member.ban({ days: 7, reason: msg.author.tag + ': ' + (reason ? reason : '') }) .catch(err => { msg.reply('There was an error.'); console.error(err.stack);}); await msg.guild.unban(member.user.id).catch(msg.reply('There was an error.')); msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); @@ -16,8 +16,8 @@ exports.run = async (bot, msg, args) => { .setColor(0x00ae86) .setAuthor(member.user.tag, member.user.avatarURL) .setTitle(`:hammer: **${member.user.tag}**`) - .setDescription(`*${member.user.tag}}* was softbanned from the server by *${msg.author.tag}*.`) - .addField('Reason', reason) + .setDescription(`*${member.user.tag}* was softbanned from the server by *${msg.author.tag}*.`) + .addField('Reason', reason ? reason : '*none*') .addField('Moderator', msg.author.tag) .setTimestamp() .setFooter(`${msg.author.tag} softbanned ${member.user.tag}`, msg.author.avatarURL); |