Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!230

src/commands-contextmenu/updateuser.ts

@@ -69,10 +69,17 @@ export = {
             const roles = roleManage("default")
             await user.roles.remove(roles.rolesToRemove, "User was force updated.")
             await user.roles.add(roles.rolesToAdd, "User was force updated.")
+            await user.setNickname(ign, "User was force updated.").catch(() => {
+                // Do nothing
+            })
 
             await interaction.editReply({
                 embeds: [{
-                    description: usermentioned + " was given the the Default Member role.",
+                    description: `
+                    ${usermentioned} was given the \`Default Member\` role.
+
+                    IGN: \`${ign}\`
+                    `,
                     color: embedColor,
                     thumbnail: {
                         url: head!
@@ -135,13 +142,22 @@ export = {
                 replyRank = "Member"
             }
 
+            // FIXME: check if user is on waiting list
             if (user.roles.cache.has(waitingListRole)) {
                 await user.roles.remove(waitingListRole, "User was force updated.")
             }
 
+            await user.setNickname(ign, "User was force updated.").catch(() => {
+                // Do nothing
+            })
+
             await interaction.editReply({
                 embeds: [{
-                    description: usermentioned + " was given the " + replyRank + " role.",
+                    description: `
+                    ${usermentioned} was given the \`${replyRank}\` role.
+                    
+                    IGN: \`${ign}\`
+                    `,
                     color: embedColor,
                     thumbnail: {
                         url: head!

src/commands/forceunverify.ts

@@ -45,6 +45,9 @@ export = {
             roleManage("all").rolesToRemove,
             "User force unverified by " + interaction.user.username
         )
+        await member.setNickname(null, "User force unverified by " + interaction.user.username).catch(() => {
+            // Do nothing
+        })
 
         await logToChannel("mod", {
             embeds: [{

src/commands/forceupdate.ts

@@ -75,10 +75,17 @@ export = {
             const roles = roleManage("default")
             await user.roles.remove(roles.rolesToRemove, "User was force updated.")
             await user.roles.add(roles.rolesToAdd, "User was force updated.")
+            await user.setNickname(ign, "User was force updated.").catch(() => {
+                // Do nothing
+            })
 
             await interaction.editReply({
                 embeds: [{
-                    description: usermentioned + " was given the the Default Member role.",
+                    description: `
+                    ${usermentioned} was given the \`Default Member\` role.
+
+                    IGN: \`${ign}\`
+                    `,
                     color: embedColor,
                     thumbnail: {
                         url: head!
@@ -141,13 +148,22 @@ export = {
                 replyRank = "Member"
             }
 
+            // FIXME: need to check if user is on waiting list
             if (user.roles.cache.has(waitingListRole)) {
                 await user.roles.remove(waitingListRole, "User was force updated.")
             }
 
+            await user.setNickname(ign, "User was force updated.").catch(() => {
+                // Do nothing
+            })
+
             await interaction.editReply({
                 embeds: [{
-                    description: usermentioned + " was given the the " + replyRank + " role.",
+                    description: `
+                    ${usermentioned} was given the \`${replyRank}\` role.
+                    
+                    IGN: \`${ign}\`
+                    `,
                     color: embedColor,
                     thumbnail: {
                         url: head!

src/commands/forceverify.ts

@@ -155,6 +155,9 @@ export = {
         }
 
         await user.roles.add(roleManage("default").rolesToAdd, "User was force verified by " + modName)
+        await user.setNickname(player.displayname!, "User was force verified by " + modName).catch(() => {
+            // Do nothing
+        })
 
         const newVerify = new verify({
             _id: new mongoose.Types.ObjectId(),

src/commands/staff/updateall.ts

@@ -5,7 +5,7 @@ import { verifyTick } from "config/roles"
 import roleManage from "utils/functions/rolesmanage"
 import { ChatInputCommandInteraction, GuildMember } from "discord.js"
 import env from "utils/Env"
-import { getGuild } from "utils/Hypixel"
+import { getGuild, getIGN } from "utils/Hypixel"
 import { IGuildData } from "interfaces"
 
 export default async function updateAll(interaction: ChatInputCommandInteraction): Promise<void> {
@@ -70,52 +70,50 @@ export default async function updateAll(interaction: ChatInputCommandInteraction
         if (!memberData) {
             const rolesToremove = roleManage("default").rolesToRemove
             await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
-            continue
         } else {
-            await gmember.member.roles.add(verifyTick, "Updating all discord members")
+            const uuid = memberData.uuid
-            console.log(color(" Added verified tick to " + gmember.member.user.username, "lavender"))
+            const ign = await getIGN(uuid)
-        }
+            if (!gmember.member.roles.cache.has(verifyTick)) {
-
+                await gmember.member.roles.add(verifyTick, "Updating all discord members")
-        if (!guildMemberIDs.includes(memberData?.uuid || "none")) {
+                console.log(color(" Added verified tick to " + gmember.member.user.username, "lavender"))
-            const rolesToremove = roleManage("default").rolesToRemove
-            await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
-            continue
-        } else if (guildMemberIDs.includes(memberData!.uuid)) {
-            const guildMemberRank = hypixelGuildMembers.find(gmember => gmember.uuid === memberData!.uuid)!.rank
-            console.log(color(" Updating roles for " + gmember.member.user.username, "lavender"))
-
-            if (guildMemberRank === "Guild Master") {
-                const rolesmanage = roleManage("gm")
-                gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
-                gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
-                continue
-            } else if (guildMemberRank === "Manager") {
-                const rolesmanage = roleManage("manager")
-                gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
-                gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
-                continue
-            } else if (guildMemberRank === "Moderator") {
-                const rolesmanage = roleManage("moderator")
-                gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
-                gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
-                continue
-            } else if (guildMemberRank === "Beast") {
-                const rolesmanage = roleManage("beast")
-                gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
-                gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
-                continue
-            } else if (guildMemberRank === "Elite") {
-                const rolesmanage = roleManage("elite")
-                gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
-                gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
-                continue
-            } else if (guildMemberRank === "Member") {
-                const rolesmanage = roleManage("member")
-                gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
-                gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
-                continue
             }
-            continue
+
+            if (!guildMemberIDs.includes(memberData?.uuid || "none")) {
+                const rolesToremove = roleManage("default").rolesToRemove
+                await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
+            } else if (guildMemberIDs.includes(memberData!.uuid)) {
+                const guildMemberRank = hypixelGuildMembers.find(gmember => gmember.uuid === memberData!.uuid)!.rank
+                console.log(color(" Updating roles for " + gmember.member.user.username, "lavender"))
+
+                if (guildMemberRank === "Guild Master") {
+                    const rolesmanage = roleManage("gm")
+                    gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
+                    gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
+                } else if (guildMemberRank === "Manager") {
+                    const rolesmanage = roleManage("manager")
+                    gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
+                    gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
+                } else if (guildMemberRank === "Moderator") {
+                    const rolesmanage = roleManage("moderator")
+                    gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
+                    gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
+                } else if (guildMemberRank === "Beast") {
+                    const rolesmanage = roleManage("beast")
+                    gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
+                    gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
+                } else if (guildMemberRank === "Elite") {
+                    const rolesmanage = roleManage("elite")
+                    gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
+                    gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
+                } else if (guildMemberRank === "Member") {
+                    const rolesmanage = roleManage("member")
+                    gmember.member.roles.remove(rolesmanage.rolesToRemove, "Updating all discord members")
+                    gmember.member.roles.add(rolesmanage.rolesToAdd, "Updating all discord members")
+                }
+            }
+            await gmember.member.setNickname(ign, "Updating all discord members").catch(() => {
+                // Do nothing
+            })
         }
     }
 

src/commands/update.ts

@@ -58,10 +58,17 @@ export = {
             const roles = roleManage("default")
             await user.roles.remove(roles.rolesToRemove, "User used the update command")
             await user.roles.add(roles.rolesToAdd, "User used the update command")
+            await user.setNickname(ign, "User used the update command").catch(() => {
+                // Do nothing
+            })
 
             await interaction.editReply({
                 embeds: [{
-                    description: "Updated your roles to `Default Member`",
+                    description: `
+                    Updated your roles to \`Default Member\`
+                    
+                    IGN: \`${ign}\`
+                    `,
                     color: embedColor,
                     thumbnail: {
                         url: head!
@@ -124,13 +131,22 @@ export = {
                 replyRank = "Member"
             }
 
+            // FIXME: need to check if user is on waiting list
             if (user.roles.cache.has(waitingListRole)) {
                 await user.roles.remove(waitingListRole, "User used the update command")
             }
 
+            await user.setNickname(ign, "Verification").catch(() => {
+                // Do nothing
+            })
+
             await interaction.editReply({
                 embeds: [{
-                    description: "Updated your roles to `" + replyRank + "`",
+                    description: `
+                    Updated your roles to \`${replyRank}\`
+
+                    IGN: \`${ign}\`
+                    `,
                     color: embedColor,
                     thumbnail: {
                         url: head!

src/commands/verify.ts

@@ -174,6 +174,9 @@ export = {
         }
 
         await user.roles.add(roleManage("default").rolesToAdd, "Verification")
+        await user.setNickname(player.displayname!, "Verification").catch(() => {
+            // Do nothing
+        })
 
         const newVerify = new verify({
             _id: new mongoose.Types.ObjectId(),

src/components/modals/verifyModal.ts

@@ -120,6 +120,9 @@ export = {
             }
 
             await user.roles.add(defaultMember, "Verification")
+            await user.setNickname(player.displayname!, "Verification").catch(() => {
+                // Do nothing
+            })
 
             const newVerify = new verify({
                 _id: new mongoose.Types.ObjectId(),