diff options
| -rw-r--r-- | commands/Pokemon/claim.js | 1 | ||||
| -rw-r--r-- | events/guildMemberAdd.js | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index b0b6f2f..b02cdd0 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -40,6 +40,7 @@ exports.run = async (bot, msg) => { if (msg.guild.members.find('id', owner).roles.find('name', team)) return msg.reply('Don\'t try battling your own team. They won\'t like you.'); msg.channel.send('<@' + owner + '>, come here as ' + msg.member.displayName + ' wants to battle you.'); bot.on('message', async mess => { + if (mess.channel != msg.channel) return; let field = mess.embeds[0]; if (!field) return; field = field.description; diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js index 7f30b6f..8c58252 100644 --- a/events/guildMemberAdd.js +++ b/events/guildMemberAdd.js @@ -39,9 +39,9 @@ module.exports = async (bot, member) => { { console.error(err.stack); } - //bot.channels.find('name', 'welcome').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`); - //const role = member.guild.roles.find('name', 'Trainers'); - //member.addRole(role); + bot.channels.find('name', 'welcome').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`); + const role = member.guild.roles.find('name', 'Trainers'); + member.addRole(role); }; async function draw(bot, member) { |