From a7bd4138e67e62dab1b67177b554563f33a7791e Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Tue, 21 Mar 2023 19:28:39 +0100
Subject: [PATCH] Added nicer output

---
 commands/check.js            | 28 ++++++++++++++++++++++++++--
 events/buttons/checkstats.js | 27 ++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/commands/check.js b/commands/check.js
index 4c87f80..ad124b4 100644
--- a/commands/check.js
+++ b/commands/check.js
@@ -45,8 +45,14 @@ module.exports = {
         const userCheck = await fetch(mojang + ign);
         const userUUID = userCheck.data.id;
 
+        try {
+            await fetch(slothPixel + userUUID);
+        } catch (error) {
+            interaction.editReply('That player doesn\'t exist. [Hypixel]')
+            return
+        }
+
         const stats = await fetch(slothPixel + userUUID);
-        const guildCheck = guildAPI + userUUID
         const head = minotar + ign;
 
         if (!stats.data.uuid) {
@@ -54,6 +60,15 @@ module.exports = {
             return
         }
 
+        const rank_formatted = stats.data.rank_formatted
+        const rank2 = rank_formatted.replace(/&[0-9a-fk-or]/g, "")
+
+        if (rank2 === "") {
+            var rank = ""
+        } else {
+            var rank = rank2 + " "
+        }
+
         try {
             const guildCheck = await fetch(guildAPI + userUUID);
             var guildName = guildCheck.data.name
@@ -85,9 +100,18 @@ module.exports = {
             var duelstitle = "This player meets the Duels requirements."
         }
 
+        try {
+            const guildCheck = await fetch(guildAPI + userUUID);
+            const tag_formatted = guildCheck.data.tag_formatted
+            const guildTag2 = tag_formatted.replace(/&[0-9a-fk-or]/g, "")
+            var guildTag = " " + guildTag2
+        } catch (error) {
+            var guildTag = ""
+        }
+
         await interaction.editReply({
             embeds: [{
-                title: stats.data.username,
+                title: rank + stats.data.username + guildTag,
                 description: "**Network Level:** `" + stats.data.level.toString() + "`\n" + 
                 "**Current Guild:** `" + guildName + "`",
                 color: embedColor,
diff --git a/events/buttons/checkstats.js b/events/buttons/checkstats.js
index d87b077..5e80d4b 100644
--- a/events/buttons/checkstats.js
+++ b/events/buttons/checkstats.js
@@ -32,9 +32,25 @@ module.exports = {
         const userCheck = await fetch(mojang + uuid);
         const ign = userCheck.data.name;
 
+        try {
+            await fetch(slothPixel + uuid);
+        } catch (error) {
+            interaction.editReply('That player doesn\'t exist. [Hypixel]')
+            return
+        }
+
         const stats = await fetch(slothPixel + uuid);
         const head = minotar + ign;
 
+        const rank_formatted = stats.data.rank_formatted
+        const rank2 = rank_formatted.replace(/&[0-9a-fk-or]/g, "")
+
+        if (rank2 === "") {
+            var rank = ""
+        } else {
+            var rank = rank2 + " "
+        }
+
         try {
             const guildCheck = await fetch(guildAPI + uuid);
             var guildName = guildCheck.data.name
@@ -65,10 +81,19 @@ module.exports = {
         } else {
             var duelstitle = "This player meets the Duels requirements."
         }
+        
+        try {
+            const guildCheck = await fetch(guildAPI + userUUID);
+            const tag_formatted = guildCheck.data.tag_formatted
+            const guildTag2 = tag_formatted.replace(/&[0-9a-fk-or]/g, "")
+            var guildTag = " " + guildTag2
+        } catch (error) {
+            var guildTag = ""
+        }
 
         await interaction.editReply({
             embeds: [{
-                title: stats.data.username,
+                title: rank + stats.data.username + guildTag,
                 description: "**Network Level:** `" + stats.data.level.toString() + "`\n" + 
                 "**Current Guild:** `" + guildName + "`",
                 color: embedColor,