Skip to content
This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Commit 0828bec

Browse files
MAKGAMEROFFICIALMAKGAMEROFFICIAL
committed
update
1 parent 11fa38d commit 0828bec

File tree

3 files changed

+115
-105
lines changed

3 files changed

+115
-105
lines changed

‎events/interactionCreate.js

+49-41
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,84 @@
11
const { Events, Collection } = require("discord.js");
2-
32
module.exports = {
43
name: Events.InteractionCreate,
54
async execute(interaction) {
65
// Slash Command Handling
76
if (interaction.isChatInputCommand()) {
8-
const command = interaction.client.commands.get(interaction.commandName);
7+
const command = interaction.client.slashCommands.get(interaction.commandName);
98

109
if (!command) {
11-
console.error(`[x] No command matching ${interaction.commandName} was found.`);
12-
return;
10+
console.error(`[x] No slash command matching ${interaction.commandName} was found.`);
11+
return await interaction.reply({ content: "That command couldn't be found.", ephemeral: true });
1312
}
1413

1514
try {
1615
await command.execute(interaction);
16+
await handleCooldown(interaction, command);
1717
} catch (error) {
18-
console.error(error);
19-
// Prevent multiple replies or follow-ups
20-
if (interaction.replied || interaction.deferred) {
21-
await interaction.followUp({
22-
content: "[!] There was an error while executing this command!",
23-
ephemeral: true,
24-
});
25-
} else {
26-
await interaction.reply({
27-
content: "[!] There was an error while executing this command!",
28-
ephemeral: true,
29-
});
30-
}
18+
console.error(`Error executing slash command ${interaction.commandName}:`, error);
19+
await handleCommandError(interaction, error);
3120
}
32-
33-
// Call the cooldown handler after ensuring only one reply
34-
await handleCooldown(interaction, command);
3521
}
3622
},
3723
};
3824

3925
// Prefix Command Handling
40-
module.exports.messageHandler = async (message) => {
41-
const prefix = "!"; // Set your desired prefix
42-
if (!message.content.startsWith(prefix) || message.author.bot) return;
26+
module.exports.messageHandler = async (message, client) => {
27+
const { prefix } = require('../functions/prefix');
28+
if (!message.content.startsWith(prefix) || message.author.bot || !message.guild) return;
4329

4430
const args = message.content.slice(prefix.length).trim().split(/ +/);
4531
const commandName = args.shift().toLowerCase();
46-
const command = message.client.commands.get(commandName);
32+
const command = client.prefixCommands.get(commandName) || client.prefixCommands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName));
4733

4834
if (!command) {
49-
console.error(`[x] No command matching ${commandName} was found.`);
35+
console.error(`[x] No prefix command matching ${commandName} was found.`);
5036
return;
5137
}
5238

5339
try {
54-
await command.execute(message, args);
40+
await command.execute(message, args, client);
41+
await handleCooldown(message, command);
5542
} catch (error) {
56-
console.error(error);
57-
message.reply("[!] There was an error while executing this command!");
43+
console.error(`Error executing prefix command ${commandName}:`, error);
44+
await message.reply("[!] There was an error while executing this command!");
5845
}
59-
60-
// Call the cooldown handler
61-
await handleCooldown(message, command);
6246
};
6347

