Merge branch 'dev' into 'main'

Updated commands to not use trial member

See merge request illegitimate/illegitimate-bot!117
This commit is contained in:
2023-12-02 11:24:26 +00:00
7 changed files with 12 additions and 81 deletions

View File

@@ -1,8 +1,8 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
const { color, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
const { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const removeThese = [gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember]
const { gm, manager, moderator, beast, member, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const removeThese = [gm, manager, moderator, beast, member, guildRole, guildStaff, defaultMember]
module.exports = {
name: "forceunverify",

View File

@@ -1,9 +1,9 @@
const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
const { getGuild, getHeadURL, getIGN } = require("../utils/utils.js")
const { hypixelGuildID, color, devMessage } = require("../../config/options.json")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const verify = require("../schemas/verifySchema.js")
const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
const removeThese = [gm, manager, moderator, beast, elite, member, guildRole, guildStaff]
module.exports = {
name: "forceupdate",
@@ -252,33 +252,6 @@ module.exports = {
})
return
}
if (guildRank === "Trial Member") {
for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Force Update)")
}
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({
embeds: [{
description: usermentioned + "'s rank has been updated to `Trial Member`.",
color: embedColor,
thumbnail: {
url: head
},
footer: {
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
})
return
}
}
}
}

View File

@@ -3,7 +3,7 @@ const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js"
const { color, hypixelGuildID, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
const { mongoose } = require("mongoose")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
module.exports = {
@@ -136,11 +136,6 @@ module.exports = {
await user.roles.add(member, "User was force verified by " + modName)
await user.roles.add(guildRole, "User was force verified by " + modName)
}
if (guildRank === "Trial Member") {
await user.roles.add(trialmember, "User was force verified by " + modName)
await user.roles.add(guildRole, "User was force verified by " + modName)
}
}
await user.roles.add(defaultMember, "User was force verified by " + modName)

View File

@@ -2,14 +2,14 @@ const { SlashCommandBuilder } = require("discord.js")
const { getGuild, getIGN, getHeadURL } = require("../utils/utils.js")
const verify = require("../schemas/verifySchema.js")
const { color, hypixelGuildID, devMessage } = require("../../config/options.json")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
const { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const removeThese = [gm, manager, moderator, beast, elite, member, guildRole, guildStaff]
module.exports = {
name: "update",
description: "Update your guild rank.",
type: "slash",
dev: false,
dev: true,
public: true,
data: new SlashCommandBuilder()
@@ -244,33 +244,6 @@ module.exports = {
})
return
}
if (guildRank === "Trial Member") {
for (let i = 0; i < removeThese.length; i++) {
await roleManage.remove(removeThese[i], "Auto role removal. (Update)")
}
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({
embeds: [{
description: "Your rank has been updated to `Trial Member`.",
color: embedColor,
thumbnail: {
url: head
},
footer: {
text: interaction.guild.name + " | " + devMessage,
icon_url: interaction.guild.iconURL({ dynamic: true })
}
}]
})
return
}
}
}
}

View File

@@ -3,7 +3,7 @@ const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js"
const { color, hypixelGuildID, devMessage } = require("../../config/options.json")
const verify = require("../schemas/verifySchema.js")
const mongoose = require("mongoose")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
const { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
module.exports = {
name: "verify",
@@ -148,11 +148,6 @@ module.exports = {
await user.roles.add(member, "Verification")
await user.roles.add(guildRole, "Verification")
}
if (guildRank === "Trial Member" && guildID === hypixelGuildID) {
await user.roles.add(trialmember, "Verification")
await user.roles.add(guildRole, "Verification")
}
}
await user.roles.add(defaultMember, "Verification")

View File

@@ -1,9 +1,9 @@
const { ButtonBuilder, ActionRowBuilder, ButtonStyle, EmbedBuilder } = require("discord.js")
const { gm, manager, moderator, beast, member, trialmember, guildStaff, guildRole } = require("../../../config/roles.json")
const { gm, manager, moderator, beast, member, guildStaff, guildRole } = require("../../../config/roles.json")
const { ignM, smallM, largeM } = require("../../../config/limitmessages.json")
const { ia1, ia2, ia3, ria1, ria2, ria3 } = require("../../../config/questions.json")
const { color, inactivityLogChannel } = require("../../../config/options.json")
const guildRoles = [gm, manager, moderator, beast, member, trialmember, guildStaff, guildRole]
const guildRoles = [gm, manager, moderator, beast, member, guildStaff, guildRole]
module.exports = {
name: "guildinactivitylog",

View File

@@ -3,7 +3,7 @@ const { getUUID, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.
const { color, hypixelGuildID, devMessage } = require("../../../config/options.json")
const verify = require("../../schemas/verifySchema.js")
const mongoose = require("mongoose")
const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../../config/roles.json")
const { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } = require("../../../config/roles.json")
module.exports = {
name: "verifybox",
@@ -128,11 +128,6 @@ module.exports = {
await user.roles.add(guildRole, "Verification")
}
if (guildRank === "Trial Member" && guildID === hypixelGuildID) {
await user.roles.add(trialmember, "Verification")
await user.roles.add(guildRole, "Verification")
}
await user.roles.add(defaultMember, "Verification")
const newVerify = new verify({