From ac6fc04fcf61c7e8dbc13a9de15595ebbd27126d Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 31 Mar 2018 21:45:52 -0400 Subject: HUGE cleanup --- events/channelCreate.js | 13 +------------ events/guildMemberAdd.js | 13 +------------ events/guildMemberRemove.js | 13 +------------ events/message.js | 13 +------------ events/messageDelete.js | 15 ++------------- events/messageDeleteBulk.js | 15 ++------------- events/messageUpdate.js | 15 ++------------- events/ready.js | 13 +------------ 8 files changed, 11 insertions(+), 99 deletions(-) (limited to 'events') 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 . + * Licensed under the Open Software License version 3.0 * * *************************************/ diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js index 57ff757..63081b1 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 . + * Licensed under the Open Software License version 3.0 * * *************************************/ 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 . + * 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 . + * 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 . + * 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 . + * 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 . + * 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 . + * Licensed under the Open Software License version 3.0 * * *************************************/ -- cgit v1.2.3 From 25a77ee0dab23409516ce4f87c3b72600d3118f4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Apr 2018 18:49:13 -0400 Subject: last changes --- commands/Getting Started/start.js | 2 +- commands/Pokemon/join.js | 2 +- events/guildMemberAdd.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'events') diff --git a/commands/Getting Started/start.js b/commands/Getting Started/start.js index 9da8be7..e24ca70 100644 --- a/commands/Getting Started/start.js +++ b/commands/Getting Started/start.js @@ -15,7 +15,7 @@ exports.run = (bot, msg) => { .setColor(0x00ae86) .setTitle('Getting Started in PokeWorld') .addField('PokeCord', 'First off, we need to get you up and running in PokeCord!\n\nMake sure to use the `p!start` command to pick a starter pokemon. Once you have done that, you can start using PokeCord related features in the server!') - .addField('Teams // Gyms', 'Next, you may join a team using PokeBot. To do this, run the `join` command followed by the team you want to join. You can join `aqua`, `magma`, and `rocket`. Now, you can start claiming gyms. To do this, run `p:claim` in a gym channel. If no one owns it, the gym will now be yours. However if someone does own it, it will either tell you to lay off (if your team owns the gym), or it will ping the owner of the gym and tell them to battle you. If you lose said battle, you will not recieve the gym. Otherwise, the owner of the gym will have to drop it for you to claim. You can also trade gyms with other members using the `tradegym` command.') + .addField('Teams // Gyms', 'Next, you may join a team using PokeBot. To do this, run the `join` command followed by the team you want to join. You can join `flare` or `skull`. Now, you can start claiming gyms. To do this, run `p:claim` in a gym channel. If no one owns it, the gym will now be yours. However if someone does own it, it will either tell you to lay off (if your team owns the gym), or it will ping the owner of the gym and tell them to battle you. If you lose said battle, you will not recieve the gym. Otherwise, the owner of the gym will have to drop it for you to claim. You can also trade gyms with other members using the `tradegym` command.') .addField('The End of the Introduction', 'Now that you have done all of this, you are ready to start your journey in the digital region! Chat with people, make friends, and most importantly, have fun!\n\n-The official "sentience" of the PokeWorld server!') .setFooter('PokeBot v1.0') ); diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js index 91c6c7e..2187eef 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -58,5 +58,5 @@ exports.conf = { exports.help = { name: 'join', description: 'Join one of the teams!', - usage: '', + usage: '', }; diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js index 63081b1..11c0c18 100644 --- a/events/guildMemberAdd.js +++ b/events/guildMemberAdd.js @@ -33,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 `'); + bot.channels.get('417088992329334794').send('Welcome to the server <@' + member.id + '>. Be sure to join a team: `p:join `. Also, make sure to read our introduction: `p:start`.'); const role = member.guild.roles.find('name', 'Trainers'); member.addRole(role); }; -- cgit v1.2.3