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

9 files changed, 18 insertions, 116 deletions

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 <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
 
diff --git a/commands/Fun/getcredits.js b/commands/Fun/getcredits.js
index f52ee38..66ba282 100644
--- a/commands/Fun/getcredits.js
+++ b/commands/Fun/getcredits.js
@@ -3,35 +3,25 @@
  *   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 <http://www.gnu.org/licenses/>.
+ *   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/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 <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
+ *   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 <http://www.gnu.org/licenses/>.
+ *   Licensed under the Open Software License version 3.0
  *
  * *************************************/