illegitimate/illegitimate-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request illegitimate/illegitimate-bot!230
This commit is contained in:
Taken
2024-02-19 09:52:22 +00:00
parent d811fc98e5 c71386c18b
commit d84d38e453
8 changed files with 109 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/commands-contextmenu/updateuser.ts
View File

@@ -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!

3
src/commands/forceunverify.ts
View File

@@ -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: [{

20
src/commands/forceupdate.ts
View File

@@ -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!

3
src/commands/forceverify.ts
View File

@@ -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(),

18
src/commands/staff/updateall.ts
View File

@@ -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,8 +70,10 @@ 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 {
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"))
}
@@ -79,7 +81,6 @@ export default async function updateAll(interaction: ChatInputCommandInteraction
if (!guildMemberIDs.includes(memberData?.uuid || "none")) {
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"))
@@ -88,34 +89,31 @@ export default async function updateAll(interaction: ChatInputCommandInteraction
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
}
await gmember.member.setNickname(ign, "Updating all discord members").catch(() => {
// Do nothing
})
}
}

20
src/commands/update.ts
View File

@@ -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!

3
src/commands/verify.ts
View File

@@ -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(),

3
src/components/modals/verifyModal.ts
View File

@@ -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(),