From 083ab32eb57014d1eb33ea074b778708d08eee83 Mon Sep 17 00:00:00 2001 From: Taken Date: Tue, 28 Mar 2023 17:19:25 +0200 Subject: [PATCH] Fixed update and verify --- commands/update.js | 19 +++++++++---------- commands/verify.js | 39 +++++++++++++++++++++++++-------------- deploy-commands.js | 3 +-- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/commands/update.js b/commands/update.js index f790cd4..ec73775 100644 --- a/commands/update.js +++ b/commands/update.js @@ -23,8 +23,7 @@ module.exports = { const user1 = interaction.user; const user = interaction.guild.members.cache.get(user1.id); const verifyData = await verify.findOne({ userID: user.id }) - const memberRoles = interaction.member.roles.cache; - const roleManage = interaction.member.roles; + const roleManage = user.roles; if (!verifyData) { interaction.reply('You are not verified.') @@ -39,10 +38,10 @@ module.exports = { const userCheck = await fetch(mojangAPI + verifyData.uuid); const hypixelCheck = await fetch(slothPixel + verifyData.uuid); const guildCheck = await fetch(guildAPI + verifyData.uuid); - const head = minotar + hypixelCheck.data.username; + const head = minotar + userCheck.data.name; const embedColor = Number(color.replace("#", "0x")); - const GuildMembers = await guildCheck.data.members; + const GuildMembers = guildCheck.data.members; const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank; if (guildCheck.data.id !== hypixelGuildID) { @@ -69,7 +68,7 @@ module.exports = { await roleManage.add(gm) await roleManage.add(defaultMember) - await verify.findOneAndUpdate({ userID: user.id }) + interaction.editReply({ embeds: [{ description: "Your rank has been updated to `Guild Master`", @@ -92,7 +91,7 @@ module.exports = { await roleManage.add(manager) await roleManage.add(defaultMember) - await verify.findOneAndUpdate({ userID: user.id }) + interaction.editReply({ embeds: [{ description: "Your rank has been updated to `Manager`", @@ -115,7 +114,7 @@ module.exports = { await roleManage.add(moderator) await roleManage.add(defaultMember) - await verify.findOneAndUpdate({ userID: user.id }) + interaction.editReply({ embeds: [{ description: "Your rank has been updated to `Moderator`", @@ -138,7 +137,7 @@ module.exports = { await roleManage.add(beast) await roleManage.add(defaultMember) - await verify.findOneAndUpdate({ userID: user.id }) + interaction.editReply({ embeds: [{ description: "Your rank has been updated to `Beast`.", @@ -161,7 +160,7 @@ module.exports = { await roleManage.add(member) await roleManage.add(defaultMember) - await verify.findOneAndUpdate({ userID: user.id }) + interaction.editReply({ embeds: [{ description: "Your rank has been updated to `Member`.", @@ -184,7 +183,7 @@ module.exports = { await roleManage.add(trialmember) await roleManage.add(defaultMember) - await verify.findOneAndUpdate({ userID: user.id }) + interaction.editReply({ embeds: [{ description: "Your rank has been updated to `Trial Member`.", diff --git a/commands/verify.js b/commands/verify.js index 3305d2c..ab3ce99 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -36,6 +36,25 @@ module.exports = { const minotar = "https://minotar.net/helm/"; const embedColor = Number(color.replace("#", "0x")); + if (!ign) { + interaction.editReply('Please provide a player\'s IGN.') + return + } + + try { + await fetch(mojang + ign); + } catch (err) { + interaction.editReply('That player doesn\'t exist. [Mojang]') + return + } + + try { + await fetch(slothPixel + ign); + } catch (err) { + interaction.editReply('That player doesn\'t exist. [Hypixel]') + return + } + const userCheck = await fetch(mojang + ign); const userUUID = userCheck.data.id; @@ -46,20 +65,6 @@ module.exports = { const GuildMembers = await guildCheck.data.members; const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; - if (!ign) { - interaction.editReply('Please provide a player\'s IGN.') - return - } - - if (!userUUID) { - interaction.editReply('That player doesn\'t exist. [Mojang]') - return - } - - if (!hypixelCheck.data.uuid) { - interaction.editReply('That player doesn\'t exist. [Hypixel]') - return - } if (hypixelCheck.data.links.DISCORD !== fullUsername) { interaction.editReply('Your Discord tag does not match your in-game tag.') @@ -74,34 +79,40 @@ module.exports = { } if (guildRank === "Guild Master" && guildCheck.data.id === hypixelGuildID) { + await user.roles.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) await user.roles.add(gm); await user.roles.add(guildRole) await user.roles.add(guildStaff) } if (guildRank === "Manager" && guildCheck.data.id === hypixelGuildID) { + await user.roles.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) await user.roles.add(manager); await user.roles.add(guildRole) await user.roles.add(guildStaff) } if (guildRank === "Moderator" && guildCheck.data.id === hypixelGuildID) { + await user.roles.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) await user.roles.add(moderator); await user.roles.add(guildRole) await user.roles.add(guildStaff) } if (guildRank === "Beast" && guildCheck.data.id === hypixelGuildID) { + await user.roles.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) await user.roles.add(beast); await user.roles.add(guildRole) } if (guildRank === "Member" && guildCheck.data.id === hypixelGuildID) { + await user.roles.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) await user.roles.add(member); await user.roles.add(guildRole) } if (guildRank === "Trial Member" && guildCheck.data.id === hypixelGuildID) { + await user.roles.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) await user.roles.add(trialmember); await user.roles.add(guildRole) } diff --git a/deploy-commands.js b/deploy-commands.js index a79741e..0d3bbea 100644 --- a/deploy-commands.js +++ b/deploy-commands.js @@ -1,8 +1,7 @@ const { REST, Routes } = require('discord.js'); -const { clientId, realguildId, testguildId, token } = require('./config.json'); +const { clientId, guildId, token } = require('./config.json'); const fs = require('node:fs'); -const guildId = realguildId; const commands = []; // Grab all the command files from the commands directory you created earlier