From 28e8bb1523a6e43f1cb49e6c3a67b5d0712e8444 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Wed, 17 Apr 2024 23:50:59 +0200
Subject: [PATCH] Fixed update all command

---
 src/commands/staff/updateall.ts    | 21 ++++++++++-----------
 src/utils/functions/rolesmanage.ts |  7 +++++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/commands/staff/updateall.ts b/src/commands/staff/updateall.ts
index d9b4e72..c8d7bf6 100644
--- a/src/commands/staff/updateall.ts
+++ b/src/commands/staff/updateall.ts
@@ -1,7 +1,6 @@
 import verify from "schemas/verifyTag"
 import { embedColor, hypixelGuildID } from "config/options"
 import color from "utils/functions/colors"
-import { verifyTick } from "config/roles"
 import roleManage from "utils/functions/rolesmanage"
 import { ChatInputCommandInteraction, GuildMember } from "discord.js"
 import env from "utils/Env"
@@ -60,25 +59,25 @@ export default async function updateAll(interaction: ChatInputCommandInteraction
 
         if (!memberData) {
             if (gmember.member.user.bot) {
-                console.log(color(" Skipped bot", "lavender"))
+                console.log(color(` Skipped bot [${gmember.member.user.username}]`, "lavender"))
                 continue
             }
-            const rolesToremove = roleManage("default").rolesToRemove
-            await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
+            const roles = roleManage("defaultnoverify")
+            await gmember.member.roles.remove(roles.rolesToRemove, "Updating all discord members")
+            await gmember.member.roles.add(roles.rolesToAdd, "Updating all discord members")
             await gmember.member.setNickname(`${gmember.member.user.username} (X)`, "Updating all discord members").catch(() => {
                 // Do nothing
             })
+            console.log(color(`${gmember.member.user.username} [X]`, "lavender"))
         } else {
             const uuid = memberData.uuid
             const ign = await getIGN(uuid)
-            if (!gmember.member.roles.cache.has(verifyTick)) {
-                await gmember.member.roles.add(verifyTick, "Updating all discord members")
-                console.log(color(" Added verified tick to " + gmember.member.user.username, "lavender"))
-            }
 
-            if (!guildMemberIDs.includes(memberData?.uuid || "none")) {
-                const rolesToremove = roleManage("default").rolesToRemove
-                await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
+            if (!guildMemberIDs.includes(memberData?.uuid)) {
+                const roles = roleManage("default")
+                await gmember.member.roles.remove(roles.rolesToRemove, "Updating all discord members")
+                await gmember.member.roles.add(roles.rolesToAdd, "Updating all discord members")
+                console.log(color(`${gmember.member.user.username} [Default]`, "lavender"))
             } 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"))
diff --git a/src/utils/functions/rolesmanage.ts b/src/utils/functions/rolesmanage.ts
index 15fb4bf..8fefddb 100644
--- a/src/utils/functions/rolesmanage.ts
+++ b/src/utils/functions/rolesmanage.ts
@@ -29,6 +29,7 @@ type RoleType =
     | "elite"
     | "member"
     | "default"
+    | "defaultnoverify"
     | "all"
 
 export default function roleManage(role: RoleType): { rolesToRemove: string[], rolesToAdd: string[] } {
@@ -74,6 +75,12 @@ export default function roleManage(role: RoleType): { rolesToRemove: string[], r
         return { rolesToRemove, rolesToAdd }
     }
 
+    if (role === "defaultnoverify") {
+        const rolesToRemove = roles
+        const rolesToAdd = [defaultMember]
+        return { rolesToRemove, rolesToAdd }
+    }
+
     if (role === "all") {
         const rolesToRemove = roles
         rolesToRemove.push(verifyTick)