es-lint settings added + linted all files

4 files changed, 26 insertions, 25 deletions

diff --git a/plugins/economy.js b/plugins/economy.js
index 3658ce8..a1273d7 100644
--- a/plugins/economy.js
+++ b/plugins/economy.js
@@ -12,10 +12,9 @@ exports.get = async (userid) => {
   const amount = await db.fetch(`money_${userid}`);
   if (amount) {
     return amount;
-  }
-  else {
+  } else {
     await db.set(`money_${userid}`, 0);
-    return await db.fetch(`money_${userid}`);
+    return db.fetch(`money_${userid}`);
   }
 };
 
@@ -23,8 +22,7 @@ exports.add = async (userid, money) => {
   const amount = await db.fetch(`money_${userid}`);
   if (amount) {
     await db.set(`money_${userid}`, amount + money);
-  }
-  else {
+  } else {
     await db.set(`money_${userid}`, money);
   }
 };
@@ -33,8 +31,7 @@ exports.subtract = async (userid, money) => {
   const amount = await db.fetch(`money_${userid}`);
   if (amount) {
     await db.set(`money_${userid}`, amount - money);
-  }
-  else {
+  } else {
     await db.set(`money_${userid}`, 0 - money);
   }
 };
diff --git a/plugins/gyms.js b/plugins/gyms.js
index d4b1afe..8dd0f9d 100644
--- a/plugins/gyms.js
+++ b/plugins/gyms.js
@@ -9,15 +9,23 @@
 
 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;
+  if (member.roles.find('name', 'Skull')) {
+    team = 'Skull';
+  }
+  if (member.roles.find('name', 'Flare')) {
+    team = 'Flare';
+  }
+  return Boolean(team);
 };
 
 exports.getTeam = (member) => {
   let team;
-  if (member.roles.find('name', 'Skull')) team = 'Skull';
-  if (member.roles.find('name', 'Flare')) team = 'Flare';
+  if (member.roles.find('name', 'Skull')) {
+    team = 'Skull';
+  }
+  if (member.roles.find('name', 'Flare')) {
+    team = 'Flare';
+  }
   return team;
 };
 
@@ -26,7 +34,7 @@ exports.getOwnerId = (title) => {
 };
 
 exports.getGymString = (bot, member) => {
-  return 'Current Owner: ' + member.id + '/' + member.user.tag + '/' + bot.plugins.gyms.getTeam(member);
+  return `Current Owner: ${ member.id }/${ member.user.tag }/${ bot.plugins.gyms.getTeam(member)}`;
 };
 
 exports.isOwned = (title) => {
diff --git a/plugins/settings.js b/plugins/settings.js
index bfa15d5..c696a96 100644
--- a/plugins/settings.js
+++ b/plugins/settings.js
@@ -12,10 +12,9 @@ exports.getInt = async (key, guildID) => {
   const value = await db.fetch(`settings_${guildID}_${key}`);
   if (value) {
     return value;
-  }
-  else {
+  } else {
     await db.set(`settings_${guildID}_${key}`, 0);
-    return await db.fetch(`settings_${guildID}_${key}`);
+    return db.fetch(`settings_${guildID}_${key}`);
   }
 };
 
@@ -23,10 +22,9 @@ exports.getStr = async (key, guildID) => {
   const value = await db.fetch(`settings_${guildID}_${key}`);
   if (value) {
     return value;
-  }
-  else {
+  } else {
     await db.set(`settings_${guildID}_${key}`, '');
-    return await db.fetch(`settings_${guildID}_${key}`);
+    return db.fetch(`settings_${guildID}_${key}`);
   }
 };
 
@@ -34,10 +32,9 @@ exports.getBool = async (key, guildID) => {
   const value = await db.fetch(`settings_${guildID}_${key}`);
   if (value) {
     return value;
-  }
-  else {
+  } else {
     await db.set(`settings_${guildID}_${key}`, false);
-    return await db.fetch(`settings_${guildID}_${key}`);
+    return db.fetch(`settings_${guildID}_${key}`);
   }
 };
 
diff --git a/plugins/whitelist.js b/plugins/whitelist.js
index 41b4398..dc594a7 100644
--- a/plugins/whitelist.js
+++ b/plugins/whitelist.js
@@ -20,9 +20,8 @@ exports.isWhitelist = async (guildID) => {
   const value = await db.fetch(`whitelist_${guildID}`);
   if (value) {
     return value;
-  }
-  else {
+  } else {
     await db.set(`whitelist_${guildID}`, false);
-    return await db.fetch(`whitelist_${guildID}`);
+    return db.fetch(`whitelist_${guildID}`);
   }
 };