Merge branch 'master' of https://github.com/PokeWorld/PokeBot

8 files changed, 12 insertions, 100 deletions

diff --git a/events/channelCreate.js b/events/channelCreate.js
index 9dce088..339a3b5 100644
--- a/events/channelCreate.js
+++ b/events/channelCreate.js
@@ -3,18 +3,7 @@
  *   ChannelCreate: Plugin for PokeBot that setups gyms when they are created.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js
index 57ff757..11c0c18 100644
--- a/events/guildMemberAdd.js
+++ b/events/guildMemberAdd.js
@@ -3,18 +3,7 @@
  *   GuildMemberAdd: Plugin for PokeBot that setups up and welcomes any new user.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
@@ -44,7 +33,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 a team: `p:join <skull, flare>`');
+  bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join a team: `p:join <flare, skull>`. Also, make sure to read our introduction: `p:start`.');
   const role = member.guild.roles.find('name', 'Trainers');
   member.addRole(role);
 };
diff --git a/events/guildMemberRemove.js b/events/guildMemberRemove.js
index 9d38180..001f2ec 100644
--- a/events/guildMemberRemove.js
+++ b/events/guildMemberRemove.js
@@ -3,18 +3,7 @@
  *   GuildMemberRemove: Plugin for PokeBot that waves bye to a user who leaves.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/events/message.js b/events/message.js
index 4154536..238d95e 100644
--- a/events/message.js
+++ b/events/message.js
@@ -3,18 +3,7 @@
  *   Message/CommandHandler: Plugin for PokeBot that processes and parses command.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/events/messageDelete.js b/events/messageDelete.js
index 2823e7f..95c3718 100644
--- a/events/messageDelete.js
+++ b/events/messageDelete.js
@@ -1,20 +1,9 @@
 /** **************************************
  *
- *   messageDelete: Plugin for PokeBot that handles deleted messages.
+ *   MessageDelete: Plugin for PokeBot that handles deleted messages.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/events/messageDeleteBulk.js b/events/messageDeleteBulk.js
index 0d0c345..3d84e4d 100644
--- a/events/messageDeleteBulk.js
+++ b/events/messageDeleteBulk.js
@@ -1,20 +1,9 @@
 /** **************************************
  *
- *   messagesDeleteBulk: Plugin for PokeBot that handles many messages being deleted at once.
+ *   MessagesDeleteBulk: Plugin for PokeBot that handles many messages being deleted at once.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/events/messageUpdate.js b/events/messageUpdate.js
index ed0565b..0baa08c 100644
--- a/events/messageUpdate.js
+++ b/events/messageUpdate.js
@@ -1,20 +1,9 @@
 /** **************************************
  *
- *   messageUpdate: Plugin for PokeBot that handles edited messages.
+ *   MessageUpdate: Plugin for PokeBot that handles edited messages.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/events/ready.js b/events/ready.js
index 8b7a61b..9c30717 100644
--- a/events/ready.js
+++ b/events/ready.js
@@ -3,18 +3,7 @@
  *   Ready: Plugin for PokeBot that setups up pokebot for production.
  *   Copyright (C) 2018 TheEdge, jtsshieh, Alee
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/