From d330bbf25a7a9bb48eaef4f717ce243e065f85b8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 30 Mar 2018 21:13:41 -0400 Subject: whitelist --- commands/Pokemon/claim.js | 3 ++- commands/Pokemon/drop.js | 3 ++- commands/Pokemon/forcedrop.js | 5 +++-- commands/Pokemon/join.js | 3 ++- commands/Pokemon/leave.js | 3 ++- commands/Pokemon/tradegym.js | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index c91b20e..3f9ba6c 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -19,7 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); + if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { let team; diff --git a/commands/Pokemon/drop.js b/commands/Pokemon/drop.js index 1746898..a6ff953 100644 --- a/commands/Pokemon/drop.js +++ b/commands/Pokemon/drop.js @@ -19,7 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); + if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { msg.reply('There is no owner for this gym. Claim it now with p:claim!'); diff --git a/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js index 2f68759..da06f5d 100644 --- a/commands/Pokemon/forcedrop.js +++ b/commands/Pokemon/forcedrop.js @@ -19,8 +19,9 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); - + const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); + if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to ban members.'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js index 506fabb..bae820a 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -19,7 +19,8 @@ * *************************************/ exports.run = async (bot, msg, args) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); + if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (args.length < 1) return msg.reply('Please choose a team to join'); diff --git a/commands/Pokemon/leave.js b/commands/Pokemon/leave.js index 13ba141..5682d8e 100644 --- a/commands/Pokemon/leave.js +++ b/commands/Pokemon/leave.js @@ -19,7 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); + if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (msg.member.roles.find('name', 'Skull')) { msg.member.removeRole(msg.guild.roles.find('name', 'Skull')); diff --git a/commands/Pokemon/tradegym.js b/commands/Pokemon/tradegym.js index b9d590b..fd08147 100644 --- a/commands/Pokemon/tradegym.js +++ b/commands/Pokemon/tradegym.js @@ -19,7 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!'); + const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); + if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); let team; -- cgit v1.2.3 From b4e267a6bc456e4b72602966011a18e21559ac8e Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 30 Mar 2018 21:20:03 -0400 Subject: i can feel the day where i don't need to test anything --- commands/Pokemon/claim.js | 4 ++-- commands/Pokemon/drop.js | 4 ++-- commands/Pokemon/forcedrop.js | 4 ++-- commands/Pokemon/join.js | 4 ++-- commands/Pokemon/leave.js | 4 ++-- commands/Pokemon/tradegym.js | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 3f9ba6c..4ad8a78 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -19,8 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); - if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { let team; diff --git a/commands/Pokemon/drop.js b/commands/Pokemon/drop.js index a6ff953..9f6747d 100644 --- a/commands/Pokemon/drop.js +++ b/commands/Pokemon/drop.js @@ -19,8 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); - if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { msg.reply('There is no owner for this gym. Claim it now with p:claim!'); diff --git a/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js index da06f5d..b2fae13 100644 --- a/commands/Pokemon/forcedrop.js +++ b/commands/Pokemon/forcedrop.js @@ -19,8 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); - if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to ban members.'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js index bae820a..9b4a304 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -19,8 +19,8 @@ * *************************************/ exports.run = async (bot, msg, args) => { - const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); - if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (args.length < 1) return msg.reply('Please choose a team to join'); diff --git a/commands/Pokemon/leave.js b/commands/Pokemon/leave.js index 5682d8e..716608b 100644 --- a/commands/Pokemon/leave.js +++ b/commands/Pokemon/leave.js @@ -19,8 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); - if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (msg.member.roles.find('name', 'Skull')) { msg.member.removeRole(msg.guild.roles.find('name', 'Skull')); diff --git a/commands/Pokemon/tradegym.js b/commands/Pokemon/tradegym.js index fd08147..f19fdce 100644 --- a/commands/Pokemon/tradegym.js +++ b/commands/Pokemon/tradegym.js @@ -19,8 +19,8 @@ * *************************************/ exports.run = async (bot, msg) => { - const isWhitelist = await bot.plugins.isWhitelist(msg.guild.id); - if (isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); let team; -- cgit v1.2.3 From 8233f42ffdeb7097e045922d6bde1fa905ad9fed Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 30 Mar 2018 21:42:02 -0400 Subject: okay more typos --- commands/Pokemon/claim.js | 2 +- commands/Pokemon/drop.js | 2 +- commands/Pokemon/forcedrop.js | 2 +- commands/Pokemon/join.js | 2 +- commands/Pokemon/leave.js | 2 +- commands/Pokemon/tradegym.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 4ad8a78..1d2f881 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -20,7 +20,7 @@ exports.run = async (bot, msg) => { const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); - if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { let team; diff --git a/commands/Pokemon/drop.js b/commands/Pokemon/drop.js index 9f6747d..fb58184 100644 --- a/commands/Pokemon/drop.js +++ b/commands/Pokemon/drop.js @@ -20,7 +20,7 @@ exports.run = async (bot, msg) => { const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); - if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { msg.reply('There is no owner for this gym. Claim it now with p:claim!'); diff --git a/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js index b2fae13..4f6003b 100644 --- a/commands/Pokemon/forcedrop.js +++ b/commands/Pokemon/forcedrop.js @@ -20,7 +20,7 @@ exports.run = async (bot, msg) => { const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); - if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!'); if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permssion to ban members.'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js index 9b4a304..09b5e11 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -20,7 +20,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. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + 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 a team to join'); diff --git a/commands/Pokemon/leave.js b/commands/Pokemon/leave.js index 716608b..24405cf 100644 --- a/commands/Pokemon/leave.js +++ b/commands/Pokemon/leave.js @@ -20,7 +20,7 @@ exports.run = async (bot, msg) => { const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); - if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!'); if (msg.member.roles.find('name', 'Skull')) { msg.member.removeRole(msg.guild.roles.find('name', 'Skull')); diff --git a/commands/Pokemon/tradegym.js b/commands/Pokemon/tradegym.js index f19fdce..f38d2ab 100644 --- a/commands/Pokemon/tradegym.js +++ b/commands/Pokemon/tradegym.js @@ -20,7 +20,7 @@ exports.run = async (bot, msg) => { const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id); - if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Get your server whitelisted by joining our server at https://discord.me/thedigitalregion and asking in the general channel. Sorry!'); + if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!'); if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); let team; -- cgit v1.2.3 From ac6fc04fcf61c7e8dbc13a9de15595ebbd27126d Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 31 Mar 2018 21:45:52 -0400 Subject: HUGE cleanup --- Plugins/Music.js | 13 +----- Plugins/economy.js | 13 +----- Plugins/settings.js | 13 +----- Plugins/whitelist.js | 13 +----- canvas@2.0.0-alpha.11 | 0 cd | 0 commands/Fun/8ball.js | 13 +----- commands/Fun/balance.js | 13 +----- commands/Fun/cureboredom.js | 13 +----- commands/Fun/findmyphone.js | 13 +----- commands/Fun/getcredits.js | 13 +----- commands/Fun/og151.js | 13 +----- commands/Fun/ship.js | 13 +----- commands/Fun/slots.js | 13 +----- commands/Fun/story.js | 13 +----- commands/Getting Started/contribute.js | 13 +----- commands/Getting Started/help.js | 13 +----- commands/Getting Started/ping.js | 13 +----- commands/Getting Started/start.js | 13 +----- commands/Moderation/ban.js | 13 +----- commands/Moderation/interrogate.js | 13 +----- commands/Moderation/jail.js | 13 +----- commands/Moderation/kick.js | 13 +----- commands/Moderation/lswarns.js | 13 +----- commands/Moderation/purge.js | 13 +----- commands/Moderation/setLogs.js | 13 +----- commands/Moderation/setSuggestions.js | 44 ++++++++------------- commands/Moderation/softban.js | 13 +----- commands/Moderation/timeout.js | 13 +----- commands/Moderation/warn.js | 13 +----- commands/Music/play.js | 13 +----- commands/Music/skip.js | 13 +----- commands/Owners Only/eval.js | 13 +----- commands/Owners Only/modifycredits.js | 13 +----- commands/Owners Only/poweroff.js | 13 +----- commands/Owners Only/say.js | 13 +----- commands/Owners Only/testingcredits.js | 13 +----- commands/Owners Only/triggeregg.js | 13 +----- commands/Pokemon/claim.js | 13 +----- commands/Pokemon/drop.js | 13 +----- commands/Pokemon/forcedrop.js | 13 +----- commands/Pokemon/join.js | 13 +----- commands/Pokemon/leave.js | 13 +----- commands/Pokemon/lsitem.js | 13 +----- commands/Pokemon/tradegym.js | 13 +----- commands/Utility/character.js | 15 +------ commands/Utility/git.js | 38 ++++++------------ commands/Utility/invite.js | 18 ++------- commands/Utility/nick.js | 13 +----- commands/Utility/suggest.js | 13 +----- commands/Utility/uptime.js | 13 +----- commands/Utility/userinfo.js | 13 +----- 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 +----- ls | 0 node-pre-gyp | 0 npm | 0 test.js | 72 ---------------------------------- 64 files changed, 91 insertions(+), 804 deletions(-) delete mode 100644 canvas@2.0.0-alpha.11 delete mode 100644 cd delete mode 100644 ls delete mode 100644 node-pre-gyp delete mode 100644 npm delete mode 100644 test.js (limited to 'commands') diff --git a/Plugins/Music.js b/Plugins/Music.js index 25164b7..2dbabda 100644 --- a/Plugins/Music.js +++ b/Plugins/Music.js @@ -3,18 +3,7 @@ * Music: Plugin for PokeBot that interacts with the Lavalink API. * 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/Plugins/economy.js b/Plugins/economy.js index aa0bb24..3658ce8 100644 --- a/Plugins/economy.js +++ b/Plugins/economy.js @@ -3,18 +3,7 @@ * Economy: Plugin for PokeBot that enables economy features. * 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/Plugins/settings.js b/Plugins/settings.js index d458c9c..bfa15d5 100644 --- a/Plugins/settings.js +++ b/Plugins/settings.js @@ -3,18 +3,7 @@ * Settings: Plugin for PokeBot that enables settings features. * 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/Plugins/whitelist.js b/Plugins/whitelist.js index ff102aa..41b4398 100644 --- a/Plugins/whitelist.js +++ b/Plugins/whitelist.js @@ -3,18 +3,7 @@ * Whittelist: Plugin for PokeBot that let's the owners whitelist servers. * 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/canvas@2.0.0-alpha.11 b/canvas@2.0.0-alpha.11 deleted file mode 100644 index e69de29..0000000 diff --git a/cd b/cd deleted file mode 100644 index e69de29..0000000 diff --git a/commands/Fun/8ball.js b/commands/Fun/8ball.js index 16d5d24..48f53e0 100644 --- a/commands/Fun/8ball.js +++ b/commands/Fun/8ball.js @@ -3,18 +3,7 @@ * 8ball: Plugin for PokeBot that allows users to use an 8ball. * 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/commands/Fun/balance.js b/commands/Fun/balance.js index 6bfd2b0..afe094e 100644 --- a/commands/Fun/balance.js +++ b/commands/Fun/balance.js @@ -3,18 +3,7 @@ * Get Credits: Plugin for PokeBot that gives you credits. * 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/commands/Fun/cureboredom.js b/commands/Fun/cureboredom.js index 1b7913c..4b99406 100644 --- a/commands/Fun/cureboredom.js +++ b/commands/Fun/cureboredom.js @@ -3,18 +3,7 @@ * CureBoredom: Plugin for PokeBot that "cures" your boredom. * 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/commands/Fun/findmyphone.js b/commands/Fun/findmyphone.js index 1575917..135d449 100644 --- a/commands/Fun/findmyphone.js +++ b/commands/Fun/findmyphone.js @@ -3,18 +3,7 @@ * FindMyPhone: Plugin for PokeBot that "helps you find your phone". * 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/commands/Fun/getcredits.js b/commands/Fun/getcredits.js index f52ee38..1d8b79b 100644 --- a/commands/Fun/getcredits.js +++ b/commands/Fun/getcredits.js @@ -3,18 +3,7 @@ * Get Credits: Plugin for PokeBot that gives you credits. * 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 * * *************************************/ const commandCooldown = new Set(); diff --git a/commands/Fun/og151.js b/commands/Fun/og151.js index aa9a288..d2b3ccf 100644 --- a/commands/Fun/og151.js +++ b/commands/Fun/og151.js @@ -3,18 +3,7 @@ * og151: Plugin for PokeBot that randomly picks 1 out of the original 151 Pokemon. * 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/commands/Fun/ship.js b/commands/Fun/ship.js index fdf9e3e..ba31db5 100644 --- a/commands/Fun/ship.js +++ b/commands/Fun/ship.js @@ -3,18 +3,7 @@ * Ship: Plugin for PokeBot that ships the user with someone else. * 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/commands/Fun/slots.js b/commands/Fun/slots.js index b3295b4..ddd6757 100644 --- a/commands/Fun/slots.js +++ b/commands/Fun/slots.js @@ -3,18 +3,7 @@ * Slots: Plugin for PokeBot that allows you to gamble. * 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 . + * TLicensed under the Open Software License version 3.0 * * *************************************/ diff --git a/commands/Fun/story.js b/commands/Fun/story.js index 538bade..c35e3e7 100644 --- a/commands/Fun/story.js +++ b/commands/Fun/story.js @@ -3,18 +3,7 @@ * Story: Plugin for PokeBot that tells the user a story. * 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/commands/Getting Started/contribute.js b/commands/Getting Started/contribute.js index 0e1ae82..2530058 100644 --- a/commands/Getting Started/contribute.js +++ b/commands/Getting Started/contribute.js @@ -3,18 +3,7 @@ * Contribute: Plugin for PokeBot that redirects users to the proper place to contribute. * 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/commands/Getting Started/help.js b/commands/Getting Started/help.js index 457e6ec..94a2128 100644 --- a/commands/Getting Started/help.js +++ b/commands/Getting Started/help.js @@ -3,18 +3,7 @@ * Help: Plugin for PokeBot that guides the user on how to use the bot. * 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/commands/Getting Started/ping.js b/commands/Getting Started/ping.js index 3de0479..365c9f4 100644 --- a/commands/Getting Started/ping.js +++ b/commands/Getting Started/ping.js @@ -3,18 +3,7 @@ * Ping: Plugin for PokeBot that provides diagnostic information. * 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/commands/Getting Started/start.js b/commands/Getting Started/start.js index c31ff1c..9da8be7 100644 --- a/commands/Getting Started/start.js +++ b/commands/Getting Started/start.js @@ -3,18 +3,7 @@ * GettingStarted: Plugin for PokeBot that guides the user on how to start a journey. * 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/commands/Moderation/ban.js b/commands/Moderation/ban.js index 5974c53..545618c 100644 --- a/commands/Moderation/ban.js +++ b/commands/Moderation/ban.js @@ -3,18 +3,7 @@ * Ban: Plugin for PokeBot that performs moderation actions. * 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/commands/Moderation/interrogate.js b/commands/Moderation/interrogate.js index 8fa9708..a8fc250 100644 --- a/commands/Moderation/interrogate.js +++ b/commands/Moderation/interrogate.js @@ -3,18 +3,7 @@ * Interrogate: Plugin for PokeBot that allows the staff to investigate the fish :cod: * 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/commands/Moderation/jail.js b/commands/Moderation/jail.js index 9923540..3388663 100644 --- a/commands/Moderation/jail.js +++ b/commands/Moderation/jail.js @@ -3,18 +3,7 @@ * Jail: Plugin for PokeBot that punishes bad boys.. * 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/commands/Moderation/kick.js b/commands/Moderation/kick.js index c9d1d24..3a8c597 100644 --- a/commands/Moderation/kick.js +++ b/commands/Moderation/kick.js @@ -3,18 +3,7 @@ * Kick: Plugin for PokeBot that performs moderation actions. * 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/commands/Moderation/lswarns.js b/commands/Moderation/lswarns.js index 7d03c12..0a165b3 100644 --- a/commands/Moderation/lswarns.js +++ b/commands/Moderation/lswarns.js @@ -3,18 +3,7 @@ * List Warns: Plugin for PokeBot that performs moderation actions. * 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/commands/Moderation/purge.js b/commands/Moderation/purge.js index 256dca8..6ce557c 100644 --- a/commands/Moderation/purge.js +++ b/commands/Moderation/purge.js @@ -3,18 +3,7 @@ * Purge: Plugin for PokeBot that performs moderation actions. * 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/commands/Moderation/setLogs.js b/commands/Moderation/setLogs.js index a354085..8ae50ea 100644 --- a/commands/Moderation/setLogs.js +++ b/commands/Moderation/setLogs.js @@ -3,18 +3,7 @@ * Set Log: Plugin for PokeBot that performs moderation actions. * 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/commands/Moderation/setSuggestions.js b/commands/Moderation/setSuggestions.js index 2fcd880..2a9d1bd 100644 --- a/commands/Moderation/setSuggestions.js +++ b/commands/Moderation/setSuggestions.js @@ -3,35 +3,23 @@ * Set Suggestions: Plugin for PokeBot that performs moderation actions. * 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 * * *************************************/ exports.run = async (bot, msg, args) => { - if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permission to manage messages.'); - bot.plugins.settings.setStr('suggestions', args[0], msg.guild.id); - msg.reply('Alright, I have set the suggestions channel to ' + args[0]); - }; - - exports.conf = { - aliases: [], - guildOnly: true, - }; - - exports.help = { - name: 'setSuggestions', - description: 'Set\'s the Suggestions Channel.', - usage: '', - }; - \ No newline at end of file + if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permission to manage messages.'); + bot.plugins.settings.setStr('suggestions', args[0], msg.guild.id); + msg.reply('Alright, I have set the suggestions channel to ' + args[0]); +}; + +exports.conf = { + aliases: [], + guildOnly: true, +}; + +exports.help = { + name: 'setSuggestions', + description: 'Set\'s the Suggestions Channel.', + usage: '', +}; diff --git a/commands/Moderation/softban.js b/commands/Moderation/softban.js index 2db58ec..a97f8a6 100644 --- a/commands/Moderation/softban.js +++ b/commands/Moderation/softban.js @@ -3,18 +3,7 @@ * SoftBan: Plugin for PokeBot that performs moderation actions. * 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/commands/Moderation/timeout.js b/commands/Moderation/timeout.js index af9c713..2e479ac 100644 --- a/commands/Moderation/timeout.js +++ b/commands/Moderation/timeout.js @@ -3,18 +3,7 @@ * Time Out: Plugin for PokeBot that punishes bad boys.. * 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/commands/Moderation/warn.js b/commands/Moderation/warn.js index 2599c0f..1dd0410 100644 --- a/commands/Moderation/warn.js +++ b/commands/Moderation/warn.js @@ -3,18 +3,7 @@ * Warn: Plugin for PokeBot that performs moderation actions. * 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/commands/Music/play.js b/commands/Music/play.js index cd22057..c494ea2 100644 --- a/commands/Music/play.js +++ b/commands/Music/play.js @@ -3,18 +3,7 @@ * Play: Plugin for PokeBot that performs music player actions. * 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/commands/Music/skip.js b/commands/Music/skip.js index 09ab165..96cecf6 100644 --- a/commands/Music/skip.js +++ b/commands/Music/skip.js @@ -3,18 +3,7 @@ * Skip: Plugin for PokeBot that performs music player actions. * 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/commands/Owners Only/eval.js b/commands/Owners Only/eval.js index a6a6916..09aac08 100644 --- a/commands/Owners Only/eval.js +++ b/commands/Owners Only/eval.js @@ -3,18 +3,7 @@ * Eval / Exec: Plugin for PokeBot that provides diagnostic information. * 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/commands/Owners Only/modifycredits.js b/commands/Owners Only/modifycredits.js index 69da668..6401d85 100644 --- a/commands/Owners Only/modifycredits.js +++ b/commands/Owners Only/modifycredits.js @@ -3,18 +3,7 @@ * Modify Credits: Plugin for PokeBot that modifies economy features. * 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/commands/Owners Only/poweroff.js b/commands/Owners Only/poweroff.js index 0facc66..4bd7f75 100644 --- a/commands/Owners Only/poweroff.js +++ b/commands/Owners Only/poweroff.js @@ -3,18 +3,7 @@ * Poweroff: Plugin for PokeBot that remotely exits the process. * 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/commands/Owners Only/say.js b/commands/Owners Only/say.js index 95f6c53..3085d53 100644 --- a/commands/Owners Only/say.js +++ b/commands/Owners Only/say.js @@ -3,18 +3,7 @@ * Say: Plugin for PokeBot that sends a message with the provided content. * 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/commands/Owners Only/testingcredits.js b/commands/Owners Only/testingcredits.js index 01d4934..bee93b2 100644 --- a/commands/Owners Only/testingcredits.js +++ b/commands/Owners Only/testingcredits.js @@ -3,18 +3,7 @@ * Testing Credits: Plugin for PokeBot that modifies economy features. * 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/commands/Owners Only/triggeregg.js b/commands/Owners Only/triggeregg.js index 45da516..c65c539 100644 --- a/commands/Owners Only/triggeregg.js +++ b/commands/Owners Only/triggeregg.js @@ -3,18 +3,7 @@ * TriggerEgg: Plugin for PokeBot that manages community events. * 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/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 1d2f881..9bba3ec 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -3,18 +3,7 @@ * Claim: Plugin for PokeBot that powers the PokeWorld gym system. * 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/commands/Pokemon/drop.js b/commands/Pokemon/drop.js index fb58184..3b2bf97 100644 --- a/commands/Pokemon/drop.js +++ b/commands/Pokemon/drop.js @@ -3,18 +3,7 @@ * Drop: Plugin for PokeBot that powers the PokeWorld gym system. * 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/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js index 4f6003b..50a9acf 100644 --- a/commands/Pokemon/forcedrop.js +++ b/commands/Pokemon/forcedrop.js @@ -3,18 +3,7 @@ * Ban: Plugin for PokeBot that powers the PokeWorld gym system. * 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/commands/Pokemon/join.js b/commands/Pokemon/join.js index 09b5e11..91c6c7e 100644 --- a/commands/Pokemon/join.js +++ b/commands/Pokemon/join.js @@ -3,18 +3,7 @@ * Join: Plugin for PokeBot that powers the PokeWorld team system. * 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/commands/Pokemon/leave.js b/commands/Pokemon/leave.js index 24405cf..813debe 100644 --- a/commands/Pokemon/leave.js +++ b/commands/Pokemon/leave.js @@ -3,18 +3,7 @@ * Leave: Plugin for PokeBot that powers the PokeWorld team system. * 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/commands/Pokemon/lsitem.js b/commands/Pokemon/lsitem.js index fad8bb3..dd628ae 100644 --- a/commands/Pokemon/lsitem.js +++ b/commands/Pokemon/lsitem.js @@ -3,18 +3,7 @@ * LSItem: Plugin for lists an item for sale in the marketplace * 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/commands/Pokemon/tradegym.js b/commands/Pokemon/tradegym.js index f38d2ab..e195b62 100644 --- a/commands/Pokemon/tradegym.js +++ b/commands/Pokemon/tradegym.js @@ -3,18 +3,7 @@ * TradeGym: Plugin for PokeBot that powers the PokeWorld gym system. * 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/commands/Utility/character.js b/commands/Utility/character.js index 603571b..56d9bfb 100644 --- a/commands/Utility/character.js +++ b/commands/Utility/character.js @@ -1,20 +1,9 @@ /** ************************************** * - * Suggest: Plugin for PokeBot that allows users to suggest things. + * Character: Plugin for PokeBot that examines unicode character further. * 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/commands/Utility/git.js b/commands/Utility/git.js index a648995..f5113a2 100644 --- a/commands/Utility/git.js +++ b/commands/Utility/git.js @@ -3,32 +3,20 @@ * Git: Plugin for PokeBot that provides gives the user information about the bot. * 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 * * *************************************/ exports.run = (bot, msg) => { - msg.channel.send('The GitHub page for PokeBot can be found here: https://github.com/PokeWorld/PokeBot'); - }; - - exports.conf = { - aliases: [], - guildOnly: true, - }; - - exports.help = { - name: 'git', - description: 'Gives the user a link to the git.', - }; - \ No newline at end of file + msg.channel.send('The GitHub page for PokeBot can be found here: https://github.com/PokeWorld/PokeBot'); +}; + +exports.conf = { + aliases: [], + guildOnly: true, +}; + +exports.help = { + name: 'git', + description: 'Gives the user a link to the git.', +}; diff --git a/commands/Utility/invite.js b/commands/Utility/invite.js index e602649..933e9ba 100644 --- a/commands/Utility/invite.js +++ b/commands/Utility/invite.js @@ -3,32 +3,20 @@ * Invite: Plugin for PokeBot that provides gives the user information about the bot. * 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 * * *************************************/ exports.run = (bot, msg) => { msg.channel.send('You can invite me by visiting https://discordbots.org/bot/417096530596724737.'); }; - + exports.conf = { aliases: [], guildOnly: true, }; - + exports.help = { name: 'invite', description: 'Gives the user a link to invite the bot.', }; - \ No newline at end of file diff --git a/commands/Utility/nick.js b/commands/Utility/nick.js index 9701a3c..44ab7f5 100644 --- a/commands/Utility/nick.js +++ b/commands/Utility/nick.js @@ -3,18 +3,7 @@ * Nick: Plugin for PokeBot that changes the user's display name. * 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/commands/Utility/suggest.js b/commands/Utility/suggest.js index fae35db..f1b4206 100644 --- a/commands/Utility/suggest.js +++ b/commands/Utility/suggest.js @@ -3,18 +3,7 @@ * Suggest: Plugin for PokeBot that allows users to suggest things. * 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/commands/Utility/uptime.js b/commands/Utility/uptime.js index 86ae84d..8492df2 100644 --- a/commands/Utility/uptime.js +++ b/commands/Utility/uptime.js @@ -3,18 +3,7 @@ * Uptime: Plugin for PokeBot that provides diagnostic information. * 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/commands/Utility/userinfo.js b/commands/Utility/userinfo.js index 9716021..80844e1 100644 --- a/commands/Utility/userinfo.js +++ b/commands/Utility/userinfo.js @@ -3,18 +3,7 @@ * UserInfo: Plugin for PokeBot that gives the user information about themselves or another 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/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 * * *************************************/ diff --git a/ls b/ls deleted file mode 100644 index e69de29..0000000 diff --git a/node-pre-gyp b/node-pre-gyp deleted file mode 100644 index e69de29..0000000 diff --git a/npm b/npm deleted file mode 100644 index e69de29..0000000 diff --git a/test.js b/test.js deleted file mode 100644 index 69b8e71..0000000 --- a/test.js +++ /dev/null @@ -1,72 +0,0 @@ -const Discord = require('discord.js'); -const bot = new Discord.Client(); -const fs = require('fs'); - -bot.commands = new Discord.Collection(); -bot.aliases = new Discord.Collection(); -bot.categories = new Discord.Collection(); -bot.queue = new Discord.Collection(); -bot.plugins = { music : require('./Plugins/Music.js') }; -cmdLoader(); - -async function cmdLoader() { - const categories = await fs.readdirSync('./commands'); - console.log(`Loading ${categories.length} categories(s) into memory\n`); - categories.forEach(x => { - loadGroup(x); - }); -} -async function loadGroup(name) { - const files = await fs.readdirSync(`./commands/${name}`); - - console.log(`Loading the category '${name}' into memory with a total of ${files.length} command(s)`); - - bot.commands.set(name, new Map()); - bot.aliases.set(name, new Map()); - - const commands = []; - files.forEach(x => { - loadCmd(name, x); - commands.push(x.split('.')[0]); - }); - - bot.categories.set(name, commands); - console.log(`The category ${name} has been loaded.\n`); -} - -async function loadCmd(category, cmd) { - try { - console.log(`Loading the Command ${cmd.split('.')[0]}`); - const command = require(`./commands/${category}/${cmd}`); - bot.commands.get(category).set(command.help.name, command); - command.conf.aliases.forEach(alias => { - console.log(`Loading the alias ${alias} for the command ${command.help.name}`); - bot.aliases.get(category).set(alias, command.help.name); - }); - } - catch (err) { - console.log(`An error has occured trying to load the command '${cmd.split('.')[0]}'`); - console.log(err.stack); - } -} - - -fs.readdir('./events', (err, files) => { - if (err) console.error(err); - console.log(`Attempting to load a total of ${files.length} events into the memory.`); - files.forEach(file => { - try { - const eventName = file.split('.')[0]; - const event = require(`./events/${file}`); - console.log(`Attempting to load the event "${eventName}".`); - bot.on(eventName, event.bind(null, bot)); - delete require.cache[require.resolve(`./events/${file}`)]; - } - catch (err) { - console.log('An error has occured trying to load a event. Here is the error.'); - console.log(err.stack); - } - }); - console.log('Event Loading complete!'); - console.log('\n'); -}); -- 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 'commands') 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 From d0879c5f8b04d678318ef6138734689a76fc4269 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Apr 2018 18:50:16 -0400 Subject: jk, now last fixes --- commands/Getting Started/help.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands') diff --git a/commands/Getting Started/help.js b/commands/Getting Started/help.js index 94a2128..1f6cf44 100644 --- a/commands/Getting Started/help.js +++ b/commands/Getting Started/help.js @@ -14,7 +14,7 @@ exports.run = (bot, msg, args) => { embed .setColor (0x36393e) .setTitle('PokeBot Command List') - .setDescription('Full help contents can be found at http://www.digitalregion.ml/pokeworld/pokebot/commands/') + .setDescription('Full help contents can be found at http://universedevgroup.net/pokeworld/pokebot/commands/') .setFooter('PokeBot v1.0'); const categories = Array.from(bot.categories.keys()); -- cgit v1.2.3 From 8186a6af44384b8782f72a4dd7dd3f2d51188bfe Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 3 Apr 2018 22:02:33 -0400 Subject: change in repo --- README.md | 2 +- commands/Getting Started/contribute.js | 2 +- commands/Utility/git.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'commands') diff --git a/README.md b/README.md index 750f2e4..6d07b76 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

PokeWorld Discord - GitHub commits (since latest release) + GitHub commits (since latest release) Discord Bot List

diff --git a/commands/Getting Started/contribute.js b/commands/Getting Started/contribute.js index 2530058..15204fd 100644 --- a/commands/Getting Started/contribute.js +++ b/commands/Getting Started/contribute.js @@ -8,7 +8,7 @@ * *************************************/ exports.run = (bot, msg) => { - msg.channel.send('Want to help the bot? Here you go: https://github.com/PokeWorld/PokeBot.'); + msg.channel.send('Want to help the bot? Here you go: https://github.com/UniverseDevGroup/PokeBot.'); }; exports.conf = { diff --git a/commands/Utility/git.js b/commands/Utility/git.js index f5113a2..67374bb 100644 --- a/commands/Utility/git.js +++ b/commands/Utility/git.js @@ -8,7 +8,7 @@ * *************************************/ exports.run = (bot, msg) => { - msg.channel.send('The GitHub page for PokeBot can be found here: https://github.com/PokeWorld/PokeBot'); + msg.channel.send('The GitHub page for PokeBot can be found here: https://github.com/UniverseDevGroup/PokeBot.'); }; exports.conf = { -- cgit v1.2.3 From 777355db9cd0121fc41e554906ebaca049fe66ad Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 5 Apr 2018 19:17:23 -0400 Subject: cleanup --- commands/Fun/getcredits.js | 17 +++++++++-------- commands/Moderation/ban.js | 10 +++++++--- commands/Moderation/interrogate.js | 2 +- commands/Moderation/jail.js | 2 +- commands/Moderation/kick.js | 2 +- commands/Moderation/lswarns.js | 4 ++-- commands/Moderation/softban.js | 16 +++++++++++++--- commands/Owners Only/modifycredits.js | 2 +- 8 files changed, 35 insertions(+), 20 deletions(-) (limited to 'commands') diff --git a/commands/Fun/getcredits.js b/commands/Fun/getcredits.js index 1d8b79b..66ba282 100644 --- a/commands/Fun/getcredits.js +++ b/commands/Fun/getcredits.js @@ -6,21 +6,22 @@ * Licensed under the Open Software License version 3.0 * * *************************************/ -const commandCooldown = new Set(); +const cooldown = new Set(); exports.run = (bot, msg) => { - if (commandCooldown.has(msg.author.id)) return msg.reply('You have claimed credits too recently'); + if (cooldown.has(msg.author.id)) return msg.reply('You have claimed credits too recently'); if (bot.dbl.hasVoted(msg.author.id)) { bot.plugins.economy.add(msg.author.id, 100); - return msg.reply('Since you upvoted the bot, here is 100 credits.'); + msg.reply('Since you upvoted the bot, here is 100 credits.'); } - bot.plugins.economy.add(msg.author.id, 25); - msg.reply('Added 25 credits.'); - - commandCooldown.add(msg.author.id); + else { + bot.plugins.economy.add(msg.author.id, 25); + msg.reply('Added 25 credits.'); + } + cooldown.add(msg.author.id); setTimeout(() => { - commandCooldown.delete(msg.author.id); + cooldown.delete(msg.author.id); }, 3600000); }; diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js index 545618c..b9ffa4d 100644 --- a/commands/Moderation/ban.js +++ b/commands/Moderation/ban.js @@ -12,12 +12,16 @@ exports.run = async (bot, msg, args) => { if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permission to ban members.'); const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who am I gonna ban?'); + if (!member) return await msg.reply('Who am I gonna ban? (Remember to @mention them)'); const reason = args.join(' ').slice(3 + member.user.id.length); await member.ban({ days: 7, reason: msg.author.tag + (reason ? ': ' + reason : '') }) - .catch(err => { msg.reply('There was an error.'); console.error(err.stack);}); - msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); + .catch(err => { + msg.reply('There was an error.'); return console.error(err.stack); + }) + .then(() => { + msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); + }); const { RichEmbed } = require('discord.js'); try { diff --git a/commands/Moderation/interrogate.js b/commands/Moderation/interrogate.js index a8fc250..821c93a 100644 --- a/commands/Moderation/interrogate.js +++ b/commands/Moderation/interrogate.js @@ -14,7 +14,7 @@ exports.run = async (bot, msg) => { if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot interrogate anyone.'); const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who do I interrogate?'); + if (!member) return await msg.reply('Who shall I interrogate? (Remember to @mention them)'); member.addRole(msg.guild.roles.find('name', 'Interrogation')); diff --git a/commands/Moderation/jail.js b/commands/Moderation/jail.js index 3388663..2dc50cf 100644 --- a/commands/Moderation/jail.js +++ b/commands/Moderation/jail.js @@ -14,7 +14,7 @@ exports.run = async (bot, msg) => { if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in jail.'); const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who do I put in jail?'); + if (!member) return await msg.reply('Who do I put in jail? (Remember to @mention them)'); member.addRole(msg.guild.roles.find('name', 'Jail')); diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js index 3a8c597..174e867 100644 --- a/commands/Moderation/kick.js +++ b/commands/Moderation/kick.js @@ -12,7 +12,7 @@ exports.run = async (bot, msg, args) => { if (!msg.guild.member(bot.user).hasPermission('KICK_MEMBERS')) return msg.reply('I don\'t have permission to kick members.'); const member = msg.mentions.members.first(); - if (!member) return await msg.reply('Who am I gonna kick?'); + if (!member) return await msg.reply('Who am I gonna kick? (Remember to @mention them)'); const reason = args.join(' ').slice(3 + member.user.id.length); await member.kick(msg.author.tag + ': ' + (reason ? ': ' + reason : '')) diff --git a/commands/Moderation/lswarns.js b/commands/Moderation/lswarns.js index 0a165b3..732184d 100644 --- a/commands/Moderation/lswarns.js +++ b/commands/Moderation/lswarns.js @@ -12,11 +12,11 @@ exports.run = async (bot, msg) => { const { RichEmbed } = require('discord.js'); const warns = await db.fetch(`warns_${msg.guild.id}_${msg.author.id}`); - if (!warns) return await msg.reply('Yay! You have no warns.'); + if (!warns) return await msg.reply('You don\'t have any warnings in this server.'); const embed = new RichEmbed() .setTitle('Warns'); for (let i = 0; i < warns.count; i++) { - embed.addField('Warning #' + i+1, warns.reasons[i]); + embed.addField('Warning #' + i + 1, warns.reasons[i]); } msg.channel.send({ embed }); }; diff --git a/commands/Moderation/softban.js b/commands/Moderation/softban.js index a97f8a6..dd5b4a9 100644 --- a/commands/Moderation/softban.js +++ b/commands/Moderation/softban.js @@ -16,9 +16,19 @@ exports.run = async (bot, msg, args) => { const reason = args.join(' ').slice(3 + member.user.id.length); await member.ban({ days: 7, reason: msg.author.tag + ': ' + (reason ? reason : '') }) - .catch(err => { msg.reply('There was an error.'); console.error(err.stack);}); - await msg.guild.unban(member.user.id).catch(msg.reply('There was an error.')); - msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); + .catch(err => { + msg.reply('There was an error.'); + return console.error(err.stack); + }) + .then(() => { + msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`); + }); + await msg.guild.unban(member.user.id) + .catch(err => { + msg.reply('There was an error.'); + return console.error(err.stack); + }); + const { RichEmbed } = require('discord.js'); try { const embed = new RichEmbed() diff --git a/commands/Owners Only/modifycredits.js b/commands/Owners Only/modifycredits.js index 6401d85..050d74d 100644 --- a/commands/Owners Only/modifycredits.js +++ b/commands/Owners Only/modifycredits.js @@ -17,7 +17,7 @@ exports.run = async (bot, msg) => { user = msg.mentions.users.first(); } - var oldbal = bot.plugins.economy.get(user.id); + const oldbal = bot.plugins.economy.get(user.id); bot.plugins.economy.subtract(user.id, oldbal); -- cgit v1.2.3 From b41df418dcaa114a173b0eec234b4b71f91b7318 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 5 Apr 2018 20:18:43 -0400 Subject: gyms system --- bot.js | 6 +++- commands/Pokemon/claim.js | 87 ++++++++++++++++++++++------------------------- plugins/gyms.js | 34 ++++++++++++++++++ 3 files changed, 80 insertions(+), 47 deletions(-) create mode 100644 plugins/gyms.js (limited to 'commands') diff --git a/bot.js b/bot.js index c22345d..4962977 100644 --- a/bot.js +++ b/bot.js @@ -9,7 +9,11 @@ bot.commands = new Discord.Collection(); bot.aliases = new Discord.Collection(); bot.categories = new Discord.Collection(); bot.queue = new Discord.Collection(); -bot.plugins = { music : require('./plugins/music.js') , economy : require('./plugins/Economy.js'), settings : require('./plugins/settings.js'), whitelist: require('./plugins/whitelist.js')}; +bot.plugins = { music : require('./plugins/music.js') , + economy : require('./plugins/Economy.js'), + settings : require('./plugins/settings.js'), + whitelist: require('./plugins/whitelist.js'), + gyms : require('./plugins/gyms.js')}; cmdLoader(); bot.Raven = require('raven'); diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 9bba3ec..40edf49 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -10,56 +10,51 @@ exports.run = async (bot, msg) => { 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 (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); - if (msg.channel.topic == 'Current Owner: *none*') { - let team; - if (msg.member.roles.find('name', 'Skull')) team = 'Skull'; - if (msg.member.roles.find('name', 'Flare')) team = 'Flare'; + + if (bot.plugins.isOwned(msg.channel.topic)) { + const team = bot.plugins.gyms.getTeam(msg.member); if (!team) return msg.reply('You have to join a team before you can claim a gym.'); msg.reply('Alright, you have claimed this gym as yours! Be ready to battle anyone who approaches you'); - msg.channel.setTopic('Current Owner: ' + msg.author.id + '/' + msg.author.tag + '/' + team); - } - else { - let team; - if (msg.member.roles.find('name', 'Skull')) team = 'Skull'; - if (msg.member.roles.find('name', 'Flare')) team = 'Flare'; - if (!team) return msg.reply('You have to join a team before you can claim a gym.'); - const owner = msg.channel.topic.slice(15).substring(0, 18); - 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.'); - if (bot.gyms.get(msg.channel.id) != null) return msg.reply('Nope, someone is already battling the gym.'); - msg.channel.send('<@' + owner + '>, come here as ' + msg.member.displayName + ' wants to battle you.'); - const func = async mess => { - if (mess.channel != msg.channel) return; - let field = mess.embeds[0]; - if (!field) return; - field = field.description; - if (!field) return; - field = field.split('\n')[0]; - if (!field) return; - field = field.split(' ')[0]; - if (field != undefined) { - const user = msg.guild.members.find(member => member.user.username === field); - if (user != undefined) { - if (user.id == owner) { - await msg.channel.send('The owner has not been defeated!'); - bot.gyms.set(msg.channel.id, null); - bot.removeListener('message', func); - } - if (user.id == msg.author.id) { - await msg.channel.send('The owner has been defeated! Transferring gym!'); - let recipientTeam; - if (msg.member.roles.find('name', 'Skull')) recipientTeam = 'Skull'; - if (msg.member.roles.find('name', 'Flare')) recipientTeam = 'Flare'; - await msg.channel.setTopic('Current Owner: ' + msg.member.id + '/' + msg.author.tag + '/' + recipientTeam); - bot.gyms.set(msg.channel.id, null); - bot.removeListener('message', func); - } - } - } - }; - bot.gyms.set(msg.channel.id, func); - bot.on('message', func); + return msg.channel.setTopic(bot.plugins.gyms.getGymString(bot, msg.member)); } + + const team = bot.plugins.gyms.getTeam(msg.member); + if (!team) return msg.reply('You have to join a team before you can claim a gym.'); + + const owner = bot.plguins.gyms.getOwnerId(msg.channel.topic); + 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.'); + + if (bot.gyms.get(msg.channel.id) != null) return msg.reply('Nope, someone is already battling the gym.'); + + msg.channel.send('<@' + owner + '>, come here as ' + msg.member.displayName + ' wants to battle you.'); + + const func = async mess => { + if (mess.channel != msg.channel) return; + if (!mess.embeds[0] && + !mess.embeds[0].description && + !mess.embeds[0].description.split('\n')[0] && + !mess.embeds[0].description.split('\n')[0].split(' ')[0] + ) return; + + const field = mess.embeds[0].description.split('\n')[0].split(' ')[0]; + const user = msg.guild.members.find(member => member.user.username === field); + if (!user) return; + if (user.id == owner) { + await msg.channel.send('The owner has not been defeated!'); + } + else if (user.id == msg.author.id) { + await msg.channel.send('The owner has been defeated! Transferring gym!'); + bot.gyms.getTeam(mess.member); + await msg.channel.setTopic(bot.plugins.gyms.getGymString(bot, mess.member)); + } + else { return; } + bot.gyms.set(msg.channel.id, null); + bot.removeListener('message', func); + }; + bot.gyms.set(msg.channel.id, func); + bot.on('message', func); }; exports.conf = { diff --git a/plugins/gyms.js b/plugins/gyms.js new file mode 100644 index 0000000..d4b1afe --- /dev/null +++ b/plugins/gyms.js @@ -0,0 +1,34 @@ +/** ************************************** + * + * Gyms: Plugin for PokeBot that enables gym features. + * Copyright (C) 2018 TheEdge, jtsshieh, Alee + * + * Licensed under the Open Software License version 3.0 + * + * *************************************/ + +exports.isTeam = (member) => { + let team; + if (member.roles.find('name', 'Skull')) team = 'Skull'; + if (member.roles.find('name', 'Flare')) team = 'Flare'; + return team ? true : false; +}; + +exports.getTeam = (member) => { + let team; + if (member.roles.find('name', 'Skull')) team = 'Skull'; + if (member.roles.find('name', 'Flare')) team = 'Flare'; + return team; +}; + +exports.getOwnerId = (title) => { + return title.slice(15).substring(0, 18); +}; + +exports.getGymString = (bot, member) => { + return 'Current Owner: ' + member.id + '/' + member.user.tag + '/' + bot.plugins.gyms.getTeam(member); +}; + +exports.isOwned = (title) => { + return title != 'Current Owner: *none*'; +}; -- cgit v1.2.3 From 878d7d60331e5fa7f0bd54b4dba6e9427be82f0c Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 5 Apr 2018 20:25:05 -0400 Subject: more stuff --- commands/Pokemon/claim.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 40edf49..00a9188 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -13,7 +13,7 @@ exports.run = async (bot, msg) => { if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); - if (bot.plugins.isOwned(msg.channel.topic)) { + if (bot.plugins.gyms.isOwned(msg.channel.topic)) { const team = bot.plugins.gyms.getTeam(msg.member); if (!team) return msg.reply('You have to join a team before you can claim a gym.'); msg.reply('Alright, you have claimed this gym as yours! Be ready to battle anyone who approaches you'); -- cgit v1.2.3 From addf70683d681cd357133f93218b7a9b7a99fbe3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 5 Apr 2018 20:31:07 -0400 Subject: bugs --- commands/Pokemon/claim.js | 2 +- plugins/gyms.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 00a9188..f3d836e 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -13,7 +13,7 @@ exports.run = async (bot, msg) => { if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.'); - if (bot.plugins.gyms.isOwned(msg.channel.topic)) { + if (!bot.plugins.gyms.isOwned(msg.channel.topic)) { const team = bot.plugins.gyms.getTeam(msg.member); if (!team) return msg.reply('You have to join a team before you can claim a gym.'); msg.reply('Alright, you have claimed this gym as yours! Be ready to battle anyone who approaches you'); diff --git a/plugins/gyms.js b/plugins/gyms.js index 3f1ce29..d4b1afe 100644 --- a/plugins/gyms.js +++ b/plugins/gyms.js @@ -30,5 +30,5 @@ exports.getGymString = (bot, member) => { }; exports.isOwned = (title) => { - return title == 'Current Owner: *none*'; + return title != 'Current Owner: *none*'; }; -- cgit v1.2.3 From a7efea09713e1c545412b56538dfe1511ab9afee Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 5 Apr 2018 20:32:27 -0400 Subject: typo --- commands/Pokemon/claim.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index f3d836e..c468025 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -23,7 +23,7 @@ exports.run = async (bot, msg) => { const team = bot.plugins.gyms.getTeam(msg.member); if (!team) return msg.reply('You have to join a team before you can claim a gym.'); - const owner = bot.plguins.gyms.getOwnerId(msg.channel.topic); + const owner = bot.plugins.gyms.getOwnerId(msg.channel.topic); 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.'); if (bot.gyms.get(msg.channel.id) != null) return msg.reply('Nope, someone is already battling the gym.'); -- cgit v1.2.3 From e39d116465334ce84ee06267e8defb6007dddf22 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 5 Apr 2018 20:35:37 -0400 Subject: bugs --- commands/Pokemon/claim.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index c468025..e76c2a7 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -46,8 +46,7 @@ exports.run = async (bot, msg) => { } else if (user.id == msg.author.id) { await msg.channel.send('The owner has been defeated! Transferring gym!'); - bot.gyms.getTeam(mess.member); - await msg.channel.setTopic(bot.plugins.gyms.getGymString(bot, mess.member)); + await msg.channel.setTopic(bot.plugins.gyms.getGymString(bot, msg.member)); } else { return; } bot.gyms.set(msg.channel.id, null); -- cgit v1.2.3