Merge branch 'dev' into 'main'

Added a nicer display option to the config command

See merge request illegitimate/illegitimate-bot!44

.env.example

@@ -6,4 +6,3 @@ CLIENTID=
 DEVID=
 GUILDID=
 HYPIXELAPIKEY=
-STAFFAPPSTATUS=

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');

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");

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) {

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');
 

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');

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');

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')

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");

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");
 

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");

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');