From d9ccf78c4760e4a8d0e1cb482f59f679332a69df Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 12:34:27 +0100 Subject: [PATCH 1/6] Removed unused imports and cleaned up --- commands/devel.js | 59 ----------------------------- events/buttons/guildapply.js | 9 ++--- events/buttons/staffapply.js | 13 ++----- events/buttons/verify.js | 1 - events/buttons/waitingListUpdate.js | 10 ++--- events/modals/denyreasonbox.js | 3 -- events/modals/staffdenyreasonbox.js | 3 -- events/ready/sendOnlineMessage.js | 1 - 8 files changed, 10 insertions(+), 89 deletions(-) diff --git a/commands/devel.js b/commands/devel.js index 7c28ed5..6f6a2a1 100644 --- a/commands/devel.js +++ b/commands/devel.js @@ -1,9 +1,4 @@ const { SlashCommandBuilder, PermissionFlagsBits, userMention, EmbedBuilder, ChannelType } = require('discord.js'); -const { hypixelGuildID, color } = require('../config/options.json'); -const { muted } = require('../config/roles.json'); -const verify = require('../schemas/verifySchema.js'); -const dev = process.env.DEV; -const fetch = require('axios'); module.exports = { name: 'admin', @@ -37,10 +32,6 @@ module.exports = { async execute(interaction) { const subcommand = interaction.options.getSubcommand(); - const user = interaction.user; - const userMentioned = userMention(user.id); - const guild = interaction.guild; - const embedColor = Number(color.replace("#", "0x")); if (subcommand === 'reload') { @@ -54,55 +45,5 @@ module.exports = { }) } - if (subcommand === 'listallverified') { - - const verifiedUsers = await verify.find() - const mojang = "https://api.mojang.com/user/profile/" - - let embed = new EmbedBuilder() - .setTitle(guild.name) - .setColor(embedColor) - .setDescription('List of all verified users') - - for (let i = 0; i < verifiedUsers.length; i++) { - - const user = verifiedUsers[i]; - - const userCheck = await fetch(mojang + user.uuid); - const ign = userCheck.data.name; - - const mentionedUser = userMention(user.userID); - - embed.addFields({ - name: "**IGN:** " + ign, - value: "**Discord:** " + mentionedUser - }) - - } - - await interaction.reply({ - embeds: [embed] - }) - } - - if (subcommand === 'purgereactions') { - - const count = interaction.options.getInteger('count'); - await interaction.deferReply({}) - - if (user.id !== dev) { - interaction.editReply({ content: 'Due to you not screwing something up this command is restricted to only ' + userMentioned, ephemeral: true }) - return - } - - const messages = await interaction.channel.messages.fetch({ limit: count }); - - messages.forEach(async (message) => { - await message.reactions.removeAll(); - }) - - await interaction.editReply(`Purged reactions from ${count} message(s).`) - - } } }; diff --git a/events/buttons/guildapply.js b/events/buttons/guildapply.js index 8b91bab..22b9633 100644 --- a/events/buttons/guildapply.js +++ b/events/buttons/guildapply.js @@ -5,9 +5,9 @@ const { applicationsChannel } = require('../../config/options.json'); const { qu1, qu2, qu3, qu4, qu5, qu6, qu7, qu8 } = require('../../config/questions.json'); const { rq1, rq2, rq3, rq4, rq5, rq6, rq7, rq8 } = require('../../config/questions.json'); const { guildRole } = require('../../config/roles.json') +const { getUUID } = require('../../utils/utils.js') const mongoose = require('mongoose'); const guildapp = require('../../schemas/guildAppSchema.js'); -const fetch = require('axios'); module.exports = { name: 'guildapply', @@ -127,9 +127,8 @@ module.exports = { }) return } - try { - var userCheck = await fetch(mojangAPI + answer1.first().content); - } catch (error) { + const uuid = await getUUID(answer1.first().content) + if (!uuid) { await user.send({ embeds: [{ description: "That is not a valid Minecraft username.\n" + @@ -441,8 +440,6 @@ module.exports = { }] }) - const uuid = userCheck.data.id - const newGuildApp = new guildapp({ _id: new mongoose.Types.ObjectId(), userID: user.id, diff --git a/events/buttons/staffapply.js b/events/buttons/staffapply.js index a7bac0d..c2aaa97 100644 --- a/events/buttons/staffapply.js +++ b/events/buttons/staffapply.js @@ -1,6 +1,6 @@ const { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder } = require('discord.js'); const { color } = require('../../config/options.json'); -const { largeM, smallM, ignM } = require('../../config/limitmessages.json') +const { largeM, ignM } = require('../../config/limitmessages.json') const { staffApplicationsChannel } = require('../../config/options.json'); const { sq1, sq2, sq3, sq4, sq5, sq6 } = require('../../config/questions.json'); const { rsq1, rsq2, rsq3, rsq4, rsq5, rsq6 } = require('../../config/questions.json'); @@ -8,7 +8,7 @@ const { guildRole, guildStaff } = require('../../config/roles.json') const mongoose = require('mongoose'); const staffapp = require('../../schemas/staffAppSchema.js'); const settings = require("../../schemas/settingsSchema.js"); -const fetch = require('axios'); +const { getUUID } = require('../../utils/utils.js') module.exports = { name: 'staffapply', @@ -23,7 +23,6 @@ module.exports = { const guild = interaction.guild; const embedColor = Number(color.replace("#", "0x")); const userRoles = interaction.member.roles.cache; - const mojangAPI = "https://api.mojang.com/users/profiles/minecraft/" const setting = await settings.findOne({ name: "staffAppStatus" }) const status = setting.value; @@ -137,9 +136,8 @@ module.exports = { }) return } - try { - await fetch(mojangAPI + answer1.first().content) - } catch (error) { + const uuid = await getUUID(answer1.first().content) + if (!uuid) { await user.send({ embeds: [{ description: "That is not a valid Minecraft username.\n" + @@ -375,9 +373,6 @@ module.exports = { }] }) - const userCheck = await fetch(mojangAPI + answer1_1) - const uuid = userCheck.data.id - const newStaffApp = new staffapp({ _id: new mongoose.Types.ObjectId(), userID: user.id, diff --git a/events/buttons/verify.js b/events/buttons/verify.js index b9fc2ad..bc99bdd 100644 --- a/events/buttons/verify.js +++ b/events/buttons/verify.js @@ -1,5 +1,4 @@ const { ModalBuilder, ActionRowBuilder, TextInputBuilder, TextInputStyle } = require('discord.js') -const { color } = require('../../config/options.json') module.exports = { name: 'verify', diff --git a/events/buttons/waitingListUpdate.js b/events/buttons/waitingListUpdate.js index d0d348f..516097e 100644 --- a/events/buttons/waitingListUpdate.js +++ b/events/buttons/waitingListUpdate.js @@ -1,8 +1,6 @@ -const mongoose = require('mongoose'); const waitinglist = require('../../schemas/waitinglistSchema.js'); -const key = process.env.HYPIXELAPIKEY; +const { getGuild } = require('../../utils/utils.js'); const { hypixelGuildID } = require("../../config/options.json") -const fetch = require("axios"); module.exports = { name: 'waitinglistupdate', @@ -19,15 +17,13 @@ module.exports = { const message = interaction.message; const embed = message.embeds[0]; const accepted = await waitinglist.find() - const guildAPI = "https://api.hypixel.net/guild" - const guild = guildAPI + "?key=" + key + "&player=" for (let i = 0; i < accepted.length; i++) { const uuid = accepted[i].uuid - const check = await fetch(guild + uuid) + const guild = await getGuild(uuid) - if (check.data.guild && check.data.guild._id === hypixelGuildID) { + if (guild && guild._id === hypixelGuildID) { await waitinglist.findOneAndDelete({ uuid: uuid }) continue } diff --git a/events/modals/denyreasonbox.js b/events/modals/denyreasonbox.js index 3e94385..27236c3 100644 --- a/events/modals/denyreasonbox.js +++ b/events/modals/denyreasonbox.js @@ -1,9 +1,6 @@ const { InteractionType, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); const { color } = require('../../config/options.json'); -const mongoose = require('mongoose'); const guildapp = require('../../schemas/guildAppSchema.js'); -const fs = require('fs'); -const path = require('path'); module.exports = { name: 'denyreasonbox', diff --git a/events/modals/staffdenyreasonbox.js b/events/modals/staffdenyreasonbox.js index 3670172..19e0d21 100644 --- a/events/modals/staffdenyreasonbox.js +++ b/events/modals/staffdenyreasonbox.js @@ -1,9 +1,6 @@ const { InteractionType, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); const { color } = require('../../config/options.json'); -const mongoose = require('mongoose'); const staffapp = require('../../schemas/staffAppSchema.js'); -const fs = require('fs'); -const path = require('path'); module.exports = { name: 'staffdenyreasonbox', diff --git a/events/ready/sendOnlineMessage.js b/events/ready/sendOnlineMessage.js index 352fafe..3a2ee9c 100644 --- a/events/ready/sendOnlineMessage.js +++ b/events/ready/sendOnlineMessage.js @@ -1,4 +1,3 @@ -const { Events } = require('discord.js'); const { botLogChannel, color } = require('../../config/options.json'); module.exports = { From 296af431f0a32ed7160c042dc2ae064c8856e29f Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 12:38:42 +0100 Subject: [PATCH 2/6] Fixed remove command --- commands/remove.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/commands/remove.js b/commands/remove.js index 56bc671..6e72ac6 100644 --- a/commands/remove.js +++ b/commands/remove.js @@ -28,15 +28,18 @@ module.exports = { /** @param { import('discord.js').ChatInputCommandInteraction } interaction */ async execute(interaction) { + + interaction.deferReply() + const user = interaction.options.getUser('user'); - const reason = interaction.options.getString('reason') || "No reason provided." + const reason = interaction.options.getString('reason') ?? "No reason provided." const mod = interaction.user - const color = Number(color.replace('#', '0x')) + const embedColor = Number(color.replace('#', '0x')) const waitinglist = await waitinglistSchema.findOne({ UserID: user.id }) if (!waitinglist) { - await interaction.reply({ + await interaction.editReply({ embeds: [{ description: userMention(user.id) + " is not on the waiting list.", color: color @@ -47,10 +50,12 @@ module.exports = { await waitinglistSchema.findOneAndDelete({ UserID: user.id }) - await interaction.reply({ + await interaction.editReply({ embeds: [{ - description: userMention(user.id) + " has been removed from the waiting list.", - color: color + description: userMention(user.id) + " has been removed from the waiting list.\n" + + "**Reason:** `" + reason + "`\n" + + "**Moderator:** " + userMention(mod.id), + color: embedColor, }] }) } From b300f598b6846384a98722d424369690904dd6c1 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 13:17:23 +0100 Subject: [PATCH 3/6] Removed unused import --- events/buttons/guildapplicationdeny.js | 1 - 1 file changed, 1 deletion(-) diff --git a/events/buttons/guildapplicationdeny.js b/events/buttons/guildapplicationdeny.js index 6e0079a..99ad2b1 100644 --- a/events/buttons/guildapplicationdeny.js +++ b/events/buttons/guildapplicationdeny.js @@ -1,5 +1,4 @@ const { ModalBuilder, ActionRowBuilder, TextInputBuilder, TextInputStyle } = require('discord.js'); -const { color } = require('../../config/options.json'); module.exports = { name: 'guildapplicationdeny', From f6e4191cf90ac626f16fdfe2079a9d64e1f703b0 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 17:37:57 +0100 Subject: [PATCH 4/6] Updated guild and staff apply to use new format --- config/questions.json | 108 ++++++++++++++++++++++++----------- events/buttons/guildapply.js | 47 ++++++++------- events/buttons/staffapply.js | 45 +++++++++------ 3 files changed, 128 insertions(+), 72 deletions(-) diff --git a/config/questions.json b/config/questions.json index b9fd3bc..ed0bddf 100644 --- a/config/questions.json +++ b/config/questions.json @@ -1,36 +1,76 @@ { - "qu1": "What is your IGN?", - "qu2": "What is your hypixel Network Level?", - "qu3": "What stats are you submitting? (ex. BW lv 135 or SW lv 12 etc..)? Please provide us your best stats of the gamemode you main the most.", - "qu4": "Which talents make you a good member for Illegitimate? Tell us about your accomplishments, hobbies and ambitions both on Hypixel and in real life.", - "qu5": "Will you be able to make from 100k to 150k gexp x week?", - "qu6": "Tell us about: your age, what you expect to gain from Illegitimate, whether you play on other accounts; if you often will be inactive; your punishment history; etc… This section is all yours and we expect a longer answer.", - "qu7": "How did you find about us? (Yt, advertisement in lobbies, friend..)", - "qu8": "What is your time zone? (Example: GMT+1)", - "rq1": "What is your IGN?", - "rq2": "What is your hypixel Network Level?", - "rq3": "What stats are you submitting?", - "rq4": "Which talents make you a good member for Illegitimate?", - "rq5": "Will you be able to make from 100k to 150k gexp x week?", - "rq6": "Tell us about yourself.", - "rq7": "How did you find about us?", - "rq8": "What is your time zone?", - "sq1": "What is your IGN?", - "sq2": "How long have you been in the guild for?", - "sq3": "Have you been guild muted for any reason? (This includes mutes for staff disrespect, arguing with guild members, toxicity...)", - "sq4": "Are you an active guild member? (Keep in mind we will surely check your GEXP)", - "sq5": "Do you have any experience as a staff member (guild moderator) at all?", - "sq6": "Why should we choose you as a Guild Moderator? (Tell us what would you do for the guild, how are you gonna help us grow the community, how many hours per day are you willing to spend doing the stuff as moderator for the guild etc..", - "rsq1": "What is your IGN?", - "rsq2": "How long have you been in the guild for?", - "rsq3": "Have you been guild muted for any reason?", - "rsq4": "Are you an active guild member?", - "rsq5": "Do you have any experience as a staff member (guild moderator) at all?", - "rsq6": "Why should we choose you as a Guild Moderator?", - "ia1": "What is your IGN?", - "ia2": "Duration of the absence?", - "ia3": "Reason of the absence?", - "ria1": "What is your IGN?", - "ria2": "Duration of the absence?", - "ria3": "Reason of the absence?" + "guild": [ + { + "q": "What is your IGN?", + "r": "What is your IGN?" + }, + { + "q": "What is your hypixel Network Level?", + "r": "What is your hypixel Network Level?" + }, + { + "q": "What stats are you submitting? (ex. BW lv 135 or SW lv 12 etc..)? Please provide us your best stats of the gamemode you main the most.", + "r": "What stats are you submitting?" + }, + { + "q": "Which talents make you a good member for Illegitimate? Tell us about your accomplishments, hobbies and ambitions both on Hypixel and in real life.", + "r": "Which talents make you a good member for Illegitimate?" + }, + { + "q": "Will you be able to make from 100k to 150k gexp x week?", + "r": "Will you be able to make from 100k to 150k gexp x week?" + }, + { + "q": "Tell us about: your age, what you expect to gain from Illegitimate, whether you play on other accounts; if you often will be inactive; your punishment history; etc… This section is all yours and we expect a longer answer.", + "r": "Tell us about yourself." + }, + { + "q": "How did you find about us? (Yt, advertisement in lobbies, friend..)", + "r": "How did you find about us?" + }, + { + "q": "What is your time zone? (Example: GMT+1)", + "r": "What is your time zone?" + } + ], + "staff": [ + { + "q": "What is your IGN?", + "r": "What is your IGN?" + }, + { + "q": "How long have you been in the guild for?", + "r": "How long have you been in the guild for?" + }, + { + "q": "Have you been guild muted for any reason? (This includes mutes for staff disrespect, arguing with guild members, toxicity...)", + "r": "Have you been guild muted for any reason?" + }, + { + "q": "Are you an active guild member? (Keep in mind we will surely check your GEXP)", + "r": "Are you an active guild member?" + }, + { + "q": "Do you have any experience as a staff member (guild moderator) at all?", + "r": "Do you have any experience as a staff member (guild moderator) at all?" + }, + { + "q": "Why should we choose you as a Guild Moderator? (Tell us what would you do for the guild, how are you gonna help us grow the community, how many hours per day are you willing to spend doing the stuff as moderator for the guild etc..", + "r": "Why should we choose you as a Guild Moderator?" + } + ], + "inactivity": [ + { + "q": "What is your IGN?", + "r": "What is your IGN?" + }, + { + "q": "Duration of the absence?", + "r": "Duration of the absence?" + }, + { + "q": "Reason of the absence?", + "r": "Reason of the absence?" + } + ] } diff --git a/events/buttons/guildapply.js b/events/buttons/guildapply.js index 22b9633..ce256ed 100644 --- a/events/buttons/guildapply.js +++ b/events/buttons/guildapply.js @@ -2,8 +2,7 @@ const { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder } = require(' const { color } = require('../../config/options.json'); const { largeM, smallM, ignM } = require('../../config/limitmessages.json') const { applicationsChannel } = require('../../config/options.json'); -const { qu1, qu2, qu3, qu4, qu5, qu6, qu7, qu8 } = require('../../config/questions.json'); -const { rq1, rq2, rq3, rq4, rq5, rq6, rq7, rq8 } = require('../../config/questions.json'); +const questions = require('../../config/questions.json'); const { guildRole } = require('../../config/roles.json') const { getUUID } = require('../../utils/utils.js') const mongoose = require('mongoose'); @@ -21,10 +20,16 @@ module.exports = { const user = interaction.user; const guild = interaction.guild; const embedColor = Number(color.replace("#", "0x")); - - const mojangAPI = "https://api.mojang.com/users/profiles/minecraft/" - const userRoles = guild.members.cache.get(user.id).roles.cache.map(role => role.id); + const guildQuestions = questions.guild + + function qu(n) { + return guildQuestions[n - 1].q + } + + function rq(n) { + return guildQuestions[n - 1].r + } if (interaction.customId === 'guildapply') { @@ -94,7 +99,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 1**", - description: qu1 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + ignM + "`", + description: qu(1) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + ignM + "`", color: embedColor, footer: { text: "You have 5 minutes to respond to this message." @@ -144,7 +149,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 2**", - description: qu2 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n" + "`(8 characters max)`", + description: qu(2) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n" + "`(8 characters max)`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -183,7 +188,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 3**", - description: qu3 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + smallM + "`", + description: qu(3) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + smallM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -221,7 +226,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 4**", - description: qu4 + "\n\nPlease type your answer below or type `cancel` to cancel your application." + + description: qu(4) + "\n\nPlease type your answer below or type `cancel` to cancel your application." + " `(We expect a longer answer.)`\n`" + largeM + "`", color: embedColor, footer: { @@ -260,7 +265,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 5**", - description: qu5 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + smallM + "`", + description: qu(5) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + smallM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -298,7 +303,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 6**", - description: qu6 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", + description: qu(6) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -336,7 +341,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 7**", - description: qu7 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + smallM + "`", + description: qu(7) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + smallM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -374,7 +379,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 8**", - description: qu8 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n" + "`(64 characters max)`", + description: qu(8) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n" + "`(64 characters max)`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -458,35 +463,35 @@ module.exports = { }, fields: [ { - name: rq1, + name: rq(1), value: "```" + answer1_1 + "```" }, { - name: rq2, + name: rq(2), value: "```" + answer2_1 + "```" }, { - name: rq3, + name: rq(3), value: "```" + answer3_1 + "```" }, { - name: rq4, + name: rq(4), value: "```" + answer4_1 + "```" }, { - name: rq5, + name: rq(5), value: "```" + answer5_1 + "```" }, { - name: rq6, + name: rq(6), value: "```" + answer6_1 + "```" }, { - name: rq7, + name: rq(7), value: "```" + answer7_1 + "```" }, { - name: rq8, + name: rq(8), value: "```" + answer8_1 + "```" } ], diff --git a/events/buttons/staffapply.js b/events/buttons/staffapply.js index c2aaa97..9a8db18 100644 --- a/events/buttons/staffapply.js +++ b/events/buttons/staffapply.js @@ -2,13 +2,13 @@ const { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder } = require(' const { color } = require('../../config/options.json'); const { largeM, ignM } = require('../../config/limitmessages.json') const { staffApplicationsChannel } = require('../../config/options.json'); -const { sq1, sq2, sq3, sq4, sq5, sq6 } = require('../../config/questions.json'); -const { rsq1, rsq2, rsq3, rsq4, rsq5, rsq6 } = require('../../config/questions.json'); +const questions = require('../../config/questions.json'); const { guildRole, guildStaff } = require('../../config/roles.json') const mongoose = require('mongoose'); const staffapp = require('../../schemas/staffAppSchema.js'); const settings = require("../../schemas/settingsSchema.js"); const { getUUID } = require('../../utils/utils.js') +const dev = process.env.DEV module.exports = { name: 'staffapply', @@ -25,14 +25,25 @@ module.exports = { const userRoles = interaction.member.roles.cache; const setting = await settings.findOne({ name: "staffAppStatus" }) const status = setting.value; + const staffQuestions = questions.staff + + function sq(n) { + return staffQuestions[n - 1].q + } + + function rq(n) { + return staffQuestions[n - 1].r + } if (interaction.customId === "staffapply") { await interaction.deferReply({ ephemeral: true }); - if (status === "0") { - await interaction.editReply({ content: "Staff applications are currently closed.", ephemeral: true }); - return + if (user.id !== dev) { + if (status === "0") { + await interaction.editReply({ content: "Staff applications are currently closed.", ephemeral: true }); + return + } } if (!userRoles.has(guildRole)) { @@ -103,7 +114,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 1**", - description: sq1 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + ignM + "`", + description: sq(1) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + ignM + "`", color: embedColor, footer: { text: "You have 5 minutes to respond to this message." @@ -153,7 +164,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 2**", - description: sq2 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n" + "`(64 characters max)`", + description: sq(2) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n" + "`(64 characters max)`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -192,7 +203,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 3**", - description: sq3 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", + description: sq(3) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -230,7 +241,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 4**", - description: sq4 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", + description: sq(4) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -268,7 +279,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 5**", - description: sq5 + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", + description: sq(5) + "\n\nPlease type your answer below or type `cancel` to cancel your application.\n`" + largeM + "`", color: embedColor, footer: { text: "You have 15 minutes to respond to this message." @@ -306,7 +317,7 @@ module.exports = { await user.send({ embeds: [{ title: "**Question 6**", - description: sq6 + "\n\nPlease type your answer below or type `cancel` to cancel your application." + + description: sq(6) + "\n\nPlease type your answer below or type `cancel` to cancel your application." + "`(We expect a longer answer here)`\n`" + largeM + "`", color: embedColor, footer: { @@ -393,27 +404,27 @@ module.exports = { }, fields: [ { - name: rsq1, + name: rq(1), value: "```" + answer1_1 + "```" }, { - name: rsq2, + name: rq(2), value: "```" + answer2_1 + "```" }, { - name: rsq3, + name: rq(3), value: "```" + answer3_1 + "```" }, { - name: rsq4, + name: rq(4), value: "```" + answer4_1 + "```" }, { - name: rsq5, + name: rq(5), value: "```" + answer5_1 + "```" }, { - name: rsq6, + name: rq(6), value: "```" + answer6_1 + "```" } From 83f03d31d6623af9baa4a74c394ebc1c424a3360 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 17:47:38 +0100 Subject: [PATCH 5/6] Added dev flag --- commands/forceunverify.js | 1 + 1 file changed, 1 insertion(+) diff --git a/commands/forceunverify.js b/commands/forceunverify.js index 8f65dd3..6426991 100644 --- a/commands/forceunverify.js +++ b/commands/forceunverify.js @@ -8,6 +8,7 @@ module.exports = { name: "forceunverify", description: "Force unverify a user", type: 'slash', + dev: true, data: new SlashCommandBuilder() .setName('forceunverify') From 58d2626b0781842bd950c31b35f166562d1af0dd Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 20 Nov 2023 17:52:44 +0100 Subject: [PATCH 6/6] Commit Signed-off-by: Taken --- .gitlab-ci.yml => gitlab-ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitlab-ci.yml => gitlab-ci.yml (100%) diff --git a/.gitlab-ci.yml b/gitlab-ci.yml similarity index 100% rename from .gitlab-ci.yml rename to gitlab-ci.yml