aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commands/Pokemon/joinalliance.js2
-rw-r--r--events/guildMemberAdd.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/commands/Pokemon/joinalliance.js b/commands/Pokemon/joinalliance.js
index 33c84ba..e2d9940 100644
--- a/commands/Pokemon/joinalliance.js
+++ b/commands/Pokemon/joinalliance.js
@@ -11,7 +11,7 @@ exports.run = async (bot, msg, args) => {
const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
- if (args.length < 1) return msg.reply('Please choose an alliance to join');
+ if (args.length < 1) return msg.reply('You did not pick an existing alliance. The list of alliances are as follows:\nDarkSide, Skull');
const team = findTeam(msg, args[0]);
switch (args[0])
diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js
index 9c901a8..ecd0fb8 100644
--- a/events/guildMemberAdd.js
+++ b/events/guildMemberAdd.js
@@ -36,7 +36,7 @@ module.exports = async (bot, member) => {
bot.channels.get('426829685289123850').setName('Member Count: ' + (member.guild.memberCount - botCount));
bot.channels.get('426829838238613504').setName('Bot Count: ' + botCount);
bot.channels.get('417100669980508160').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`);
- bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join an alliance! To see current alliances, run the command `p:join`. Thanks for visiting, and we hope you enjoy your stay.');
+ bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join an alliance! To see current alliances, run the command `p:joinalliance`. Thanks for visiting, and we hope you enjoy your stay.');
const role = member.guild.roles.find('name', 'Trainers');
member.addRole(role);
};