Merge branch 'dev' into 'main'

Moved code to src folder

See merge request illegitimate/illegitimate-bot!86

package.json

@@ -2,7 +2,7 @@
   "name": "illegitimate-bot",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "dev": "nodemon",
     "dev:build": "node scripts/dev-deploy.js",

src/commands-testing/dev-info.js

@@ -12,14 +12,6 @@ module.exports = {
             option
                 .setName("test")
                 .setDescription("Test option."))
-        .addStringOption(option =>
-            option
-                .setName("test2")
-                .setDescription("Test option."))
-        .addStringOption(option =>
-            option
-                .setName("test3")
-                .setDescription("Test option."))
         .setDefaultMemberPermissions(PermissionFlagsBits.Administrator)
         .setDMPermission(false),
 
@@ -28,8 +20,6 @@ module.exports = {
     async execute(interaction) {
 
         const test = interaction.options.getString("test")
-        const test2 = interaction.options.getString("test2")
-        const test3 = interaction.options.getString("test3")
 
         const message = await interaction.channel.messages.fetch(test)
         const embed = message.embeds[0]

src/commands/ban.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
-const { admin, helper } = require("../config/roles.json")
+const { admin, helper } = require("../../config/roles.json")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "ban",

src/commands/check.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder } = require("discord.js")
-const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../config/reqs.json")
+const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../../config/reqs.json")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 const { hypixelLevel, bedwarsLevel, skywarsLevel, getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js")
 
 module.exports = {

src/commands/clear.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "clear",

src/commands/config.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 const settings = require("../schemas/settingsSchema.js")
 const mongoose = require("mongoose")
 

src/commands/forceunverify.js

@@ -1,7 +1,7 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = 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 { gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
 const removeThese = [gm, manager, moderator, beast, member, trialmember, guildRole, guildStaff, defaultMember]
 
 module.exports = {

src/commands/forceupdate.js

@@ -1,7 +1,7 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
 const { getGuild, getHeadURL, getIGN } = require("../utils/utils.js")
-const { hypixelGuildID, color } = require("../config/options.json")
+const { hypixelGuildID, color } = 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, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
 const verify = require("../schemas/verifySchema.js")
 const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
 

src/commands/forceverify.js

@@ -1,9 +1,9 @@
 const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
 const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js")
-const { color, hypixelGuildID } = require("../config/options.json")
+const { color, hypixelGuildID } = 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, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
 
 
 module.exports = {

src/commands/guild.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 const { guildMember } = require("./guild/member.js")
 const { guildInfo } = require("./guild/info.js")
 

src/commands/guild/info.js

@@ -1,5 +1,5 @@
 const { getUUID, getIGN, getPlayer, getGuild, guildLevel } = require("../../utils/utils.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 
 /** @param { import('discord.js').ChatInputCommandInteraction } interaction */
 

src/commands/guild/member.js

@@ -1,5 +1,5 @@
 const { getUUID, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 
 /** @param { import('discord.js').ChatInputCommandInteraction } interaction */
 

src/commands/help.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, ChannelType } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "help",

src/commands/kick.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
-const { admin, helper } = require("../config/roles.json")
+const { admin, helper } = require("../../config/roles.json")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "kick",

src/commands/remove.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 const { waitinglistSchema } = require("../schemas/waitinglistSchema.js")
 
 module.exports = {

src/commands/reqs.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
-const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../config/reqs.json")
+const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../../config/reqs.json")
 
 module.exports = {
     name: "reqs",

src/commands/send.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "send",

src/commands/setup.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, PermissionFlagsBits, ButtonBuilder, ActionRowBuilder, ButtonStyle, } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "setup",

src/commands/slowmode.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 
 module.exports = {
     name: "slowmode",

src/commands/update.js

@@ -1,8 +1,8 @@
 const { SlashCommandBuilder } = require("discord.js")
 const { getGuild, getIGN, getHeadURL } = require("../utils/utils.js")
 const verify = require("../schemas/verifySchema.js")
-const { color, hypixelGuildID } = require("../config/options.json")
+const { color, hypixelGuildID } = 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, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
 const removeThese = [gm, manager, moderator, beast, elite, member, trialmember, guildRole, guildStaff]
 
 module.exports = {

src/commands/uuid.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder } = require("discord.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 const { getUUID, getIGN, getHeadURL, formatUuid } = require("../utils/utils.js")
 
 module.exports = {

src/commands/verify.js

@@ -1,9 +1,9 @@
 const { SlashCommandBuilder } = require("discord.js")
 const { getUUID, getPlayer, getGuild, getHeadURL } = require("../utils/utils.js")
-const { color, hypixelGuildID } = require("../config/options.json")
+const { color, hypixelGuildID } = 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, trialmember, guildRole, guildStaff, defaultMember } = require("../../config/roles.json")
 
 module.exports = {
     name: "verify",

src/commands/whois.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder, PermissionFlagsBits, userMention } = require("discord.js")
 const { getIGN, getHeadURL } = require("../utils/utils.js")
-const { color } = require("../config/options.json")
+const { color } = require("../../config/options.json")
 const verify = require("../schemas/verifySchema.js")
 
 module.exports = {

src/events/buttons/checkstats.js

@@ -1,6 +1,6 @@
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 const guildapp = require("../../schemas/guildAppSchema.js")
-const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../../config/reqs.json")
+const { bwfkdr, bwstars, bwwins, swstars, duelswins, duelswlr } = require("../../../config/reqs.json")
 const { hypixelLevel, bedwarsLevel, skywarsLevel, getPlayer, getGuild, getHeadURL } = require("../../utils/utils.js")
 
 module.exports = {

src/events/buttons/guildapplicationaccept.js

@@ -1,9 +1,9 @@
 const { ActionRowBuilder, ButtonStyle, ButtonBuilder } = require("discord.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 const mongoose = require("mongoose")
 const guildapp = require("../../schemas/guildAppSchema.js")
 const waitingList = require("../../schemas/waitinglistSchema.js")
-const { waitingListRole } = require("../../config/roles.json")
+const { waitingListRole } = require("../../../config/roles.json")
 
 module.exports = {
     name: "guildapplicationaccept",

src/events/buttons/guildapply.js

@@ -1,9 +1,9 @@
 const { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder } = require("discord.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
-const { largeM, smallM, ignM } = require("../../config/limitmessages.json")
+const { largeM, smallM, ignM } = require("../../../config/limitmessages.json")
-const { applicationsChannel } = require("../../config/options.json")
+const { applicationsChannel } = require("../../../config/options.json")
-const questions = require("../../config/questions.json")
+const questions = require("../../../config/questions.json")
-const { guildRole } = require("../../config/roles.json")
+const { guildRole } = require("../../../config/roles.json")
 const { getUUID } = require("../../utils/utils.js")
 const mongoose = require("mongoose")
 const guildapp = require("../../schemas/guildAppSchema.js")

src/events/buttons/guildinactivitylog.js

@@ -1,8 +1,8 @@
 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, trialmember, guildStaff, guildRole } = require("../../../config/roles.json")
-const { ignM, smallM, largeM } = require("../../config/limitmessages.json")
+const { ignM, smallM, largeM } = require("../../../config/limitmessages.json")
-const { ia1, ia2, ia3, ria1, ria2, ria3 } = require("../../config/questions.json")
+const { ia1, ia2, ia3, ria1, ria2, ria3 } = require("../../../config/questions.json")
-const { color, inactivityLogChannel } = require("../../config/options.json")
+const { color, inactivityLogChannel } = require("../../../config/options.json")
 const guildRoles = [gm, manager, moderator, beast, member, trialmember, guildStaff, guildRole]
 
 module.exports = {

src/events/buttons/staffapplicationaccept.js

@@ -1,5 +1,5 @@
 const { ActionRowBuilder, ButtonBuilder, ButtonStyle } = require("discord.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 const staffapp = require("../../schemas/staffAppSchema.js")
 
 module.exports = {

src/events/buttons/staffapply.js

@@ -1,9 +1,8 @@
 const { ButtonBuilder, ButtonStyle, ActionRowBuilder, EmbedBuilder } = require("discord.js")
-const { color } = require("../../config/options.json")
+const { color, staffApplicationsChannel } = require("../../../config/options.json")
-const { largeM, ignM } = require("../../config/limitmessages.json")
+const { largeM, ignM } = require("../../../config/limitmessages.json")
-const { staffApplicationsChannel } = require("../../config/options.json")
+const questions = require("../../../config/questions.json")
-const questions = require("../../config/questions.json")
+const { guildRole, guildStaff } = require("../../../config/roles.json")
-const { guildRole, guildStaff } = require("../../config/roles.json")
 const mongoose = require("mongoose")
 const staffapp = require("../../schemas/staffAppSchema.js")
 const settings = require("../../schemas/settingsSchema.js")

src/events/buttons/waitingListUpdate.js

@@ -1,6 +1,6 @@
 const waitinglist = require("../../schemas/waitinglistSchema.js")
 const { getGuild } = require("../../utils/utils.js")
-const { hypixelGuildID } = require("../../config/options.json")
+const { hypixelGuildID } = require("../../../config/options.json")
 
 module.exports = {
     name: "waitinglistupdate",

src/events/modals/denyreasonbox.js

@@ -1,5 +1,5 @@
 const { InteractionType, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require("discord.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 const guildapp = require("../../schemas/guildAppSchema.js")
 
 module.exports = {

src/events/modals/staffdenyreasonbox.js

@@ -1,5 +1,5 @@
 const { InteractionType, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require("discord.js")
-const { color } = require("../../config/options.json")
+const { color } = require("../../../config/options.json")
 const staffapp = require("../../schemas/staffAppSchema.js")
 
 module.exports = {

src/events/server/guildMemberAdd/logNewJoins.js

@@ -1,5 +1,5 @@
 const { userMention } = require("discord.js")
-const { color, botLogChannel } = require("../../../config/options.json")
+const { color, botLogChannel } = require("../../../../config/options.json")
 
 module.exports = {
     name: "logNewJoins",

src/events/server/ready/sendOnlineMessage.js

@@ -1,4 +1,4 @@
-const { onlineLogChannel, color } = require("../../../config/options.json")
+const { onlineLogChannel, color } = require("../../../../config/options.json")
 
 module.exports = {
     name: "sendonlinemessage",

src/events/server/ready/status.js

@@ -1,4 +1,4 @@
-const statuses = require("../../../config/statuses.json")
+const statuses = require("../../../../config/statuses.json")
 
 module.exports = {
     name: "status",

src/events/server/voiceStateUpdate/vcJoinLeave.js

@@ -1,5 +1,5 @@
 const { userMention, channelMention } = require("discord.js")
-const { botLogChannel, color } = require("../../../config/options.json")
+const { botLogChannel, color } = require("../../../../config/options.json")
 
 module.exports = {
     name: "vcJoinLeave",

src/utils/autodeploy.js

@@ -14,9 +14,9 @@ log.setColors({
 
 async function autoDeployCommands() {
     const commands = []
-    const commandFiles = fs.readdirSync("./commands/").filter(file => file.endsWith(".js"))
+    const commandFiles = fs.readdirSync("./src/commands/").filter(file => file.endsWith(".js"))
-    const contentMenuCommands = fs.readdirSync("./commands-contextmenu/").filter(file => file.endsWith(".js"))
+    const contentMenuCommands = fs.readdirSync("./src/commands-contextmenu/").filter(file => file.endsWith(".js"))
-    const commandsTesting = fs.readdirSync("./commands-testing/").filter(file => file.endsWith(".js"))
+    const commandsTesting = fs.readdirSync("./src/commands-testing/").filter(file => file.endsWith(".js"))
 
     for (const file of commandFiles) {
         const command = require(`../commands/${file}`)