Added reload slashcommand

MastiDev · MastiDev · commit d51be1ae1c04 · 2023-05-21T16:14:54.000+02:00
diff --git a/src/data/config.js.template b/src/data/config.js.template
@@ -1,15 +1,9 @@
 const config = {
 	bot: {
+		prefix : '!',
 		token: 'TOKEN',
 		owner: '0',
 	},
-	mysql: {
-		host: 'HOST',
-		port: 'PORT',
-		user: 'USER',
-		password: 'PASSWORD',
-		database: 'DATABASE',
-	},
 };
 
 export default config;
diff --git a/src/handlers/buttons.js b/src/handlers/buttons.js
@@ -3,21 +3,27 @@ import chalk from 'chalk';
 
 async function loadButtons(client) {
 	client.buttons.clear();
+	let files = 0;
 	const buttonFiles = readdirSync('./src/interactions/buttons').filter(file => file.endsWith('.js'));
+	if (!buttonFiles) return;
 	for (let i = 0; i < buttonFiles.length; i++) {
 		const button = await import(`../interactions/buttons/${buttonFiles[i]}?${Date.now()}`);
 		await client.buttons.set(button.default.id, button.default);
 		console.log(chalk.greenBright(`[BUTTON] Loaded ${(chalk.yellow(buttonFiles[i]))} with button ${(chalk.yellow(button.default.id))}`));
+		files++;
 	}
 	const buttonFolders = readdirSync('./src/interactions/buttons', { withFileTypes: true }).filter(file => file.isDirectory());
+	if (!buttonFolders) return;
 	for (let i = 0; i < buttonFolders.length; i++) {
 		const buttonFiles = readdirSync(`./src/interactions/buttons/${buttonFolders[i].name}`).filter(file => file.endsWith('.js'));
 		for (let j = 0; j < buttonFiles.length; j++) {
 			const button = await import(`../interactions/buttons/${buttonFolders[i].name}/${buttonFiles[j]}`);
 			await client.buttons.set(button.default.id, button.default);
 			console.log(chalk.greenBright(`[BUTTON] Loaded ${(chalk.yellow(buttonFiles[j]))} with button ${(chalk.yellow(button.default.id))}`));
+			files++;
 		}
 	}
+	return files;
 }
 
 export default { loadButtons };
diff --git a/src/handlers/contextMenus.js b/src/handlers/contextMenus.js
@@ -3,21 +3,27 @@ import chalk from 'chalk';
 
 async function loadContextMenus(client) {
 	client.contextMenus.clear();
+	let files = 0;
 	const contextMenus = readdirSync('./src/interactions/contextMenus').filter(file => file.endsWith('.js'));
+	if (!contextMenus) return;
 	for (let i = 0; i < contextMenus.length; i++) {
 		const menus = await import(`../interactions/contextMenus/${contextMenus[i]}?${Date.now()}`);
 		client.contextMenus.set(menus.default.data.toJSON().name, menus.default);
 		console.log(chalk.greenBright(`[CONTEXTMENU] Loaded ${chalk.yellow(contextMenus[i])} with command ${chalk.yellow(menus.default.data.toJSON().name)}`));
+		files++;
 	}
 	const contextMenuFolders = readdirSync('./src/interactions/contextMenus', { withFileTypes: true }).filter(file => file.isDirectory());
+	if (!contextMenuFolders) return;
 	for (let i = 0; i < contextMenuFolders.length; i++) {
 		const contextMenus = readdirSync(`./src/interactions/contextMenus/${contextMenuFolders[i].name}`).filter(file => file.endsWith('.js'));
 		for (let j = 0; j < contextMenus.length; j++) {
 			const menus = await import(`../interactions/contextMenus/${contextMenuFolders[i].name}/${contextMenus[j]}`);
 			client.contextMenus.set(menus.default.data.toJSON().name, menus.default);
 			console.log(chalk.greenBright(`[CONTEXTMENU] Loaded ${chalk.yellow(contextMenus[j])} with command ${chalk.yellow(menus.default.data.toJSON().name)}`));
+			files++;
 		}
 	}
+	return files;
 }
 
 export default { loadContextMenus };
