diff --git a/commands/forceverify.js b/commands/forceverify.js index c0e2b69..2e90bef 100644 --- a/commands/forceverify.js +++ b/commands/forceverify.js @@ -76,9 +76,37 @@ module.exports = { const userUUID = userCheck.data.id; const hypixelCheck = await fetch(slothPixel + userUUID); - const guildCheck = await fetch(guildAPI + userUUID); const head = minotar + ign; + try { + const guildCheck = await fetch(guildAPI + userUUID); + var responseGuildID = guildCheck.data.id; + } catch (err) { + var responseGuildID = null; + } + + if (responseGuildID !== hypixelGuildID) { + + await user.roles.add(defaultMember); + + await interaction.editReply({ + embeds: [{ + title: interaction.guild.name, + description: "You have successfully force verified `" + fullUsername + "` with the account `" + hypixelCheck.data.username + "`.", + color: embedColor, + thumbnail: { + url: head + }, + footer: { + icon_url: interaction.guild.iconURL(), + text: interaction.guild.name + " | Developed by Taken#0002" + } + }] + }); + return + } + + const guildCheck = await fetch(guildAPI + userUUID); const GuildMembers = await guildCheck.data.members; const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; diff --git a/commands/verify.js b/commands/verify.js index 48d326f..db5e7f5 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -67,23 +67,18 @@ module.exports = { const hypixelCheck = await fetch(slothPixel + userUUID); const head = minotar + ign; - - try { - await fetch(guildAPI + userUUID); - var responseGuildID = guildCheck.data.id; - } catch (err) { - var responseGuildID = null; - } - - const guildCheck = await fetch(guildAPI + userUUID); - const GuildMembers = await guildCheck.data.members; - const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; - if (hypixelCheck.data.links.DISCORD !== fullUsername) { interaction.editReply('Your Discord tag does not match your in-game tag.') return } + + try { + const guildCheck = await fetch(guildAPI + userUUID); + var responseGuildID = guildCheck.data.id; + } catch (err) { + var responseGuildID = null; + } if (responseGuildID !== hypixelGuildID) { @@ -106,6 +101,10 @@ module.exports = { return } + const guildCheck = await fetch(guildAPI + userUUID); + const GuildMembers = await guildCheck.data.members; + const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; + if (guildRank === "Guild Master" && responseGuildID === hypixelGuildID) { await user.roles.add(gm); await user.roles.add(guildRole)