48+
// Utility function for handling errors in commands
49+
async function handleCommandError(interaction, error) {
50+
const errorMessage = "[!] There was an error while executing this command!";
51+
try {
52+
if (interaction.replied || interaction.deferred) {
53+
await interaction.followUp({
54+
content: errorMessage,
55+
ephemeral: true,
56+
});
57+
} else {
58+
await interaction.reply({
59+
content: errorMessage,
60+
ephemeral: true,
61+
});
62+
}
63+
} catch (replyError) {
64+
console.error(`Error sending error message for ${interaction.commandName}:`, replyError);
65+
}
66+
}
67+
6468
// Cooldown Logic
6569
async function handleCooldown(source, command) {
6670
const { client, user } = source;
6771
const { cooldowns } = client;
6872

69-
if (!cooldowns.has(command.name)) {
70-
cooldowns.set(command.name, new Collection());
73+
// Determine the command name based on whether it's a slash or prefix command
74+
const commandName = command.data ? command.data.name : command.name;
75+
76+
if (!cooldowns.has(commandName)) {
77+
cooldowns.set(commandName, new Collection());
7178
}
7279

7380
const now = Date.now();
74-
const timestamps = cooldowns.get(command.name);
81+
const timestamps = cooldowns.get(commandName);
7582
const defaultCooldownDuration = 3; // default cooldown in seconds
7683
const cooldownAmount = (command.cooldown ?? defaultCooldownDuration) * 1000;
7784

@@ -80,20 +87,21 @@ async function handleCooldown(source, command) {
8087
if (now < expirationTime) {
8188
const expiredTimestamp = Math.round(expirationTime / 1000);
8289

83-
// Check if it's a Chat Input Command or a message command
84-
if (!source.replied && !source.deferred) {
90+
try {
8591
if (source.isChatInputCommand && typeof source.isChatInputCommand === "function") {
86-
// Chat input command (slash command)
92+
// Slash command
8793
await source.reply({
88-
content: `Please wait, you are on a cooldown for \`${command.name}\`. You can use it again <t:${expiredTimestamp}:R>.`,
94+
content: `Please wait, you are on a cooldown for \`${commandName}\`. You can use it again <t:${expiredTimestamp}:R>.`,
8995
ephemeral: true,
9096
});
9197
} else {
92-
// Prefix command (message command)
98+
// Prefix command
9399
await source.channel.send({
94-
content: `Please wait, you are on a cooldown for \`${command.name}\`. You can use it again <t:${expiredTimestamp}:R>.`,
100+
content: `Please wait, you are on a cooldown for \`${commandName}\`. You can use it again <t:${expiredTimestamp}:R>.`,
95101
});
96102
}
103+
} catch (replyError) {
104+
console.error(`Error applying cooldown for ${commandName} to ${user.tag}:`, replyError);
97105
}
98106

99107
return;
@@ -102,4 +110,4 @@ async function handleCooldown(source, command) {
102110

103111
timestamps.set(user.id, now);
104112
setTimeout(() => timestamps.delete(user.id), cooldownAmount);
105-
}
113+
}

‎events/ready.js

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
const { Events } = require("discord.js");
2-
1+
const { ActivityType, PresenceUpdateStatus,Client,GatewayIntentBits } = require('discord.js');
32
module.exports = {
4-
name: Events.ClientReady,
5-
execute(client) {
6-
console.log(`Logged in as ${client.user.tag}!`);
7-
8-
// You can set the bot's presence (status) here
9-
client.user.setPresence({
10-
activities: [
11-
{ name: 'with code!', type: 'PLAYING' },
12-
],
13-
status: 'dnd',
14-
});
3+
name: 'ready',
4+
once: true,
5+
async execute(client) {
6+
try {
7+
console.log(`Logged in as ${client.user.tag}`);
8+
9+
console.log('Setting presence...');
10+
await client.user.setPresence({
11+
activities: [{ name: 'testing', type: ActivityType.Playing }],
12+
status: PresenceUpdateStatus.DoNotDisturb,
13+
});
1514

16-
// Additional initialization code can go here
17-
console.log('Bot is now ready to handle commands!');
15+
console.log('Presence successfully updated!');
16+
console.log('Current presence:', client.user.presence);
17+
} catch (error) {
18+
console.error('Failed to update presence:', error);
19+
}
1820
},
1921
};

‎index.js

+49-49
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
const fs = require('node:fs');
2-
const path = require('node:path')
3-
const { Client, Collection, GatewayIntentBits } = require('discord.js');
4-
const { token } = require('././config');
1+
const fs = require("node:fs");
2+
const path = require("node:path");
3+
const { Client, Collection, GatewayIntentBits } = require("discord.js");
4+
const { token, clientId } = require("./config");
55

66
const client = new Client({
77
intents: [
88
GatewayIntentBits.Guilds,
99
GatewayIntentBits.GuildMembers,
10-
GatewayIntentBits.GuildPresences,
10+
GatewayIntentBits.GuildPresences, // Required for bot presence
1111
GatewayIntentBits.GuildMessages,
12-
GatewayIntentBits.MessageContent
13-
]
12+
GatewayIntentBits.MessageContent,
13+
GatewayIntentBits.GuildMessageReactions,
14+
GatewayIntentBits.GuildMessageTyping,
15+
GatewayIntentBits.DirectMessages,
16+
GatewayIntentBits.DirectMessageReactions,
17+
GatewayIntentBits.DirectMessageTyping
18+
],
1419
});
15-
client.commands = new Collection();
20+
// Separate collections for slash and prefix commands
21+
client.slashCommands = new Collection();
1622
client.cooldowns = new Collection();
1723

18-
client.once('ready', () => {
19-
console.log(`Logged in as ${client.user ? client.user.tag : 'Unknown'}!`);
24+
const eventsPath = path.join(__dirname, "events");
25+
const slashCommandsPath = path.join(__dirname, "commands", "slash");
26+
const prefixCommandsPath = path.join(__dirname, "commands", "prefix");
2027

21-
// Make sure client.user is not null
22-
if (client.user) {
23-
try {
24-
client.user.setStatus('dnd'); // or whichever status you'd prefer
25-
console.log('Status set to DND');
26-
} catch (error) {
27-
console.error('Error setting status:', error);
28+
// Load events
29+
try {
30+
const eventFiles = fs.readdirSync(eventsPath).filter((file) => file.endsWith(".js"));
31+
for (const file of eventFiles) {
32+
const event = require(path.join(eventsPath, file));
33+
if (event.once) {
34+
client.once(event.name, (...args) => event.execute(...args, client));
35+
} else {
36+
client.on(event.name, (...args) => event.execute(...args, client));
2837
}
29-
} else {
30-
console.error('client.user is null. Unable to set status.');
3138
}
32-
});
33-
// Load slash commands
34-
const slashCommandsPath = path.join(__dirname, 'commands/slash');
35-
const slashCommandFolders = fs.readdirSync(slashCommandsPath);
39+
} catch (error) {
40+
console.error("Error loading events:", error);
41+
}
3642

37-
for (const folder of slashCommandFolders) {
38-
const commandsPath = path.join(slashCommandsPath, folder);
39-
const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
43+
// Load slash commands
44+
try {
45+
const slashCommandFolders = fs.readdirSync(slashCommandsPath);
46+
for (const folder of slashCommandFolders) {
47+
const commandsPath = path.join(slashCommandsPath, folder);
48+
const commandFiles = fs.readdirSync(commandsPath).filter((file) => file.endsWith(".js"));
4049

41-
for (const file of commandFiles) {
42-
const filePath = path.join(commandsPath, file);
43-
const command = require(filePath);
44-
if ('data' in command && 'execute' in command) {
45-
client.commands.set(command.data.name, command);
46-
console.log(`[+] Slash command "${command.data.name}" loaded.`);
47-
} else {
48-
console.log(`[!] The command at ${filePath} is missing a required "data" or "execute" property.`);
50+
for (const file of commandFiles) {
51+
const filePath = path.join(commandsPath, file);
52+
const command = require(filePath);
53+
if (command.data?.name && command.execute) {
54+
client.slashCommands.set(command.data.name, command);
55+
console.log(`[+] Slash command "${command.data.name}" loaded.`);
56+
} else {
57+
console.log(`[!] Invalid slash command at ${filePath}`);
58+
}
4959
}
5060
}
51-
}
52-
// Load events
53-
const eventsPath = path.join(__dirname, 'events');
54-
const eventFiles = fs.readdirSync(eventsPath).filter(file => file.endsWith('.js'));
55-
56-
for (const file of eventFiles) {
57-
const event = require(path.join(eventsPath, file));
58-
if (event.once) {
59-
client.once(event.name, (...args) => event.execute(...args, client));
60-
} else {
61-
client.on(event.name, (...args) => event.execute(...args, client));
62-
}
61+
} catch (error) {
62+
console.error("Error loading slash commands:", error);
6363
}
6464

65-
// Import the prefix command handler (messageCreate.js) if it's not already handled in eventFiles
66-
// Log in to Discord
67-
client.login(token);
65+
client.login(token).catch((error) => {
66+
console.error("Error logging in to Discord:", error);
67+
});

0 commit comments

Comments
 (0)