diff --git a/src/handlers/events.js b/src/handlers/events.js
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 
 async function loadEvents(client) {
 	const eventFiles = readdirSync('./src/events').filter(file => file.endsWith('.js'));
+	if (!eventFiles) return;
 	for (let i = 0; i < eventFiles.length; i++) {
 		const event = await import(`../events/${eventFiles[i]}`);
 		client.on(event.default.event, event.default.execute.bind(null, client));
diff --git a/src/handlers/messageCommands.js b/src/handlers/messageCommands.js
@@ -4,7 +4,9 @@ import { readdirSync } from 'fs';
 async function loadMessageCommands(client) {
 	client.messageCommands.clear();
 	client.messageCommandsAliases.clear();
+	let files = 0;
 	const commandFiles = readdirSync('./src/interactions/messageCommands').filter(file => file.endsWith('.js'));
+	if (!commandFiles) return;
 	for (let i = 0; i < commandFiles.length; i++) {
 		const command = await import(`../interactions/messageCommands/${commandFiles[i]}?${Date.now()}`);
 		if (command.default.aliases) {
@@ -14,8 +16,10 @@ async function loadMessageCommands(client) {
 		}
 		client.messageCommands.set(command.default.name, command.default);
 		console.log(chalk.greenBright(`[COMMAND] Loaded ${(chalk.yellow(commandFiles[i]))} with command ${(chalk.yellow(command.default.name))}`));
+		files++;
 	}
 	const commandFolders = readdirSync('./src/interactions/messageCommands', { withFileTypes: true }).filter(file => file.isDirectory());
+	if (!commandFolders) return;
 	for (let i = 0; i < commandFolders.length; i++) {
 		const commandFiles = readdirSync(`./src/interactions/messageCommands/${commandFolders[i].name}`).filter(file => file.endsWith('.js'));
 		for (let j = 0; j < commandFiles.length; j++) {
@@ -27,8 +31,10 @@ async function loadMessageCommands(client) {
 			}
 			client.messageCommands.set(command.default.name, command.default);
 			console.log(chalk.greenBright(`[COMMAND] Loaded ${(chalk.yellow(commandFiles[j]))} with command ${(chalk.yellow(command.default.name))}`));
+			files++;
 		}
 	}
+	return files;
 }
 
 export default { loadMessageCommands };
diff --git a/src/handlers/modals.js b/src/handlers/modals.js
@@ -3,21 +3,27 @@ import chalk from 'chalk';
 
 async function loadModals(client) {
 	client.modals.clear();
+	let files = 0;
 	const modalFiles = readdirSync('./src/interactions/modals').filter(file => file.endsWith('.js'));
+	if (!modalFiles) return;
 	for (let i = 0; i < modalFiles.length; i++) {
 		const modal = await import(`../interactions/modals/${modalFiles[i]}?${Date.now()}`);
 		await client.modals.set(modal.default.id, modal.default);
 		console.log(chalk.greenBright(`[MODAL] Loaded ${(chalk.yellow(modalFiles[i]))} with modal ${(chalk.yellow(modal.default.id))}`));
+		files++;
 	}
 	const modalFolders = readdirSync('./src/interactions/modals', { withFileTypes: true }).filter(file => file.isDirectory());
+	if (!modalFolders) return;
 	for (let i = 0; i < modalFolders.length; i++) {
 		const modalFiles = readdirSync(`./src/interactions/modals/${modalFolders[i].name}`).filter(file => file.endsWith('.js'));
 		for (let j = 0; j < modalFiles.length; j++) {
 			const modal = await import(`../interactions/modals/${modalFolders[i].name}/${modalFiles[j]}?${Date.now()}`);
 			await client.modals.set(modal.default.id, modal.default);
 			console.log(chalk.greenBright(`[MODAL] Loaded ${(chalk.yellow(modalFiles[j]))} with modal ${(chalk.yellow(modal.default.id))}`));
+			files++;
 		}
 	}
+	return files;
 }
 
 export default { loadModals };
diff --git a/src/handlers/selectMenus.js b/src/handlers/selectMenus.js
@@ -3,21 +3,27 @@ import chalk from 'chalk';
 
 async function loadSelectMenus(client) {
 	client.selectMenus.clear();
+	let files = 0;
 	const selectMenuFiles = readdirSync('./src/interactions/selectMenus').filter(file => file.endsWith('.js'));
+	if (!client.selectMenus) return;
 	for (let i = 0; i < selectMenuFiles.length; i++) {
 		const selectMenu = await import(`../interactions/selectMenus/${selectMenuFiles[i]}?${Date.now()}`);
 		await client.selectMenus.set(selectMenu.default.id, selectMenu.default);
 		console.log(chalk.greenBright(`[SELECTMENU] Loaded ${(chalk.yellow(selectMenuFiles[i]))} with selectMenu ${(chalk.yellow(selectMenu.default.id))}`));
+		files++;
 	}
 	const selectMenuFolders = readdirSync('./src/interactions/selectMenus', { withFileTypes: true }).filter(file => file.isDirectory());
+	if (!selectMenuFolders) return;
 	for (let i = 0; i < selectMenuFolders.length; i++) {
 		const selectMenuFiles = readdirSync(`./src/interactions/selectMenus/${selectMenuFolders[i].name}`).filter(file => file.endsWith('.js'));
 		for (let j = 0; j < selectMenuFiles.length; j++) {
 			const selectMenu = await import(`../interactions/selectMenus/${selectMenuFolders[i].name}/${selectMenuFiles[j]}?${Date.now()}`);
 			await client.selectMenus.set(selectMenu.default.id, selectMenu.default);
 			console.log(chalk.greenBright(`[SELECTMENU] Loaded ${(chalk.yellow(selectMenuFiles[j]))} with selectMenu ${(chalk.yellow(selectMenu.default.id))}`));
+			files++;
 		}
 	}
+	return files;
 }
 
 export default { loadSelectMenus };
diff --git a/src/handlers/slashCommands.js b/src/handlers/slashCommands.js
@@ -3,21 +3,27 @@ import chalk from 'chalk';
 
 async function loadSlashCommands(client) {
 	client.slashCommands.clear();
+	let files = 0;
 	const slashCommands = readdirSync('./src/interactions/slashCommands').filter(file => file.endsWith('.js'));
+	if (!slashCommands) return;
 	for (let i = 0; i < slashCommands.length; i++) {
 		const commands = await import(`../interactions/slashCommands/${slashCommands[i]}?${Date.now()}`);
 		client.slashCommands.set(commands.default.data.toJSON().name, commands.default);
 		console.log(chalk.greenBright(`[SLASHCOMMAND] Loaded ${chalk.yellow(slashCommands[i])} with command ${chalk.yellow(commands.default.data.toJSON().name)}`));
+		files++;
 	}
 	const slashCommandFolders = readdirSync('./src/interactions/slashCommands', { withFileTypes: true }).filter(file => file.isDirectory());
+	if (!slashCommandFolders) return;
 	for (let i = 0; i < slashCommandFolders.length; i++) {
 		const slashCommands = readdirSync(`./src/interactions/slashCommands/${slashCommandFolders[i].name}`).filter(file => file.endsWith('.js'));
 		for (let j = 0; j < slashCommands.length; j++) {
 			const commands = await import(`../interactions/slashCommands/${slashCommandFolders[i].name}/${slashCommands[j]}`);
 			client.slashCommands.set(commands.default.data.toJSON().name, commands.default);
 			console.log(chalk.greenBright(`[SLASHCOMMAND] Loaded ${chalk.yellow(slashCommands[j])} with command ${chalk.yellow(commands.default.data.toJSON().name)}`));
+			files++;
 		}
 	}
+	return files;
 }
 
 export default { loadSlashCommands };
diff --git a/src/interactions/buttons/general/test.js b/src/interactions/buttons/general/test.js
diff --git a/src/interactions/buttons/test.js b/src/interactions/buttons/test.js
@@ -1,6 +1,6 @@
 export default {
-	id: 'testg',
+	id: 'test',
 	async execute(client, interaction) {
-		interaction.reply('Hello World! Button');
+		interaction.reply('Hello World!');
 	}
 };
diff --git a/src/interactions/contextMenus/general/test.js b/src/interactions/contextMenus/general/test.js
diff --git a/src/interactions/messageCommands/general/test.js b/src/interactions/messageCommands/general/test.js
diff --git a/src/interactions/messageCommands/test.js b/src/interactions/messageCommands/test.js
@@ -1,7 +1,7 @@
 export default {
-	name: 'hello2',
+	name: 'hello',
 	description: 'Hello world.',
-	aliases: ['hey2', 'hi2'],
+	aliases: ['hey', 'hi'],
 
 	async execute(client, message, args) {
 		message.reply('Hello World!');
diff --git a/src/interactions/modals/general/text.js b/src/interactions/modals/general/text.js
diff --git a/src/interactions/slashCommands/reload.js b/src/interactions/slashCommands/reload.js
@@ -1,26 +1,41 @@
 import config from '../../data/config.js';
-import { SlashCommandBuilder } from '@discordjs/builders';
-import slashCommandHandler from '../../handlers/slashCommands.js';
-import modalHandler from '../../handlers/modals.js';
+import { SlashCommandBuilder, EmbedBuilder } from '@discordjs/builders';
+import chalk from 'chalk';
+
 import buttonHandler from '../../handlers/buttons.js';
-import selectMenuHandler from '../../handlers/selectMenus.js';
 import contextMenusHandler from '../../handlers/contextMenus.js';
-import register from '../../handlers/register.js';
-
+import messageCommandsHandler from '../../handlers/messageCommands.js';
+import modalsHandler from '../../handlers/modals.js';
+import selectMenusHandler from '../../handlers/selectMenus.js';
+import slashCommandsHandler from '../../handlers/slashCommands.js';
 
 export default {
 	data: new SlashCommandBuilder()
 		.setName('reload')
 		.setDescription('Reloads all commands'),
 	async execute(client, interaction) {
 		if (!interaction.member.id == config.bot.owner) return interaction.reply('You do not have the permission to use this command!');
-		let cmds = await slashCommandHandler.reloadSlashCommands(client);
-		let modals = await modalHandler.reloadModals(client);
-		let buttons = await buttonHandler.reloadButtons(client);
-		let selectMenus = await selectMenuHandler.reloadSelectMenus(client);
-		let contextMenus = await contextMenusHandler.reloadContextMenus(client);
-		await register.load(client);
 
-		interaction.reply(`Reloaded ${cmds} slash commands, ${modals} modals, ${buttons} buttons, and ${selectMenus} select menus, and ${contextMenus} context menus!`);
+		console.log(chalk.red('[RELOAD] ')  + chalk.yellow('Started reloading everything!'));
+
+		let buttons = await buttonHandler.loadButtons(client);
+		let contextMenus = await contextMenusHandler.loadContextMenus(client);
+		let messageCommands = await messageCommandsHandler.loadMessageCommands(client);
+		let modals = await modalsHandler.loadModals(client);
+		let selectMenus = await selectMenusHandler.loadSelectMenus(client);
+		let slashCommands = await slashCommandsHandler.loadSlashCommands(client);
+
+		let embed = new EmbedBuilder();
+		embed.setTitle('Successfully reloaded!');
+		embed.addFields(
+			{ name: 'Slash Commands', value: `${slashCommands}`, inline: true },
+			{ name: 'Message Commands', value: `${messageCommands}`, inline: true },
+			{ name: 'Buttons', value: `${buttons}`, inline: true },
+			{ name: 'Select Menus', value: `${selectMenus}`, inline: true },
+			{ name: 'Context Menus', value: `${contextMenus}`, inline: true },
+			{ name: 'Modals', value: `${modals}`, inline: true },
+		);
+
+		await interaction.reply({ embeds: [embed] });
 	}
-};
+};

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@ import { readdirSync } from 'fs';`
`4`	`4`	`async function loadMessageCommands(client) {`
`5`	`5`	`client.messageCommands.clear();`
`6`	`6`	`client.messageCommandsAliases.clear();`
	`7`	`+ let files = 0;`
`7`	`8`	`const commandFiles = readdirSync('./src/interactions/messageCommands').filter(file => file.endsWith('.js'));`
	`9`	`+ if (!commandFiles) return;`
`8`	`10`	`for (let i = 0; i < commandFiles.length; i++) {`
`9`	`11`	const command = await import(`../interactions/messageCommands/${commandFiles[i]}?${Date.now()}`);
`10`	`12`	`if (command.default.aliases) {`
`@@ -14,8 +16,10 @@ async function loadMessageCommands(client) {`
`14`	`16`	`}`
`15`	`17`	`client.messageCommands.set(command.default.name, command.default);`
`16`	`18`	console.log(chalk.greenBright(`[COMMAND] Loaded ${(chalk.yellow(commandFiles[i]))} with command ${(chalk.yellow(command.default.name))}`));
	`19`	`+ files++;`
`17`	`20`	`}`
`18`	`21`	`const commandFolders = readdirSync('./src/interactions/messageCommands', { withFileTypes: true }).filter(file => file.isDirectory());`
	`22`	`+ if (!commandFolders) return;`
`19`	`23`	`for (let i = 0; i < commandFolders.length; i++) {`
`20`	`24`	const commandFiles = readdirSync(`./src/interactions/messageCommands/${commandFolders[i].name}`).filter(file => file.endsWith('.js'));
`21`	`25`	`for (let j = 0; j < commandFiles.length; j++) {`
`@@ -27,8 +31,10 @@ async function loadMessageCommands(client) {`
`27`	`31`	`}`
`28`	`32`	`client.messageCommands.set(command.default.name, command.default);`
`29`	`33`	console.log(chalk.greenBright(`[COMMAND] Loaded ${(chalk.yellow(commandFiles[j]))} with command ${(chalk.yellow(command.default.name))}`));
	`34`	`+ files++;`
`30`	`35`	`}`
`31`	`36`	`}`
	`37`	`+ return files;`
`32`	`38`	`}`
`33`	`39`
`34`	`40`	`export default { loadMessageCommands };`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`export default {`
`2`		`- id: 'testg',`
	`2`	`+ id: 'test',`
`3`	`3`	`async execute(client, interaction) {`
`4`		`- interaction.reply('Hello World! Button');`
	`4`	`+ interaction.reply('Hello World!');`
`5`	`5`	`}`
`6`	`6`	`};`