Compare commits

..

No commits in common. "2c5dbdf0387722fc4e47f76d2e6b0627f202f299" and "a4eab091c78cab9c91e93c728aed25c4c5a39c7d" have entirely different histories.

8 changed files with 42 additions and 41 deletions

View file

@ -3,7 +3,7 @@ import { MessageEmbed, MessageActionRow, MessageSelectMenu } from 'discord.js';
import { exec } from 'node:child_process'; import { exec } from 'node:child_process';
import fs from 'node:fs'; import fs from 'node:fs';
import os from 'node:os'; import os from 'node:os';
import utils from '../../utils/videos.js'; import utils from '../utils/videos.js';
export default { export default {
data: new SlashCommandBuilder() data: new SlashCommandBuilder()

View file

@ -5,6 +5,6 @@ export default {
.setName('ping') .setName('ping')
.setDescription('Replies with Pong!'), .setDescription('Replies with Pong!'),
async execute(interaction) { async execute(interaction) {
await interaction.reply(`Pong! \`${Math.round(interaction.client.ws.ping)} ms\``); await interaction.reply('Pong!');
}, },
}; };

View file

@ -1,5 +1,5 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from '@discordjs/builders';
import utils from '../../utils/videos.js'; import utils from '../utils/videos.js';
import fs from 'node:fs'; import fs from 'node:fs';
import os from 'node:os'; import os from 'node:os';
import path from 'node:path'; import path from 'node:path';
@ -55,7 +55,7 @@ export default {
async function gifski(output, input) { async function gifski(output, input) {
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {
exec(`gifski --quality 70 -o ${output} ${input}`, (err, stdout, stderr) => { exec(`gifski -o ${output} ${input}`, (err, stdout, stderr) => {
if (err) { if (err) {
reject(stderr); reject(stderr);
} }

View file

@ -1,6 +0,0 @@
export default {
name: 'uncaughtException',
async execute(error) {
return console.error(`\x1b[31mUncaughtException: ${error}\x1b[37m`);
},
};

View file

@ -1,6 +1,7 @@
export default { export default {
name: 'unhandledRejection', name: 'unhandledRejection',
once: true,
async execute(error) { async execute(error) {
return console.error(`\x1b[31mUncaught Promise Rejection: ${error}\x1b[37m`); console.error('Unhandled promise rejection:', error);
}, },
}; };

View file

@ -11,43 +11,49 @@ const __dirname = path.dirname(__filename);
const client = new Client({ intents: [Intents.FLAGS.GUILDS] }); const client = new Client({ intents: [Intents.FLAGS.GUILDS] });
// Load commands // Load commands from the commands folder
client.commands = new Collection(); client.commands = new Collection();
await loadCommandFromDir('fun'); const commandsPath = path.join(__dirname, 'commands');
await loadCommandFromDir('utility'); const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
// Load events for (const file of commandFiles) {
loadEventFromDir('client', client); const filePath = path.join(commandsPath, file);
loadEventFromDir('process', process); let command = await import(filePath);
command = command.default;
client.login(token); client.commands.set(command.data.name, command);
}
async function loadCommandFromDir(dir) { // Load client events from the events folder
const commandsPath = path.join(`${__dirname}/commands`, dir); const clientEventsPath = path.join(__dirname, 'events/client');
const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js')); const clientEventFiles = fs.readdirSync(clientEventsPath).filter(file => file.endsWith('.js'));
for (const file of commandFiles) { for (const file of clientEventFiles) {
const filePath = path.join(commandsPath, file); const filePath = path.join(clientEventsPath, file);
let command = await import(filePath); let event = await import(filePath);
command = command.default; event = event.default;
if (event.once) {
client.commands.set(command.data.name, command); client.once(event.name, (...args) => event.execute(...args));
}
else {
client.on(event.name, (...args) => event.execute(...args));
} }
} }
async function loadEventFromDir(dir, listener) { // Load process events from the events folder
const eventsPath = path.join(`${__dirname}/events`, dir); const processEventsPath = path.join(__dirname, 'events/process');
const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js')); const processEventFiles = fs.readdirSync(processEventsPath).filter(file => file.endsWith('.js'));
for (const file of eventFiles) { for (const file of processEventFiles) {
const filePath = path.join(eventsPath, file); const filePath = path.join(processEventsPath, file);
let event = await import(filePath); let event = await import(filePath);
event = event.default; event = event.default;
if (event.once) { if (event.once) {
listener.once(event.name, (...args) => event.execute(...args)); process.once(event.name, (...args) => event.execute(...args));
}
else {
listener.on(event.name, (...args) => event.execute(...args));
}
} }
} else {
process.on(event.name, (...args) => event.execute(...args));
}
}
client.login(token);