From 323eab233e013b9b45ee08ccb08ef7402e05a44e Mon Sep 17 00:00:00 2001 From: Taken Date: Sat, 2 Dec 2023 12:23:19 +0100 Subject: [PATCH] Updated commands to not use trial member --- src/commands/forceunverify.js | 4 +-- src/commands/forceupdate.js | 31 ++-------------------- src/commands/forceverify.js | 7 +---- src/commands/update.js | 33 +++--------------------- src/commands/verify.js | 7 +---- src/events/buttons/guildinactivitylog.js | 4 +-- src/events/modals/verifyModal.js | 7 +---- 7 files changed, 12 insertions(+), 81 deletions(-) diff --git a/src/commands/forceunverify.js b/src/commands/forceunverify.js index 896de0c..1f892c9 100644 --- a/src/commands/forceunverify.js +++ b/src/commands/forceunverify.js @@ -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", diff --git a/src/commands/forceupdate.js b/src/commands/forceupdate.js index 5f17c3f..8fb3068 100644 --- a/src/commands/forceupdate.js +++ b/src/commands/forceupdate.js @@ -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 - } } } } diff --git a/src/commands/forceverify.js b/src/commands/forceverify.js index 1510ba2..1a3188e 100644 --- a/src/commands/forceverify.js +++ b/src/commands/forceverify.js @@ -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) diff --git a/src/commands/update.js b/src/commands/update.js index 22b9f89..a6affd1 100644 --- a/src/commands/update.js +++ b/src/commands/update.js @@ -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 - } } } } diff --git a/src/commands/verify.js b/src/commands/verify.js index e10fbca..68fc0eb 100644 --- a/src/commands/verify.js +++ b/src/commands/verify.js @@ -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") diff --git a/src/events/buttons/guildinactivitylog.js b/src/events/buttons/guildinactivitylog.js index ac9311c..69874d5 100644 --- a/src/events/buttons/guildinactivitylog.js +++ b/src/events/buttons/guildinactivitylog.js @@ -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", diff --git a/src/events/modals/verifyModal.js b/src/events/modals/verifyModal.js index 72b08fa..9289865 100644 --- a/src/events/modals/verifyModal.js +++ b/src/events/modals/verifyModal.js @@ -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({