From 8c9b70f2e8d8b4f4b420acba589a701983375e5d Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Sun, 21 May 2023 11:56:37 +0200
Subject: [PATCH] Bug fix

---
 commands/check.js            |  7 ++++---
 events/buttons/checkstats.js | 35 ++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/commands/check.js b/commands/check.js
index ee6f6de..519fce1 100644
--- a/commands/check.js
+++ b/commands/check.js
@@ -77,15 +77,15 @@ module.exports = {
 
 		const rank_formatted = stats.data.rank_formatted;
 		const rank2 = rank_formatted.replace(/&[0-9a-fk-or]/g, "");
-		const guildCheck = await fetch(guildAPI + uuid);
-
+		
 		if (rank2 === "") {
 			var rank = "";
 		} else {
 			var rank = rank2 + " ";
 		}
-
+		
 		try {
+			const guildCheck = await fetch(guildAPI + uuid);
 			var guildName = guildCheck.data.name;
 		} catch (error) {
 			var guildName = "None";
@@ -116,6 +116,7 @@ module.exports = {
 		}
 
 		try {
+			const guildCheck = await fetch(guildAPI + uuid);	
 			const tag_formatted = guildCheck.data.tag_formatted;
 			const guildTag2 = tag_formatted.replace(/&[0-9a-fk-or]/g, "");
 			var guildTag = " " + guildTag2;
diff --git a/events/buttons/checkstats.js b/events/buttons/checkstats.js
index a4d5a94..a0f0427 100644
--- a/events/buttons/checkstats.js
+++ b/events/buttons/checkstats.js
@@ -18,7 +18,7 @@ module.exports = {
 
         const guildappdata = await guildapp.findOne({ userID: applicantId })
         const uuid = guildappdata.uuid;
-        
+
         const mojang = "https://api.mojang.com/user/profile/"
         const slothPixel = "https://api.slothpixel.me/api/players/";
         const guildAPI = "https://api.slothpixel.me/api/guilds/"
@@ -32,17 +32,16 @@ module.exports = {
             await fetch(slothPixel + uuid);
         } catch (error) {
             interaction.editReply({
-							embeds: [{
-								description: "That player hasn't played Hypixel before.",
-								color: embedColor
-							}]
-						})
+                embeds: [{
+                    description: "That player hasn't played Hypixel before.",
+                    color: embedColor
+                }]
+            })
             return
         }
 
         const stats = await fetch(slothPixel + uuid);
         const head = minotar + ign;
-				const guildCheck = await fetch(guildAPI + uuid);
 
         const rank_formatted = stats.data.rank_formatted
         const rank2 = rank_formatted.replace(/&[0-9a-fk-or]/g, "")
@@ -54,6 +53,7 @@ module.exports = {
         }
 
         try {
+            const guildCheck = await fetch(guildAPI + uuid)
             var guildName = guildCheck.data.name
         } catch (error) {
             var guildName = "None"
@@ -82,8 +82,9 @@ module.exports = {
         } else {
             var duelstitle = "<a:check_a:1087808632172847134> This player meets the Duels requirements."
         }
-        
+
         try {
+            const guildCheck = await fetch(guildAPI + uuid)
             const tag_formatted = guildCheck.data.tag_formatted
             const guildTag2 = tag_formatted.replace(/&[0-9a-fk-or]/g, "")
             var guildTag = " " + guildTag2
@@ -94,8 +95,8 @@ module.exports = {
         await interaction.editReply({
             embeds: [{
                 title: rank + stats.data.username + guildTag,
-                description: "**Network Level:** `" + stats.data.level.toString() + "`\n" + 
-                "**Current Guild:** `" + guildName + "`",
+                description: "**Network Level:** `" + stats.data.level.toString() + "`\n" +
+                    "**Current Guild:** `" + guildName + "`",
                 color: embedColor,
                 thumbnail: {
                     url: head
@@ -108,20 +109,20 @@ module.exports = {
                     {
                         name: bwtitle,
                         value: "**➺ Stars:** `" + stats.data.stats.BedWars.level.toString() + "`\n" +
-                        "**➺ FKDR:** `" + stats.data.stats.BedWars.final_k_d.toString() + "`\n" +
-                        "**➺ Wins:** `" + stats.data.stats.BedWars.wins.toString() + "`"
+                            "**➺ FKDR:** `" + stats.data.stats.BedWars.final_k_d.toString() + "`\n" +
+                            "**➺ Wins:** `" + stats.data.stats.BedWars.wins.toString() + "`"
                     },
                     {
                         name: swtitle,
                         value: "**➺ Stars:** `" + stats.data.stats.SkyWars.level.toFixed(2).toString() + "`\n" +
-                        "**➺ KDR:** `" + stats.data.stats.SkyWars.kill_death_ratio.toString() + "`\n" +
-                        "**➺ Wins:** `" + stats.data.stats.SkyWars.wins.toString() + "`"
+                            "**➺ KDR:** `" + stats.data.stats.SkyWars.kill_death_ratio.toString() + "`\n" +
+                            "**➺ Wins:** `" + stats.data.stats.SkyWars.wins.toString() + "`"
                     },
                     {
                         name: duelstitle,
-                        value: "**➺ Wins:** `" + stats.data.stats.Duels.general.wins.toString() + "`\n" + 
-                        "**➺ KDR:** `" + stats.data.stats.Duels.general.kd_ratio.toFixed(2).toString() + "`\n" + 
-                        "**➺ WLR:** `" + stats.data.stats.Duels.general.win_loss_ratio.toFixed(2).toString() + "`"
+                        value: "**➺ Wins:** `" + stats.data.stats.Duels.general.wins.toString() + "`\n" +
+                            "**➺ KDR:** `" + stats.data.stats.Duels.general.kd_ratio.toFixed(2).toString() + "`\n" +
+                            "**➺ WLR:** `" + stats.data.stats.Duels.general.win_loss_ratio.toFixed(2).toString() + "`"
                     }
                 ]
             }]