aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bot.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/bot.js b/bot.js
index 9d9ee75..8250f3b 100644
--- a/bot.js
+++ b/bot.js
@@ -7,7 +7,11 @@ bot.on('ready', () => {
});
bot.on('guildMemberAdd', (member) => {
+<<<<<<< HEAD
+ bot.channels.get('416633835216830495').send(`Welcome @${member.user.tag}!`);
+=======
bot.channels.get('416633835216830495').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules in #rules!`);
+>>>>>>> 1e399cdcb20c5eb4b8f8aa5fff2a19fd05505c37
const role = member.guild.roles.find('name', 'Trainers');
member.addRole(role);
});
@@ -32,12 +36,23 @@ function parseCommand(msg) {
.setTitle('PokeBot Command List')
.setDescription('These are the commands you can use. My prefix is `p:`')
.addField('Core', 'help\nping', true)
+ .addField('Utility', 'suggest', true)
.setFooter('PokeBot Beta')
);
break;
case 'ping':
msg.channel.send(':ping_pong: Pong! ' + Math.floor(bot.ping) + 'ms.');
break;
+ case 'suggest':
+ //bot.channels.get('416726932927938570').send(
+ //new Discord.RichEmbed()
+ //.setColor (0x00ae86)
+ //.setTitle('Suggestion')
+ //.setDescription('This is a suggestion from a community member for something relating to the server. Please rate it based on your opinion, and a staff member will decide what to do with the suggestion.')
+ //.addField('Suggestion Contents', args.join(' '))
+ //);
+ bot.channels.get('416726932927938570').send('this is a test!')
+ break;
}
}
bot.login(config.token);