Merge branch 'dev' into 'main'
Dev See merge request illegitimate/illegitimate-bot!251
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
import verify from "schemas/verifyTag"
|
import verify from "schemas/verifyTag"
|
||||||
import { embedColor, hypixelGuildID } from "config/options"
|
import { embedColor, hypixelGuildID } from "config/options"
|
||||||
import color from "utils/functions/colors"
|
import color from "utils/functions/colors"
|
||||||
import { verifyTick } from "config/roles"
|
|
||||||
import roleManage from "utils/functions/rolesmanage"
|
import roleManage from "utils/functions/rolesmanage"
|
||||||
import { ChatInputCommandInteraction, GuildMember } from "discord.js"
|
import { ChatInputCommandInteraction, GuildMember } from "discord.js"
|
||||||
import env from "utils/Env"
|
import env from "utils/Env"
|
||||||
@@ -60,25 +59,25 @@ export default async function updateAll(interaction: ChatInputCommandInteraction
|
|||||||
|
|
||||||
if (!memberData) {
|
if (!memberData) {
|
||||||
if (gmember.member.user.bot) {
|
if (gmember.member.user.bot) {
|
||||||
console.log(color(" Skipped bot", "lavender"))
|
console.log(color(` Skipped bot [${gmember.member.user.username}]`, "lavender"))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
const rolesToremove = roleManage("default").rolesToRemove
|
const roles = roleManage("defaultnoverify")
|
||||||
await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
|
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(() => {
|
await gmember.member.setNickname(`${gmember.member.user.username} (X)`, "Updating all discord members").catch(() => {
|
||||||
// Do nothing
|
// Do nothing
|
||||||
})
|
})
|
||||||
|
console.log(color(`${gmember.member.user.username} [X]`, "lavender"))
|
||||||
} else {
|
} else {
|
||||||
const uuid = memberData.uuid
|
const uuid = memberData.uuid
|
||||||
const ign = await getIGN(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")) {
|
if (!guildMemberIDs.includes(memberData?.uuid)) {
|
||||||
const rolesToremove = roleManage("default").rolesToRemove
|
const roles = roleManage("default")
|
||||||
await gmember.member.roles.remove(rolesToremove, "Updating all discord members")
|
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)) {
|
} else if (guildMemberIDs.includes(memberData!.uuid)) {
|
||||||
const guildMemberRank = hypixelGuildMembers.find(gmember => gmember.uuid === memberData!.uuid)!.rank
|
const guildMemberRank = hypixelGuildMembers.find(gmember => gmember.uuid === memberData!.uuid)!.rank
|
||||||
console.log(color(" Updating roles for " + gmember.member.user.username, "lavender"))
|
console.log(color(" Updating roles for " + gmember.member.user.username, "lavender"))
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ type RoleType =
|
|||||||
| "elite"
|
| "elite"
|
||||||
| "member"
|
| "member"
|
||||||
| "default"
|
| "default"
|
||||||
|
| "defaultnoverify"
|
||||||
| "all"
|
| "all"
|
||||||
|
|
||||||
export default function roleManage(role: RoleType): { rolesToRemove: string[], rolesToAdd: string[] } {
|
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 }
|
return { rolesToRemove, rolesToAdd }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (role === "defaultnoverify") {
|
||||||
|
const rolesToRemove = roles
|
||||||
|
const rolesToAdd = [defaultMember]
|
||||||
|
return { rolesToRemove, rolesToAdd }
|
||||||
|
}
|
||||||
|
|
||||||
if (role === "all") {
|
if (role === "all") {
|
||||||
const rolesToRemove = roles
|
const rolesToRemove = roles
|
||||||
rolesToRemove.push(verifyTick)
|
rolesToRemove.push(verifyTick)
|
||||||
|
|||||||
Reference in New Issue
Block a user