Merge branch 'dev' into 'main'

Removed var for let

See merge request illegitimate/illegitimate-bot!81

commands/check.js

@@ -55,31 +55,34 @@ module.exports = {
         const rank2 = player.newPackageRank;
         const monthlyRank = player.monthlyPackageRank;
 
+        let rank = ""
         if (rank2 === 'VIP') {
-            var rank = "[VIP] "
+            rank = "[VIP] "
         } else if (rank2 === 'VIP_PLUS') {
-            var rank = "[VIP+] "
+            rank = "[VIP+] "
         } else if (rank2 === 'MVP') {
-            var rank = "[MVP] "
+            rank = "[MVP] "
         } else if (rank2 === 'MVP_PLUS' && monthlyRank === 'NONE') {
-            var rank = "[MVP+] "
+            rank = "[MVP+] "
         } else if (rank2 === 'MVP_PLUS' && monthlyRank === 'SUPERSTAR') {
-            var rank = "[MVP++] "
+            rank = "[MVP++] "
         }
 
         const guild = await getGuild(uuid)
+        let guildName = ""
         if (!guild) {
-            var guildName = "None";
+            guildName = "None";
         } else {
-            var guildName = guild.name;
+            guildName = guild.name;
         }
 
+        let guildTag = ""
         if (!guild) {
-            var guildTag = ""
+            guildTag = ""
         } else if (!guild.tag) {
-            var guildTag = ""
+            guildTag = ""
         } else {
-            var guildTag = " [" + guild.tag + "]"
+            guildTag = " [" + guild.tag + "]"
         }
 
         //bedwars level
@@ -113,27 +116,30 @@ module.exports = {
         const hypixelExp = player.networkExp;
         const level = hypixelLevel(hypixelExp);
 
+        let bwtitle = ""
+        let swtitle = ""
+        let duelstitle = ""
         if (hsbwstars < bwstars || hsbwfkdr < bwfkdr || hsbwwins < bwwins) {
-            var bwtitle =
+            bwtitle =
                 "<a:cross_a:1087808606897983539> This player does not meet the BedWars requirements.";
         } else {
-            var bwtitle =
+            bwtitle =
                 "<a:check_a:1087808632172847134> This player meets the BedWars requirements.";
         }
 
         if (hsswstars < swstars) {
-            var swtitle =
+            swtitle =
                 "<a:cross_a:1087808606897983539> This player does not meet the SkyWars requirements.";
         } else {
-            var swtitle =
+            swtitle =
                 "<a:check_a:1087808632172847134> This player meets the SkyWars requirements.";
         }
 
         if (hsduelswins < duelswins || hsduelswlr < duelswlr) {
-            var duelstitle =
+            duelstitle =
                 "<a:cross_a:1087808606897983539> This player does not meet the Duels requirements.";
         } else {
-            var duelstitle =
+            duelstitle =
                 "<a:check_a:1087808632172847134> This player meets the Duels requirements.";
         }
 

commands/forceupdate.js

@@ -53,10 +53,11 @@ module.exports = {
         const head = await getHeadURL(ign)
         const guild = await getGuild(verifyData.uuid);
 
+        let responseGuildID = ""
         if (!guild) {
-            var responseGuildID = null
+            responseGuildID = null
         } else {
-            var responseGuildID = guild._id
+            responseGuildID = guild._id
         }
 
         if (responseGuildID !== hypixelGuildID) {

commands/forceverify.js

@@ -53,16 +53,18 @@ module.exports = {
             return
         }
 
+        let username = ""
         if (user1.discriminator == "0") {
-            var username = user1.username
+            username = user1.username
         } else {
-            var username = user1.username + "#" + user1.discriminator
+            username = user1.username + "#" + user1.discriminator
         }
 
+        let modName = ""
         if (mod.discriminator == "0") {
-            var modName = mod.username
+            modName = mod.username
         } else {
-            var modName = mod.username + "#" + mod.discriminator
+            modName = mod.username + "#" + mod.discriminator
         }
 
         const uuid = await getUUID(ign);
@@ -88,10 +90,11 @@ module.exports = {
         }
 
         const guild = await getGuild(uuid);
+        let responseGuildID = ""
         if (!guild) {
-            var responseGuildID = null
+            responseGuildID = null
         } else {
-            var responseGuildID = guild._id
+            responseGuildID = guild._id
         }
 
         const head = await getHeadURL(ign);

commands/guild/member.js

@@ -47,16 +47,17 @@ async function guildMember(interaction) {
     const monthlyRank = player.monthlyPackageRank;
     const displayName = player.displayname;
 
+    let rank = "";
     if (serverRank === "VIP") {
-        var rank = "[VIP] ";
+        rank = "[VIP] ";
     } else if (serverRank === "VIP_PLUS") {
-        var rank = "[VIP+] ";
+        rank = "[VIP+] ";
     } else if (serverRank === "MVP") {
-        var rank = "[MVP] ";
+        rank = "[MVP] ";
     } else if (serverRank === "MVP_PLUS" && monthlyRank === "NONE") {
-        var rank = "[MVP+] ";
+        rank = "[MVP+] ";
     } else if (serverRank === "MVP_PLUS" && monthlyRank === "SUPERSTAR") {
-        var rank = "[MVP++] ";
+        rank = "[MVP++] ";
     }
 
     const guild = await getGuild(uuid);

commands/update.js

@@ -42,10 +42,11 @@ module.exports = {
         }
 
         const guild = await getGuild(verifyData.uuid);
+        let guildID = ""
         if (!guild) {
-            var guildID = null
+            guildID = null
         } else {
-            var guildID = guild._id
+            guildID = guild._id
         }
 
         const ign = await getIGN(verifyData.uuid);

commands/verify.js

@@ -68,10 +68,11 @@ module.exports = {
             return;
         }
 
+        let username = ""
         if (user1.discriminator === "0") {
-            var username = user1.username
+            username = user1.username
         } else {
-            var username = user1.username + "#" + user1.discriminator
+            username = user1.username + "#" + user1.discriminator
         }
 
         if (!player.socialMedia) {
@@ -116,10 +117,11 @@ module.exports = {
         }
 
         const guild = await getGuild(uuid);
+        let guildID = ""
         if (!guild) {
-            var guildID = null
+            guildID = null
         } else {
-            var guildID = guild._id
+            guildID = guild._id
         }
 
         if (guildID === hypixelGuildID) {

config/roles.json

@@ -6,7 +6,7 @@
     "beast": "815880942345519104",
     "member": "815880984301404190",
     "trialmember": "815877333532540938",
-    "guildStaff": "984584711227703336",
+    "guildStaff": "1175860041652379718",
     "guildRole": "1043224015722000514",
     "waitingListRole": "1092543315053908120",
     "defaultMember": "722386801930797056",

events/buttons/checkstats.js

@@ -37,31 +37,34 @@ module.exports = {
         const rank2 = player.newPackageRank;
         const monthlyRank = player.monthlyPackageRank;
 
+        let rank = ""
         if (rank2 === 'VIP') {
-            var rank = "[VIP] "
+            rank = "[VIP] "
         } else if (rank2 === 'VIP_PLUS') {
-            var rank = "[VIP+] "
+            rank = "[VIP+] "
         } else if (rank2 === 'MVP') {
-            var rank = "[MVP] "
+            rank = "[MVP] "
         } else if (rank2 === 'MVP_PLUS' && monthlyRank === 'NONE') {
-            var rank = "[MVP+] "
+            rank = "[MVP+] "
         } else if (rank2 === 'MVP_PLUS' && monthlyRank === 'SUPERSTAR') {
-            var rank = "[MVP++] "
+            rank = "[MVP++] "
         }
 
         const guild = await getGuild(uuid)
+        let guildName = ""
         if (!guild) {
-            var guildName = "None";
+            guildName = "None";
         } else {
-            var guildName = guild.name;
+            guildName = guild.name;
         }
 
+        let guildTag = ""
         if (!guild) {
-            var guildTag = ""
+            guildTag = ""
         } else if (!guild.tag) {
-            var guildTag = ""
+            guildTag = ""
         } else {
-            var guildTag = " [" + guild.tag + "]"
+            guildTag = " [" + guild.tag + "]"
         }
 
         //bedwars level
@@ -95,22 +98,25 @@ module.exports = {
         const hypixelExp = player.networkExp;
         const level = hypixelLevel(hypixelExp);
 
+        let bwtitle = ""
+        let swtitle = ""
+        let duelstitle = ""
         if (hsbwstars < bwstars || hsbwfkdr < bwfkdr || hsbwwins < bwwins) {
-            var bwtitle = "<a:cross_a:1087808606897983539> This player does not meet the BedWars requirements."
+            bwtitle = "<a:cross_a:1087808606897983539> This player does not meet the BedWars requirements."
         } else {
-            var bwtitle = "<a:check_a:1087808632172847134> This player meets the BedWars requirements."
+            bwtitle = "<a:check_a:1087808632172847134> This player meets the BedWars requirements."
         }
 
         if (hsswstars < swstars) {
-            var swtitle = "<a:cross_a:1087808606897983539> This player does not meet the SkyWars requirements."
+            swtitle = "<a:cross_a:1087808606897983539> This player does not meet the SkyWars requirements."
         } else {
-            var swtitle = "<a:check_a:1087808632172847134> This player meets the SkyWars requirements."
+            swtitle = "<a:check_a:1087808632172847134> This player meets the SkyWars requirements."
         }
 
         if (hsduelswins < duelswins || hsduelswlr < duelswlr) {
-            var duelstitle = "<a:cross_a:1087808606897983539> This player does not meet the Duels requirements."
+            duelstitle = "<a:cross_a:1087808606897983539> This player does not meet the Duels requirements."
         } else {
-            var duelstitle = "<a:check_a:1087808632172847134> This player meets the Duels requirements."
+            duelstitle = "<a:check_a:1087808632172847134> This player meets the Duels requirements."
         }
 
         await interaction.editReply({

events/modals/denyreasonbox.js

@@ -22,10 +22,11 @@ module.exports = {
         const embed = message.embeds[0];
         const applicantId = embed.footer.text.split(" ")[1];
 
+        let applicant = ""
         try {
-            var applicant = await guild.members.fetch(applicantId);
+            applicant = await guild.members.fetch(applicantId);
         } catch (error) {
-            var applicant = null;
+            applicant = null;
         }
         const reason = interaction.fields.fields.get('denyreason').value || "No reason provided";
         const embedColor = Number(color.replace("#", "0x"));
@@ -76,10 +77,11 @@ module.exports = {
             await applicant.send({ embeds: [dmMessage] });
         }
 
+        let responseEmbeds = ""
         if (applicant === null) {
-            var responseEmbeds = [responseEmbed, missingUser];
+            responseEmbeds = [responseEmbed, missingUser];
         } else {
-            var responseEmbeds = [responseEmbed];
+            responseEmbeds = [responseEmbed];
         }
 
         await guildapp.findOneAndDelete({ userID: applicantId });

index.js

@@ -5,15 +5,6 @@ require('dotenv').config();
 const mongoURI = process.env.MONGOURI;
 const { connect } = require('mongoose');
 
-if (process.env.NODE_ENV === 'dev') {
-    console.log("Running in development mode.");
-    var token = process.env.DEVTOKEN;
-    autoDeployCommands()
-} else {
-    console.log("Running in production mode.");
-    var token = process.env.PRODTOKEN;
-}
-
 const client = new Client({
     intents: [
         GatewayIntentBits.Guilds,
@@ -41,6 +32,16 @@ loadButtonEvents(client);
 loadModalEvents(client);
 loadEvents(client);
 
+let token = ""
+if (process.env.NODE_ENV === 'dev') {
+    console.log("Running in development mode.");
+    token = process.env.DEVTOKEN;
+    autoDeployCommands()
+} else {
+    console.log("Running in production mode.");
+    token = process.env.PRODTOKEN;
+}
+
 client.login(token);
 
 connect(mongoURI, {}).then(() => {

utils/functions/bedwars.js

@@ -4,7 +4,7 @@
 function getExpForLevel(level) {
     if (level == 0) return 0;
 
-    var respectedLevel = getLevelRespectingPrestige(level);
+    let respectedLevel = getLevelRespectingPrestige(level);
     if (respectedLevel > EASY_LEVELS) {
         return 5000;
     }
@@ -37,12 +37,12 @@ const XP_PER_PRESTIGE = 96 * 5000 + EASY_LEVELS_XP;
 const LEVELS_PER_PRESTIGE = 100;
 const HIGHEST_PRESTIGE = 50;
 function bedwarsLevel(exp) {
-    var prestiges = Math.floor(exp / XP_PER_PRESTIGE);
+    let prestiges = Math.floor(exp / XP_PER_PRESTIGE);
-    var level = prestiges * LEVELS_PER_PRESTIGE;
+    let level = prestiges * LEVELS_PER_PRESTIGE;
-    var expWithoutPrestiges = exp - (prestiges * XP_PER_PRESTIGE);
+    let expWithoutPrestiges = exp - (prestiges * XP_PER_PRESTIGE);
 
     for (let i = 1; i <= EASY_LEVELS; ++i) {
-        var expForEasyLevel = getExpForLevel(i);
+        let expForEasyLevel = getExpForLevel(i);
         if (expWithoutPrestiges < expForEasyLevel) {
             break;
         }

utils/functions/skywars.js

@@ -2,7 +2,7 @@
     Code used from the slothpixel project https://github.com/slothpixel/core
 */
 function skywarsLevel(xp) {
-    var xps = [0, 20, 70, 150, 250, 500, 1000, 2000, 3500, 6000, 10000, 15000];
+    let xps = [0, 20, 70, 150, 250, 500, 1000, 2000, 3500, 6000, 10000, 15000];
     let exactLevel = 0
     if (xp >= 15000) {
         exactLevel = (xp - 15000) / 10000 + 12;