From aab42367ef1dd9620f8e4f519314958646452f1f Mon Sep 17 00:00:00 2001 From: Taken Date: Fri, 10 Nov 2023 15:22:32 +0100 Subject: [PATCH 1/2] Removed useless variables --- .env.example | 1 - commands-testing/mute.js | 1 - commands/check.js | 1 - commands/devel.js | 1 - commands/forceupdate.js | 1 - commands/forceverify.js | 1 - commands/update.js | 1 - commands/verify.js | 1 - events/buttons/checkstats.js | 1 - events/buttons/waitingListUpdate.js | 1 - index.js | 2 +- 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.env.example b/.env.example index 2be76a1..6d5e6c3 100644 --- a/.env.example +++ b/.env.example @@ -6,4 +6,3 @@ CLIENTID= DEVID= GUILDID= HYPIXELAPIKEY= -STAFFAPPSTATUS= diff --git a/commands-testing/mute.js b/commands-testing/mute.js index 607cbed..908e312 100644 --- a/commands-testing/mute.js +++ b/commands-testing/mute.js @@ -1,5 +1,4 @@ const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js'); -const env = require('dotenv').config(); const dev = process.env.DEV; const { color } = require('../config/options.json'); const { admin, helper, muted } = require('../config/roles.json'); diff --git a/commands/check.js b/commands/check.js index d51e7a4..a78f2f9 100644 --- a/commands/check.js +++ b/commands/check.js @@ -1,6 +1,5 @@ const { SlashCommandBuilder, EmbedBuilder, PermissionFlagsBits } = require("discord.js"); const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../config/reqs.json"); -const env = require("dotenv").config(); const hypixelApiKey = process.env.HYPIXELAPIKEY; const { color } = require("../config/options.json"); const fetch = require("axios"); diff --git a/commands/devel.js b/commands/devel.js index 080ba30..0a4708d 100644 --- a/commands/devel.js +++ b/commands/devel.js @@ -2,7 +2,6 @@ const { SlashCommandBuilder, PermissionFlagsBits, userMention, EmbedBuilder, Cha const { hypixelGuildID, color } = require('../config/options.json'); const { muted } = require('../config/roles.json'); const verify = require('../schemas/verifySchema.js'); -const env = require('dotenv').config(); const dev = process.env.DEV; const fetch = require('axios'); diff --git a/commands/forceupdate.js b/commands/forceupdate.js index 6f6cbae..50fabb9 100644 --- a/commands/forceupdate.js +++ b/commands/forceupdate.js @@ -1,5 +1,4 @@ const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require('discord.js'); -const env = require('dotenv').config(); const hypixelAPIKey = process.env.HYPIXELAPIKEY; const { hypixelGuildID, color } = require('../config/options.json'); const { gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff, defaultMember } = require('../config/roles.json'); diff --git a/commands/forceverify.js b/commands/forceverify.js index 1d778b9..07e4aed 100644 --- a/commands/forceverify.js +++ b/commands/forceverify.js @@ -1,5 +1,4 @@ const { SlashCommandBuilder, PermissionFlagsBits } = require('discord.js'); -const env = require('dotenv').config(); const hypixelApiKey = process.env.HYPIXELAPIKEY; const fetch = require('axios'); const { color, hypixelGuildID } = require('../config/options.json'); diff --git a/commands/update.js b/commands/update.js index 45faac2..23fcad3 100644 --- a/commands/update.js +++ b/commands/update.js @@ -1,5 +1,4 @@ const { SlashCommandBuilder } = require('discord.js'); -const env = require('dotenv').config(); const hypixelApiKey = process.env.HYPIXELAPIKEY; const fetch = require('axios'); const verify = require('../schemas/verifySchema.js') diff --git a/commands/verify.js b/commands/verify.js index 4088fdc..1724740 100644 --- a/commands/verify.js +++ b/commands/verify.js @@ -1,5 +1,4 @@ const { SlashCommandBuilder } = require("discord.js"); -const env = require("dotenv").config(); const hypixelApiKey = process.env.HYPIXELAPIKEY; const fetch = require("axios"); const { color, hypixelGuildID } = require("../config/options.json"); diff --git a/events/buttons/checkstats.js b/events/buttons/checkstats.js index e3fefdd..c235c0b 100644 --- a/events/buttons/checkstats.js +++ b/events/buttons/checkstats.js @@ -2,7 +2,6 @@ const { color } = require('../../config/options.json'); const fetch = require('axios'); const guildapp = require('../../schemas/guildAppSchema.js'); const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require('../../config/reqs.json'); -const env = require("dotenv").config(); const hypixelApiKey = process.env.HYPIXELAPIKEY; const { getExactLevel, skywarsLevel, getLevelForExp } = require("../../utils/functions.js"); diff --git a/events/buttons/waitingListUpdate.js b/events/buttons/waitingListUpdate.js index 6a9c703..97b4e6f 100644 --- a/events/buttons/waitingListUpdate.js +++ b/events/buttons/waitingListUpdate.js @@ -1,6 +1,5 @@ const mongoose = require('mongoose'); const waitinglist = require('../../schemas/waitinglistSchema.js'); -const env = require('dotenv').config(); const key = process.env.HYPIXELAPIKEY; const { hypixelGuildID } = require("../../config/options.json") const fetch = require("axios"); diff --git a/index.js b/index.js index b15952f..a5a466b 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,6 @@ const { Client, GatewayIntentBits, Partials, ActivityType, Events, Collection } = require('discord.js'); const { botLogChannel, color } = require('./config/options.json'); -const env = require('dotenv').config(); +require('dotenv').config(); const mongoURI = process.env.MONGOURI; const { connect } = require('mongoose'); const path = require('path'); From 0a07f8a8b55e5e8fd9e2484bc213edff2da98153 Mon Sep 17 00:00:00 2001 From: Taken Date: Fri, 10 Nov 2023 15:47:21 +0100 Subject: [PATCH 2/2] Added a nicer display option to the config command Signed-off-by: Taken --- commands/config.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/commands/config.js b/commands/config.js index 44745e3..52ffaa4 100644 --- a/commands/config.js +++ b/commands/config.js @@ -15,6 +15,9 @@ module.exports = { option .setName("setting") .setDescription("The setting to configure") + .setChoices( + { name: "Staff Application status", value: "staffAppStatus" } + ) .setRequired(true)) .addStringOption(option => option @@ -29,10 +32,9 @@ module.exports = { await interaction.deferReply(); - const setting = interaction.options.getString("setting"); + const setting = interaction.options.getString("setting") const value = interaction.options.getString("value"); const embedColor = Number(color.replace("#", "0x")); - const settingsData = await settings.findOne({ name: setting }); if (!settingsData) {