From 6ac142f16e85fc3d5171ca626b318358a3d70be0 Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 13 Aug 2023 00:20:53 +0200 Subject: [PATCH] Moving forceverify to hypixel api Verify formating changes --- commands/forceverify.js | 87 +++++++++++++++++++++++------------------ commands/verify.js | 72 +++++++++++++++++----------------- 2 files changed, 85 insertions(+), 74 deletions(-) diff --git a/commands/forceverify.js b/commands/forceverify.js index 4354457..6ec021d 100644 --- a/commands/forceverify.js +++ b/commands/forceverify.js @@ -86,10 +86,21 @@ module.exports = { const player = hypixelApi + "?key=" + hypixelApiKey + "&uuid=" + userUUID const guild = guildApi + "?key=" + hypixelApiKey + "&player=" + userUUID + const head = minotar + ign; const hypixelCheck = await fetch(player); + + if (!hypixelCheck.data.player) { + interaction.editReply({ + embeds: [{ + description: " That player hasn't played Hypixel before.", + color: embedColor + }] + }); + return; + } + const guildCheck = await fetch(guild) - const head = minotar + ign; if (!guildCheck.data.guild) { var responseGuildID = null @@ -97,48 +108,48 @@ module.exports = { var responseGuildID = guildCheck.data.guild._id } - const GuildMembers = guildCheck.data.guild.members; - const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.player.uuid).rank; - if (responseGuildID === hypixelGuildID) { - if (guildRank === "Guild Master") { - await user.roles.add(gm, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + const GuildMembers = guildCheck.data.guild.members; + const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.player.uuid).rank; - if (guildRank === "Manager") { - await user.roles.add(manager, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + if (guildRank === "Guild Master") { + await user.roles.add(gm, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Moderator") { - await user.roles.add(moderator, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - await user.roles.add(guildStaff, "User was force verified by " + modName) - } + if (guildRank === "Manager") { + await user.roles.add(manager, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Beast") { - await user.roles.add(beast, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Moderator") { + await user.roles.add(moderator, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + await user.roles.add(guildStaff, "User was force verified by " + modName) + } - if (guildRank === "Elite") { - await user.roles.add(elite, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Beast") { + await user.roles.add(beast, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Member") { - await user.roles.add(member, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } + if (guildRank === "Elite") { + await user.roles.add(elite, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } - if (guildRank === "Trial Member") { - await user.roles.add(trialmember, "User was force verified by " + modName); - await user.roles.add(guildRole, "User was force verified by " + modName) - } - } + if (guildRank === "Member") { + await user.roles.add(member, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } + + if (guildRank === "Trial Member") { + await user.roles.add(trialmember, "User was force verified by " + modName); + await user.roles.add(guildRole, "User was force verified by " + modName) + } + } await user.roles.add(defaultMember, "User was force verified by " + modName); @@ -153,7 +164,7 @@ module.exports = { await interaction.editReply({ embeds: [{ title: interaction.guild.name, - description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.displayName + "`.", + description: "You have successfully force verified `" + username + "` with the account `" + hypixelCheck.data.player.displayname + "`.", color: embedColor, thumbnail: { url: head @@ -166,4 +177,4 @@ module.exports = { }); } -}; +}; \ No newline at end of file diff --git a/commands/verify.js b/commands/verify.js index 2c4292e..f776511 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -121,48 +121,48 @@ module.exports = { var guildID = guildCheck.data.guild._id } - if (guildID === hypixelGuildID) { - const GuildMembers = guildCheck.data.guild.members - const guildRank = GuildMembers.find((member) => member.uuid === stats.data.player.uuid).rank; + if (guildID === hypixelGuildID) { + const GuildMembers = guildCheck.data.guild.members + const guildRank = GuildMembers.find((member) => member.uuid === stats.data.player.uuid).rank; - if (guildRank === "Guild Master" && guildID === hypixelGuildID) { - await user.roles.add(gm, "Verification"); - await user.roles.add(guildRole, "Verification"); - await user.roles.add(guildStaff, "Verification"); - } + if (guildRank === "Guild Master" && guildID === hypixelGuildID) { + await user.roles.add(gm, "Verification"); + await user.roles.add(guildRole, "Verification"); + await user.roles.add(guildStaff, "Verification"); + } - if (guildRank === "Manager" && guildID === hypixelGuildID) { - await user.roles.add(manager, "Verification"); - await user.roles.add(guildRole, "Verification"); - await user.roles.add(guildStaff, "Verification"); - } + if (guildRank === "Manager" && guildID === hypixelGuildID) { + await user.roles.add(manager, "Verification"); + await user.roles.add(guildRole, "Verification"); + await user.roles.add(guildStaff, "Verification"); + } - if (guildRank === "Moderator" && guildID === hypixelGuildID) { - await user.roles.add(moderator, "Verification"); - await user.roles.add(guildRole, "Verification"); - await user.roles.add(guildStaff, "Verification"); - } + if (guildRank === "Moderator" && guildID === hypixelGuildID) { + await user.roles.add(moderator, "Verification"); + await user.roles.add(guildRole, "Verification"); + await user.roles.add(guildStaff, "Verification"); + } - if (guildRank === "Beast" && guildID === hypixelGuildID) { - await user.roles.add(beast, "Verification"); - await user.roles.add(guildRole, "Verification"); - } + if (guildRank === "Beast" && guildID === hypixelGuildID) { + await user.roles.add(beast, "Verification"); + await user.roles.add(guildRole, "Verification"); + } - if (guildRank === "Elite" && guildID === hypixelGuildID) { - await user.roles.add(elite, "Verification"); - await user.roles.add(guildRole, "Verification"); - } + if (guildRank === "Elite" && guildID === hypixelGuildID) { + await user.roles.add(elite, "Verification"); + await user.roles.add(guildRole, "Verification"); + } - if (guildRank === "Member" && guildID === hypixelGuildID) { - await user.roles.add(member, "Verification"); - await user.roles.add(guildRole, "Verification"); - } + if (guildRank === "Member" && guildID === hypixelGuildID) { + await user.roles.add(member, "Verification"); + await user.roles.add(guildRole, "Verification"); + } - if (guildRank === "Trial Member" && guildID === hypixelGuildID) { - await user.roles.add(trialmember, "Verification"); - await user.roles.add(guildRole, "Verification"); - } - } + if (guildRank === "Trial Member" && guildID === hypixelGuildID) { + await user.roles.add(trialmember, "Verification"); + await user.roles.add(guildRole, "Verification"); + } + } await user.roles.add(defaultMember, "Verification"); @@ -191,4 +191,4 @@ module.exports = { ] }); } -}; +}; \ No newline at end of file