diff --git a/commands/forceupdate.js b/commands/forceupdate.js index d77b27d..aaf1848 100644 --- a/commands/forceupdate.js +++ b/commands/forceupdate.js @@ -35,6 +35,10 @@ module.exports = { if (!verifyData) { + for (let i = 0; i < removeThese.length; i++) { + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") + } + await interaction.editReply({ embeds: [{ description: usermentioned + " was given the the Default Member role.", @@ -48,7 +52,7 @@ module.exports = { } }] }) - await roleManage.add(defaultMember) + await roleManage.add(defaultMember, "User was force updated.") return } @@ -69,6 +73,11 @@ module.exports = { } if (responseGuildID !== hypixelGuildID) { + + for (let i = 0; i < removeThese.length; i++) { + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") + } + await interaction.editReply({ embeds: [{ description: usermentioned + " was given the the Default Member role.", @@ -94,13 +103,13 @@ module.exports = { if (guildRank === 'Guild Master' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") } - await roleManage.add(guildRole) - await roleManage.add(guildStaff) - await roleManage.add(gm) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User was force updated.") + await roleManage.add(guildStaff, "User was force updated.") + await roleManage.add(gm, "User was force updated.") + await roleManage.add(defaultMember, "User was force updated.") await interaction.editReply({ @@ -121,13 +130,13 @@ module.exports = { if (guildRank === 'Manager' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") } - await roleManage.add(guildRole) - await roleManage.add(guildStaff) - await roleManage.add(manager) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User was force updated.") + await roleManage.add(guildStaff, "User was force updated.") + await roleManage.add(manager, "User was force updated.") + await roleManage.add(defaultMember, "User was force updated.") await interaction.editReply({ @@ -148,13 +157,13 @@ module.exports = { if (guildRank === 'Moderator' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") } - await roleManage.add(guildRole) - await roleManage.add(guildStaff) - await roleManage.add(moderator) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User was force updated.") + await roleManage.add(guildStaff, "User was force updated.") + await roleManage.add(moderator, "User was force updated.") + await roleManage.add(defaultMember, "User was force updated.") await interaction.editReply({ @@ -176,12 +185,12 @@ module.exports = { if (guildRank === 'Beast' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") } - await roleManage.add(guildRole) - await roleManage.add(beast) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User was force updated.") + await roleManage.add(beast, "User was force updated.") + await roleManage.add(defaultMember, "User was force updated.") await interaction.editReply({ @@ -203,12 +212,12 @@ module.exports = { if (guildRank === 'Member' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") } - await roleManage.add(guildRole) - await roleManage.add(member) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User was force updated.") + await roleManage.add(member, "User was force updated.") + await roleManage.add(defaultMember, "User was force updated.") await interaction.editReply({ @@ -230,13 +239,12 @@ module.exports = { if (guildRank === 'Trial Member' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)") } - await roleManage.remove(gm && manager && moderator && beast && member && trialmember && guildRole && guildStaff) - await roleManage.add(guildRole) - await roleManage.add(trialmember) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User was force updated.") + await roleManage.add(trialmember, "User was force updated.") + await roleManage.add(defaultMember, "User was force updated.") await interaction.editReply({ diff --git a/commands/forceverify.js b/commands/forceverify.js index 2e90bef..df626ae 100644 --- a/commands/forceverify.js +++ b/commands/forceverify.js @@ -34,6 +34,7 @@ module.exports = { const user = interaction.guild.members.cache.get(user1.id); const fullUsername = user1.username + "#" + user1.discriminator const ign = interaction.options.getString('ign'); + const mod = interaction.user.username + "#" + interaction.user.discriminator const mojang = "https://api.mojang.com/users/profiles/minecraft/" const slothPixel = "https://api.slothpixel.me/api/players/"; @@ -87,7 +88,7 @@ module.exports = { if (responseGuildID !== hypixelGuildID) { - await user.roles.add(defaultMember); + await user.roles.add(defaultMember, "User was force verified by " + mod); await interaction.editReply({ embeds: [{ @@ -111,39 +112,39 @@ module.exports = { const guildRank = GuildMembers.find(member => member.uuid === hypixelCheck.data.uuid).rank; if (guildRank === "Guild Master" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(gm); - await user.roles.add(guildRole) - await user.roles.add(guildStaff) + await user.roles.add(gm, "User was force verified by " + mod); + await user.roles.add(guildRole, "User was force verified by " + mod) + await user.roles.add(guildStaff, "User was force verified by " + mod) } if (guildRank === "Manager" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(manager); - await user.roles.add(guildRole) - await user.roles.add(guildStaff) + await user.roles.add(manager, "User was force verified by " + mod); + await user.roles.add(guildRole, "User was force verified by " + mod) + await user.roles.add(guildStaff, "User was force verified by " + mod) } if (guildRank === "Moderator" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(moderator); - await user.roles.add(guildRole) - await user.roles.add(guildStaff) + await user.roles.add(moderator, "User was force verified by " + mod); + await user.roles.add(guildRole, "User was force verified by " + mod) + await user.roles.add(guildStaff, "User was force verified by " + mod) } if (guildRank === "Beast" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(beast); - await user.roles.add(guildRole) + await user.roles.add(beast, "User was force verified by " + mod); + await user.roles.add(guildRole, "User was force verified by " + mod) } if (guildRank === "Member" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(member); - await user.roles.add(guildRole) + await user.roles.add(member, "User was force verified by " + mod); + await user.roles.add(guildRole, "User was force verified by " + mod) } if (guildRank === "Trial Member" && guildCheck.data.id === hypixelGuildID) { - await user.roles.add(trialmember); - await user.roles.add(guildRole) + await user.roles.add(trialmember, "User was force verified by " + mod); + await user.roles.add(guildRole, "User was force verified by " + mod) } - await user.roles.add(defaultMember); + await user.roles.add(defaultMember, "User was force verified by " + mod); const newVerify = new verify({ _id: new mongoose.Types.ObjectId(), diff --git a/commands/update.js b/commands/update.js index c2f2add..fa81aca 100644 --- a/commands/update.js +++ b/commands/update.js @@ -29,7 +29,7 @@ module.exports = { if (!verifyData) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } await interaction.editReply({ @@ -66,10 +66,10 @@ module.exports = { if (responseGuildID !== hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(defaultMember) + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ embeds: [{ @@ -97,13 +97,13 @@ module.exports = { if (guildRank === 'Guild Master' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(guildRole) - await roleManage.add(guildStaff) - await roleManage.add(gm) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User used the update command") + await roleManage.add(guildStaff, "User used the update command") + await roleManage.add(gm, "User used the update command") + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ @@ -124,13 +124,13 @@ module.exports = { if (guildRank === 'Manager' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(guildRole) - await roleManage.add(guildStaff) - await roleManage.add(manager) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User used the update command") + await roleManage.add(guildStaff, "User used the update command") + await roleManage.add(manager, "User used the update command") + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ @@ -151,13 +151,13 @@ module.exports = { if (guildRank === 'Moderator' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(guildRole) - await roleManage.add(guildStaff) - await roleManage.add(moderator) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User used the update command") + await roleManage.add(guildStaff, "User used the update command") + await roleManage.add(moderator, "User used the update command") + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ @@ -179,12 +179,12 @@ module.exports = { if (guildRank === 'Beast' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(guildRole) - await roleManage.add(beast) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User used the update command") + await roleManage.add(beast, "User used the update command") + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ @@ -206,12 +206,12 @@ module.exports = { if (guildRank === 'Member' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(guildRole) - await roleManage.add(member) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User used the update command") + await roleManage.add(member, "User used the update command") + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ @@ -233,12 +233,12 @@ module.exports = { if (guildRank === 'Trial Member' && responseGuildID === hypixelGuildID) { for (let i = 0; i < removeThese.length; i++) { - await roleManage.remove(removeThese[i]) + await roleManage.remove(removeThese[i], "Auto role removal. (Update)") } - await roleManage.add(guildRole) - await roleManage.add(trialmember) - await roleManage.add(defaultMember) + await roleManage.add(guildRole, "User used the update command") + await roleManage.add(trialmember, "User used the update command") + await roleManage.add(defaultMember, "User used the update command") await interaction.editReply({ diff --git a/commands/verify.js b/commands/verify.js index db5e7f5..8f17ace 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -82,7 +82,7 @@ module.exports = { if (responseGuildID !== hypixelGuildID) { - await user.roles.add(defaultMember) + await user.roles.add(defaultMember, "Verification") await interaction.editReply({ embeds: [{ @@ -106,39 +106,39 @@ module.exports = { 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) - await user.roles.add(guildStaff) + await user.roles.add(gm, "Verification"); + await user.roles.add(guildRole, "Verification") + await user.roles.add(guildStaff, "Verification") } if (guildRank === "Manager" && responseGuildID === hypixelGuildID) { - await user.roles.add(manager); - await user.roles.add(guildRole) - await user.roles.add(guildStaff) + await user.roles.add(manager, "Verification"); + await user.roles.add(guildRole, "Verification") + await user.roles.add(guildStaff, "Verification") } if (guildRank === "Moderator" && responseGuildID === hypixelGuildID) { - await user.roles.add(moderator); - await user.roles.add(guildRole) - await user.roles.add(guildStaff) + await user.roles.add(moderator, "Verification"); + await user.roles.add(guildRole, "Verification") + await user.roles.add(guildStaff, "Verification") } if (guildRank === "Beast" && responseGuildID === hypixelGuildID) { - await user.roles.add(beast); - await user.roles.add(guildRole) + await user.roles.add(beast, "Verification"); + await user.roles.add(guildRole, "Verification") } if (guildRank === "Member" && responseGuildID === hypixelGuildID) { - await user.roles.add(member); - await user.roles.add(guildRole) + await user.roles.add(member, "Verification"); + await user.roles.add(guildRole, "Verification") } if (guildRank === "Trial Member" && responseGuildID === hypixelGuildID) { - await user.roles.add(trialmember); - await user.roles.add(guildRole) + await user.roles.add(trialmember, "Verification"); + await user.roles.add(guildRole, "Verification") } - await user.roles.add(defaultMember) + await user.roles.add(defaultMember, "Verification") const newVerify = new verify({ _id: new mongoose.Types.ObjectId(),