Moved update command to use hypixel api

commands/update.js

@@ -5,7 +5,6 @@ const fetch = require('axios');
 const verify = require('../schemas/verifySchema.js')
 const { color, hypixelGuildID } = require('../config/options.json');
 const { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json');
-
 const removeThese = [gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff];
 
 module.exports = {
@@ -14,9 +13,9 @@ module.exports = {
     type: 'slash',
 
     data: new SlashCommandBuilder()
-        .setName('update')
+    .setName('update')
-        .setDescription('Update your guild rank.')
+    .setDescription('Update your guild rank.')
-        .setDMPermission(false),
+    .setDMPermission(false),
 
     async execute(interaction) {
 
@@ -26,16 +25,12 @@ module.exports = {
         const user = interaction.guild.members.cache.get(user1.id);
         const verifyData = await verify.findOne({ userID: user.id })
         const roleManage = user.roles;
+        const embedColor = Number(color.replace("#", "0x"));
 
         if (!verifyData) {
-            
-            for (let i = 0; i < removeThese.length; i++) {
-                await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
-            }
-
             await interaction.editReply({
                 embeds: [{
-                    description: "Updated your roles to `Default Member`",
+                    description: "You are not verified. Please run `/verify` to verify yourself",
                     color: embedColor,
                     thumbnail: {
                         url: head
@@ -49,22 +44,25 @@ module.exports = {
             return
         }
 
-        const slothPixel = "https://api.slothpixel.me/api/players/";
-        const guildAPI = "https://api.slothpixel.me/api/guilds/"
         const mojangAPI = "https://api.mojang.com/user/profile/"
+        const hypixel = "https://api.hypixel.net/player"
+        const guildAPI = "https://api.hypixel.net/guild"
         const minotar = "https://minotar.net/helm/";
+        const player = hypixel + "?key=" + hypixelApiKey + "&uuid=" + verifyData.uuid
 
         const userCheck = await fetch(mojangAPI + verifyData.uuid);
-        const hypixelCheck = await fetch(slothPixel + verifyData.uuid);
+        const head = minotar + userCheck.data.name;
 
-        try {
+        const guild = guildAPI + "?key=" + hypixelApiKey + "&player=" + verifyData.uuid
-            const guildCheck = await fetch(guildAPI + verifyData.uuid);
+        const guildCheck = await fetch(guild);
-            var responseGuildID = guildCheck.data.id;
+
-        } catch (err) {
+        if (!guildCheck.data.guild) {
-            var responseGuildID = null;
+            var guildID = null
+        } else {
+            var guildID = guildCheck.data.guild._id
         }
 
-        if (responseGuildID !== hypixelGuildID) {
+        if (guildID !== hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -88,14 +86,10 @@ module.exports = {
             return
         }
 
-        const guildCheck = await fetch(guildAPI + verifyData.uuid);
+        const GuildMembers = guildCheck.data.guild.members;
-        const head = minotar + userCheck.data.name;
-
-        const embedColor = Number(color.replace("#", "0x"));
-        const GuildMembers = guildCheck.data.members;
         const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank;
 
-        if (guildRank === 'Guild Master' && responseGuildID === hypixelGuildID) {
+        if (guildRank === 'Guild Master' && guildID === hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -122,7 +116,7 @@ module.exports = {
             })
         }
 
-        if (guildRank === 'Manager' && responseGuildID === hypixelGuildID) {
+        if (guildRank === 'Manager' && guildID === hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -149,7 +143,7 @@ module.exports = {
             })
         }
 
-        if (guildRank === 'Moderator' && responseGuildID === hypixelGuildID) {
+        if (guildRank === 'Moderator' && guildID === hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -177,7 +171,7 @@ module.exports = {
 
         }
 
-        if (guildRank === 'Beast' && responseGuildID === hypixelGuildID) {
+        if (guildRank === 'Beast' && guildID === hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -204,7 +198,7 @@ module.exports = {
             return
         }
 
-        if (guildRank === 'Member' && responseGuildID === hypixelGuildID) {
+        if (guildRank === 'Member' && guildID === hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
@@ -231,7 +225,7 @@ module.exports = {
             return
         }
 
-        if (guildRank === 'Trial Member' && responseGuildID === hypixelGuildID) {
+        if (guildRank === 'Trial Member' && guildID === hypixelGuildID) {
 
             for (let i = 0; i < removeThese.length; i++) {
                 await roleManage.remove(removeThese[i], "Auto role removal. (Update)")