whitelist

6 files changed, 13 insertions, 7 deletions

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;