diff --git a/commands/forceupdate.js b/commands/forceupdate.js index c3ead00..d77b27d 100644 --- a/commands/forceupdate.js +++ b/commands/forceupdate.js @@ -34,28 +34,10 @@ module.exports = { const roleManage = user1.roles; if (!verifyData) { - interaction.editReply('That user is not verified.') - 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 minotar = "https://minotar.net/helm/"; - - const userCheck = await fetch(mojangAPI + verifyData.uuid); - const hypixelCheck = await fetch(slothPixel + verifyData.uuid); - const guildCheck = await fetch(guildAPI + verifyData.uuid); - const head = minotar + userCheck.data.name; - - const embedColor = Number(color.replace("#", "0x")); - const GuildMembers = await guildCheck.data.members; - const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank; - - if (guildCheck.data.id !== hypixelGuildID) { - interaction.editReply({ + await interaction.editReply({ embeds: [{ - description: usermentioned + " was given the the Member role.", + description: usermentioned + " was given the the Default Member role.", color: embedColor, thumbnail: { url: head @@ -70,7 +52,46 @@ module.exports = { return } - if (guildRank === 'Guild Master') { + 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 minotar = "https://minotar.net/helm/"; + + const userCheck = await fetch(mojangAPI + verifyData.uuid); + const hypixelCheck = await fetch(slothPixel + verifyData.uuid); + const head = minotar + userCheck.data.name; + + try { + const guildCheck = await fetch(guildAPI + verifyData.uuid); + var responseGuildID = guildCheck.data.id; + } catch (err) { + var responseGuildID = null; + } + + if (responseGuildID !== hypixelGuildID) { + await interaction.editReply({ + embeds: [{ + description: usermentioned + " was given the the Default Member role.", + color: embedColor, + thumbnail: { + url: head + }, + footer: { + text: interaction.guild.name + " | Developed by @Taken#0002", + icon_url: interaction.guild.iconURL({ dynamic: true }) + } + }] + }) + await roleManage.add(defaultMember) + return + } + + const guildCheck = await fetch(guildAPI + verifyData.uuid); + const embedColor = Number(color.replace("#", "0x")); + const GuildMembers = await guildCheck.data.members; + const guildRank = GuildMembers.find(member => member.uuid === verifyData.uuid).rank; + + if (guildRank === 'Guild Master' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { await roleManage.remove(removeThese[i]) @@ -82,7 +103,7 @@ module.exports = { await roleManage.add(defaultMember) - interaction.editReply({ + await interaction.editReply({ embeds: [{ description: usermentioned + "'s rank has been updated to `Guild Master`", color: embedColor, @@ -97,7 +118,7 @@ module.exports = { }) } - if (guildRank === 'Manager') { + if (guildRank === 'Manager' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { await roleManage.remove(removeThese[i]) @@ -109,7 +130,7 @@ module.exports = { await roleManage.add(defaultMember) - interaction.editReply({ + await interaction.editReply({ embeds: [{ description: usermentioned + "'s rank has been updated to `Manager`", color: embedColor, @@ -124,7 +145,7 @@ module.exports = { }) } - if (guildRank === 'Moderator') { + if (guildRank === 'Moderator' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { await roleManage.remove(removeThese[i]) @@ -136,7 +157,7 @@ module.exports = { await roleManage.add(defaultMember) - interaction.editReply({ + await interaction.editReply({ embeds: [{ description: usermentioned + "'s rank has been updated to `Moderator`", color: embedColor, @@ -152,7 +173,7 @@ module.exports = { } - if (guildRank === 'Beast') { + if (guildRank === 'Beast' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { await roleManage.remove(removeThese[i]) @@ -163,7 +184,7 @@ module.exports = { await roleManage.add(defaultMember) - interaction.editReply({ + await interaction.editReply({ embeds: [{ description: usermentioned + "'s rank has been updated to `Beast`.", color: embedColor, @@ -179,7 +200,7 @@ module.exports = { return } - if (guildRank === 'Member') { + if (guildRank === 'Member' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { await roleManage.remove(removeThese[i]) @@ -190,7 +211,7 @@ module.exports = { await roleManage.add(defaultMember) - interaction.editReply({ + await interaction.editReply({ embeds: [{ description: usermentioned + "'s rank has been updated to `Member`.", color: embedColor, @@ -206,7 +227,7 @@ module.exports = { return } - if (guildRank === 'Trial Member') { + if (guildRank === 'Trial Member' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { await roleManage.remove(removeThese[i]) @@ -218,7 +239,7 @@ module.exports = { await roleManage.add(defaultMember) - interaction.editReply({ + await interaction.editReply({ embeds: [{ description: usermentioned + "'s rank has been updated to `Trial Member`.", color: embedColor,