Merge pull request #1 from Fretuks/main

Overhaul everything

deploy-commands.js

@@ -1,27 +1,14 @@
-const { REST, Routes } = require('discord.js');
-const { clientId, guildId, token } = require('./config.json');
-const fs = require('node:fs');
 const path = require('node:path');
+const { REST, Routes } = require('discord.js');
+const { clientId, token } = require('./config.json');
+const { loadCommandModules } = require('./loaders/commands');
 
-const commands = [];
+const commandsPath = path.join(__dirname, 'commands');
-// Grab all the command folders from the commands directory you created earlier
+const { commands, invalidCommands } = loadCommandModules(commandsPath);
-const foldersPath = path.join(__dirname, 'commands');
+const commandsData = commands.map((command) => command.data.toJSON());
-const commandFolders = fs.readdirSync(foldersPath);
 
-for (const folder of commandFolders) {
+for (const filePath of invalidCommands) {
-	// Grab all the command files from the commands directory you created earlier
-	const commandsPath = path.join(foldersPath, folder);
-	const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
-	// Grab the SlashCommandBuilder#toJSON() output of each command's data for deployment
-	for (const file of commandFiles) {
-		const filePath = path.join(commandsPath, file);
-		const command = require(filePath);
-		if ('data' in command && 'execute' in command) {
-			commands.push(command.data.toJSON());
-		} else {
     console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-		}
-	}
 }
 
 // Construct and prepare an instance of the REST module
@@ -30,12 +17,12 @@ const rest = new REST().setToken(token);
 // and deploy your commands!
 (async () => {
     try {
-		console.log(`Started refreshing ${commands.length} application (/) commands.`);
+        console.log(`Started refreshing ${commandsData.length} application (/) commands.`);
 
         // The put method is used to fully refresh all commands in the guild with the current set
         const data = await rest.put(
             Routes.applicationCommands(clientId),
-			{ body: commands },
+            { body: commandsData },
         );
 
         console.log(`Successfully reloaded ${data.length} application (/) commands.`);

index.js

@@ -1,36 +1,29 @@
-const fs = require('node:fs');
 const path = require('node:path');
 const { Client, Collection, GatewayIntentBits } = require('discord.js');
 const { token } = require('./config.json');
+const { loadCommandModules } = require('./loaders/commands');
+const { loadEventModules } = require('./loaders/events');
 
 const client = new Client({ intents: [GatewayIntentBits.Guilds] });
 
-// Retreaves commands from the command folder
+// Retrieves commands from the command folder
 client.commands = new Collection();
-const foldersPath = path.join(__dirname, 'commands');
+const commandsPath = path.join(__dirname, 'commands');
-const commandFolders = fs.readdirSync(foldersPath);
+const { commands, invalidCommands } = loadCommandModules(commandsPath);
 
-for (const folder of commandFolders) {
+for (const command of commands) {
-    const commandsPath = path.join(foldersPath, folder);
-    const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
-    for (const file of commandFiles) {
-        const filePath = path.join(commandsPath, file);
-        const command = require(filePath);
-        if ('data' in command && 'execute' in command) {
     client.commands.set(command.data.name, command);
-        } else {
-            console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-        }
-    }
 }
 
-// Retreaves Events from the events folder
+for (const filePath of invalidCommands) {
-const eventsPath = path.join(__dirname, 'events');
+    console.log(`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`);
-const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js'));
+}
 
-for (const file of eventFiles) {
+// Retrieves events from the events folder
-    const filePath = path.join(eventsPath, file);
+const eventsPath = path.join(__dirname, 'events');
-    const event = require(filePath);
+const eventModules = loadEventModules(eventsPath);
+
+for (const { event } of eventModules) {
     if (event.once) {
         client.once(event.name, (...args) => event.execute(...args));
     } else {

loaders/commands.js

@@ -0,0 +1,41 @@
+const fs = require('node:fs');
+const path = require('node:path');
+
+const isJavaScriptFile = (file) => file.endsWith('.js');
+
+const getCommandFilePaths = (commandsPath) => {
+    const commandFolders = fs
+        .readdirSync(commandsPath, { withFileTypes: true })
+        .filter((entry) => entry.isDirectory())
+        .map((entry) => entry.name);
+
+    return commandFolders.flatMap((folder) => {
+        const folderPath = path.join(commandsPath, folder);
+        return fs
+            .readdirSync(folderPath)
+            .filter(isJavaScriptFile)
+            .map((file) => path.join(folderPath, file));
+    });
+};
+
+const loadCommandModules = (commandsPath) => {
+    const commandFiles = getCommandFilePaths(commandsPath);
+    const commands = [];
+    const invalidCommands = [];
+
+    for (const filePath of commandFiles) {
+        const command = require(filePath);
+
+        if ('data' in command && 'execute' in command) {
+            commands.push(command);
+        } else {
+            invalidCommands.push(filePath);
+        }
+    }
+
+    return { commands, invalidCommands };
+};
+
+module.exports = {
+    loadCommandModules,
+};

loaders/events.js

@@ -0,0 +1,23 @@
+const fs = require('node:fs');
+const path = require('node:path');
+
+const isJavaScriptFile = (file) => file.endsWith('.js');
+
+const getEventFilePaths = (eventsPath) =>
+    fs
+        .readdirSync(eventsPath)
+        .filter(isJavaScriptFile)
+        .map((file) => path.join(eventsPath, file));
+
+const loadEventModules = (eventsPath) => {
+    const eventFiles = getEventFilePaths(eventsPath);
+
+    return eventFiles.map((filePath) => ({
+        filePath,
+        event: require(filePath),
+    }));
+};
+
+module.exports = {
+    loadEventModules,
+};