8.0.1 Update

Events/interactionCreate.js

@@ -16,15 +16,12 @@ try {
 }
 
 module.exports = new Event("interactionCreate", async (client, interaction) => {
-  console.log("Interaction received:", interaction.type); // Log interaction type
 
   if (interaction.type === Discord.InteractionType.ApplicationCommand) {
     const command = client.commands.find(
       (cmd) => cmd.name.toLowerCase() === interaction.commandName
     );
 
-    console.log("Command received:", interaction.commandName); // Log command name
-
     if (interaction.user.bot || !interaction.guild) return;
 
     const NotValid = new Discord.EmbedBuilder()
@@ -68,7 +65,7 @@ module.exports = new Event("interactionCreate", async (client, interaction) => {
 
         await interaction.showModal(modal);
       } else {
-        console.log("Running command:", command.name); // Log running command
+        console.log("\u001b[32m", "[Executed]", "\u001b[37;1m", `${interaction.user.username} has executed ${command.name}`);
         await command.run(interaction);
       }
     } catch (error) {
@@ -109,6 +106,50 @@ module.exports = new Event("interactionCreate", async (client, interaction) => {
           }
           break;
 
+          case "archiveticket":
+              const arcembed = new Discord.EmbedBuilder()
+                .setDescription(msgconfig.Ticket.TicketArchived)
+                .setColor(supportbot.Embed.Colours.Success);
+
+              const CloseButton = new Discord.ButtonBuilder()
+                .setCustomId("confirmCloseTicket")
+                .setLabel(supportbot.Ticket.Close.Confirmation_Button)
+                .setEmoji(supportbot.Ticket.Close.Confirmation_Emoji)
+                .setStyle(supportbot.Ticket.Close.Confirmation_Style);
+
+              const unarchiveButton = new Discord.ButtonBuilder()
+                .setCustomId("unarchiveTicket")
+                .setLabel(supportbot.Buttons.Tickets.Unarchive)
+                .setEmoji(supportbot.Buttons.Tickets.Unarchive_Emoji)
+                .setStyle(supportbot.Buttons.Tickets.Unarchive_Style);
+
+              const ArchivedOptions = new Discord.ActionRowBuilder() 
+                .addComponents(CloseButton, unarchiveButton);
+
+                await interaction.channel.send({
+                  embeds: [arcembed],
+                  components: [ArchivedOptions],
+                });
+
+                await interaction.channel.setArchived(true);
+
+            break;
+  
+        case "lockticket":
+            const lockembed = new Discord.EmbedBuilder()
+              .setDescription(msgconfig.Ticket.TicketLocked)
+              .setColor(supportbot.Embed.Colours.Success);
+
+            await interaction.channel.send({
+              embeds: [lockembed],
+              components: [],
+              ephemeral: true,s
+            });
+
+            await interaction.channel.setLocked(true);
+            
+        break;
+
         case "enableinvites":
           await handleInvites(interaction, true);
           break;
@@ -121,6 +162,20 @@ module.exports = new Event("interactionCreate", async (client, interaction) => {
   }
 
   if (interaction.isButton()) {
+    if (interaction.customId === "unarchiveTicket") {
+      await interaction.channel.setArchived(false);
+
+      const unrcembed = new Discord.EmbedBuilder()
+      .setDescription(msgconfig.Ticket.TicketUnarchived)
+      .setColor(supportbot.Embed.Colours.Success);
+
+      await interaction.update({
+        embeds: [unrcembed],
+        components: [],
+      });
+
+    }
+
     if (interaction.customId === "createticket") {
       if (supportbot.Ticket.TicketReason) {
         const modal = new Discord.ModalBuilder()
@@ -320,6 +375,7 @@ module.exports = new Event("interactionCreate", async (client, interaction) => {
 
   async function handleInvites(interaction, enable) {
     if (supportbot.Ticket.Invites.StaffOnly) {
+      const { getRole, getChannel } = interaction.client;
       const SupportStaff = await getRole(supportbot.Roles.StaffMember.Staff, interaction.guild);
       const Admin = await getRole(supportbot.Roles.StaffMember.Admin, interaction.guild);
 

Events/messageCreate.js

@@ -14,11 +14,10 @@ function loadConfig(path) {
     }
 }
 
-const supportbotai = loadConfig("./Configs/supportbot-ai.yml");
-const supportbot = loadConfig("./Configs/supportbot.yml");
-const cmdconfig = loadConfig("./Configs/commands.yml");
-const msgconfig = loadConfig("./Configs/messages.yml");
-
+const supportbotai = yaml.load(fs.readFileSync("./Configs/supportbot-ai.yml"));
+const supportbot = yaml.load(fs.readFileSync("./Configs/supportbot.yml", "utf8"));
+const cmdconfig = yaml.load(fs.readFileSync("./Configs/commands.yml", "utf8"));
+const msgconfig = yaml.load(fs.readFileSync("./Configs/messages.yml", "utf8"));
 // Validate configuration values
 function validateConfig(config, keys) {
     keys.forEach(key => {
@@ -28,11 +27,6 @@ function validateConfig(config, keys) {
     });
 }
 
-validateConfig(supportbotai, ['General', 'Channels', 'Messages']);
-validateConfig(supportbot, ['Embed']);
-validateConfig(cmdconfig, ['Ping']);
-validateConfig(msgconfig, ['ErrorResponse', 'OpenAIError']);
-
 const CHANNELS = [supportbotai.Channels.AIChannel];
 
 // Initialize Discord client
@@ -69,170 +63,104 @@ async function createPaste(content) {
     }
 }
 
-// Function to fetch latest commands and configuration
-function getDynamicData() {
-    const commands = loadConfig("./Configs/commands.yml");
-    const configurations = {
-        supportbotai: loadConfig("./Configs/supportbot-ai.yml"),
-        supportbot: loadConfig("./Configs/supportbot.yml"),
-        cmdconfig: loadConfig("./Configs/commands.yml"),
-        msgconfig: loadConfig("./Configs/messages.yml"),
-    };
-
-    return { commands, configurations };
-}
-
 // Event handler for message creation
 module.exports = new Event("messageCreate", async (client, message) => {
     if (message.author.bot || !message.guild) return;
     if (!CHANNELS.includes(message.channelId) && !message.mentions.users.has(client.user.id)) return;
 
-    const { commands, configurations } = getDynamicData();
+if (supportbotai.Enabled) {
 
-    if (supportbotai.Enabled) {
-        const sendTypingInterval = setInterval(() => {
-            message.channel.sendTyping();
-        }, 5000);
+    const sendTypingInterval = setInterval(() => {
+        message.channel.sendTyping();
+    }, 5000);
 
-        let conversation = [{
-            role: "system",
-            content: `SupportBot is your friendly neighbourhood support bot. Current date and time: ${new Date().toLocaleString()}.
-            The bot uses a modular command handler where commands are loaded dynamically from the './Commands' directory. Each command has a name, description, and execute method.
-            
-            The main Client class structure:
-            - Commands are loaded from the './Commands/' directory.
-            - Configs are loaded from the './Configs/' directory if enabled.
-            - Events are loaded from the './Events/' directory.
-            - Addons are loaded from the './Addons/' directory if enabled.
-            
-            Example of a command structure:
-            {
-                module.exports = new Command({
-                    name: cmdconfig.Ping.Command,
-                    description: cmdconfig.Ping.Description,
-                    options: [],
-                    permissions: cmdconfig.Ping.Permission,
-                )}
-            }
+    let conversation = [{
+        role: "system",
+        content: "SupportBot is your friendly neighbourhood support bot."
+    }];
 
-            You can find more information about the commands and configuration files in the 'Configs' and 'Commands' directories.
+    let prevMessages = await message.channel.messages.fetch({ limit: 10 });
+    prevMessages = prevMessages.reverse().filter(msg => !msg.author.bot || msg.author.id === client.user.id);
 
-            All commands are loaded into the bot at startup from ./Events/ready.js and ./Client.js.
+    prevMessages.forEach((msg) => {
+        const username = msg.author.username.replace(/\s+/g, '_').replace(/[^\w\s]/gi, '');
 
-            If someone asks you to do something, you can use the 'assist' command to have the bot respond, For example: "Can I speak to a support agent?", You would respond by opening a ticket which is the /Commands/ticket.js file or you can tell them to create a ticket in the channel defined as supportbot.Ticket.
+        conversation.push({
+            role: msg.author.id === client.user.id ? "assistant" : "user",
+            name: username,
+            content: msg.content,
+        });
+    });
 
-            You can find the source code for the bot at https://github.com/EmeraldServices/SupportBot.
-
-            You then need to understand how the bot works. Interactions are handled by the ./Events/interactionCreate.js file.
-            
-            Commands are filtered based on configuration settings and loaded into the bot at startup.
-            
-            Xiled Gaming Network (XGN) is a gaming community that typically offers various services and activities for gamers. 
-            
-            Xiled Gaming Network (XGN) has 4 divisions, Team Xiled International (TXI), The XiledOnes (TXO), Dealers of Death (DOD), Psychotic Solutions (PS)
-            Xiled Gaming Network (XGN) can be found at https://officialxgn.gg/handbook/, This is where you can the code of conduct, policies and other important information for members.
-            You can join XGN with the discord - discord.gg/xgn
-            You can apply to join the XGN Clan - join.officialxgn.gg
-            
-            You can find the founders of XGN under the history section of the handbook. https://officialxgn.gg/handbook/.
-            `
-        }];
-
-        let prevMessages = await message.channel.messages.fetch({ limit: 10 });
-        prevMessages = prevMessages.reverse().filter(msg => !msg.author.bot || msg.author.id === client.user.id);
-
-        prevMessages.forEach((msg) => {
-            const username = msg.author.username.replace(/\s+/g, '_').replace(/[^\w\s]/gi, '');
-
-            conversation.push({
-                role: msg.author.id === client.user.id ? "assistant" : "user",
-                name: username,
-                content: msg.content,
-            });
+    try {
+        const response = await openai.chat.completions.create({
+            model: supportbotai.General.Model,
+            messages: conversation,
+            max_tokens: supportbotai.General.Tokens,
         });
 
-        try {
-            const response = await openai.chat.completions.create({
-                model: supportbotai.General.Model,
-                messages: conversation,
-                max_tokens: supportbotai.General.Tokens,
-            });
+        clearInterval(sendTypingInterval);
 
-            clearInterval(sendTypingInterval);
+        if (response.choices && response.choices.length > 0) {
+            const replyContent = response.choices[0].message.content;
 
-            if (response.choices && response.choices.length > 0) {
-                const replyContent = response.choices[0].message.content;
+            const SupportBotAI = new Discord.EmbedBuilder()
+                .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
+                .setDescription(replyContent)
+                .setColor(supportbotai.Embed.Color)
+                .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
+                .setTimestamp();
 
-                if (replyContent.toLowerCase().startsWith("generate image:")) {
-                    const prompt = replyContent.substring(15).trim();
-                    const imageUrl = await generateImage(prompt);
+            if (replyContent.length > 2000) {
+                const pasteLink = await createPaste(replyContent);
 
-                    const SupportBotAIImage = new Discord.EmbedBuilder()
-                        .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
-                        .setDescription(`Here is the image generated for your prompt: "${prompt}"`)
-                        .setImage(imageUrl)
-                        .setColor(supportbotai.Embed.Color)
-                        .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
-                        .setTimestamp();
-
-                    message.reply({ embeds: [SupportBotAIImage] });
-                } else {
-                    const SupportBotAI = new Discord.EmbedBuilder()
-                        .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
-                        .setDescription(replyContent)
-                        .setColor(supportbotai.Embed.Color)
-                        .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
-                        .setTimestamp();
-
-                    if (replyContent.length > 2000) {
-                        const pasteLink = await createPaste(replyContent);
-
-                        const SupportBotAIPastebin = new Discord.EmbedBuilder()
-                            .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
-                            .setDescription(supportbotai.Messages.MessageTooLong.replace("{pastebin}", pasteLink))
-                            .setColor(supportbotai.Embed.Color)
-                            .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
-                            .setTimestamp();
-
-                        message.reply({ embeds: [SupportBotAIPastebin] });
-                    } else {
-                        message.reply({ embeds: [SupportBotAI] });
-                    }
-                }
-            } else {
-                const SupportBotAIErrorResponse = new Discord.EmbedBuilder()
+                const SupportBotAIPastebin = new Discord.EmbedBuilder()
                     .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
-                    .setDescription(supportbotai.Messages.ErrorResponse)
+                    .setDescription(supportbotai.Messages.MessageTooLong.replace("{pastebin}", pasteLink))
                     .setColor(supportbotai.Embed.Color)
                     .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
                     .setTimestamp();
 
-                message.reply({ embeds: [SupportBotAIErrorResponse], ephemeral: true });
+                message.reply({ embeds: [SupportBotAIPastebin] });
+            } else {
+                message.reply({ embeds: [SupportBotAI] });
             }
-        } catch (error) {
-            clearInterval(sendTypingInterval);
-
+        } else {
             const SupportBotAIErrorResponse = new Discord.EmbedBuilder()
                 .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
-                .setDescription(supportbotai.Messages.OpenAIError)
-                .setColor(supportbot.Embed.Colours.Error)
+                .setDescription(supportbotai.Messages.ErrorResponse)
+                .setColor(supportbotai.Embed.Color)
                 .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
                 .setTimestamp();
 
-            console.error('OpenAI Error:', error);
             message.reply({ embeds: [SupportBotAIErrorResponse], ephemeral: true });
         }
-    }
+    } catch (error) {
+        clearInterval(sendTypingInterval);
 
-    if (!supportbotai.Enabled) {
-        const AIDisabled = new Discord.EmbedBuilder()
+        const SupportBotAIErrorResponse = new Discord.EmbedBuilder()
             .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
-            .setDescription(supportbotai.Messages.AIDisabled)
+            .setDescription(supportbotai.Messages.OpenAIError)
             .setColor(supportbot.Embed.Colours.Error)
             .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
             .setTimestamp();
 
-        message.reply({ embeds: [AIDisabled], ephemeral: true });
-        return;
+        console.error('OpenAI Error:', error);
+        message.reply({ embeds: [SupportBotAIErrorResponse], ephemeral: true });
     }
-});
+
+}
+
+if (supportbotai.Enabled === false) {
+    const AIDisabled = new Discord.EmbedBuilder()
+        .setAuthor({ name: supportbotai.General.Name, iconURL: client.user.displayAvatarURL() })
+        .setDescription(supportbotai.Messages.AIDisabled)
+        .setColor(supportbot.Embed.Colours.Error)
+        .setFooter({ text: supportbotai.Embed.Footer, iconURL: message.author.displayAvatarURL() })
+        .setTimestamp();
+
+    message.reply({ embeds: [AIDisabled], ephemeral: true })
+    return;
+}
+
+});

Events/ready.js

@@ -59,7 +59,7 @@ module.exports = new Event("ready", async (client, interaction) => {
     });
   }
 
-  console.log(`\u001b[32m`, `――――――――――――――――――――――――――――――――――――――――――――`);
+  console.log(`\u001b[33m`, `――――――――――――――――――――――――――――――――――――――――――――`);
   console.log(`    `);
   console.log(`\u001b[31m`, `┏━━━┓╋╋╋╋╋╋╋╋╋╋╋╋╋┏┓┏━━┓╋╋╋┏┓`);
   console.log(`\u001b[31m`, `┃┏━┓┃╋╋╋╋╋╋╋╋╋╋╋╋┏┛┗┫┏┓┃╋╋┏┛┗┓`);
@@ -70,60 +70,22 @@ module.exports = new Event("ready", async (client, interaction) => {
   console.log(`\u001b[31m`, `┗╋╋╋╋╋╋╋┃┃╋┃┃`);
   console.log(`\u001b[31m`, `╋╋╋╋╋╋╋┗┛╋┗┛`);
   console.log(`    `);
-  console.log(`\u001b[32m`, `――――――――――――――――――――――――――――――――――――――――――――`);
+  console.log(`\u001b[33m`, `――――――――――――――――――――――――――――――――――――――――――――`);
+  console.log(`    `);  
+  console.log(`\u001b[33m`, `${supportbot.General.Name} | [${supportbot.SupportBot_Version}]`, `\u001b[32m`, `Connected to Discord`,);
+  console.log("\u001b[32m", "SupportBot created by Emerald Development ");
   console.log(`    `);
-  console.log(
-    `\u001b[31m`,
-    `${supportbot.General.Name} | [${supportbot.SupportBot_Version}]`,
-    `\u001b[32m`,
-    `Connected to Discord`,
-  );
-  
-  console.log(`\u001b[31m`, `SupportBot proudly created by Emerald Development`);
-
+  console.log(`\u001b[33m`, `――――――――――――――――― [Links] ――――――――――――――――――`);
+  console.log("\u001b[32m", "Discord: https://dsc.gg/emerald-dev");
+  console.log("\u001b[32m", "Website: https://emeraldsrv.com");
+  console.log("\u001b[32m", "Community: https://community.emeraldsrv.com");
+  console.log("\u001b[32m", "Documentation: https://docs.emeraldsrv.com");
   console.log(`    `);
-
-  console.log(
-    `\u001b[31m`,
-    `Discord`,
-    `\u001b[32m`,
-    `https://dsc.gg/emerald-dev`,
-  );
-
-  console.log(
-    `\u001b[31m`,
-    `Website`,
-    `\u001b[32m`,
-    `https://emeraldsrv.com`,
-  );
-
-  console.log(
-    `\u001b[31m`,
-    `Marketplace`,
-    `\u001b[32m`,
-    `https://market.emeraldsrv.com`,
-  );
-
-  console.log(
-    `\u001b[31m`,
-    `Documentation`,
-    `\u001b[32m`,
-    `https://emeraldsrv.com/third-party`,
-  );
-
+  console.log(`\u001b[33m`, `――――――――――――――――― [Invite] ――――――――――――――――――`);
+  console.log("\u001b[32m", `Invite URL: https://discord.com/api/oauth2/authorize?client_id=${client.user.id}&permissions=8&scope=bot%20applications.commands`);
   console.log(`    `);
-
-  console.log(
-    `\u001b[31m`,
-    `Invite URL:`,
-    `\u001b[36m`,
-    `https://discord.com/api/oauth2/authorize?client_id=` +
-      client.user.id +
-      `&permissions=8&scope=bot%20applications.commands`
-  );
-
-  console.log(`    `);
-  console.log(`\u001b[32m`, `――――――――――――――――――――――――――――――――――――――――――――`);
+  console.log(`\u001b[33m`, `――――――――――――――――― [Config Check] ――――――――――――――――――`);
+  console.log("\u001b[32m", "Config initialization...");
 
   const roles = [
     supportbot.Roles.StaffMember.Admin,
@@ -168,35 +130,18 @@ module.exports = new Event("ready", async (client, interaction) => {
  //   if (!find) missingCat.push(cat);
  // }
 
-  if (missingR.length > 0) {
-    console.log(
-      "\u001b[31m",
-      `[MISSING CONFIGURATION]`,
-      "\u001b[33m",
-      `The following Roles could not be found in your server.\n`, `\u001b[31m`, `[${missingR.join(
-        ", "
-      )}]`, `\n  `,
-    );
+ const missingRoles = await Promise.all(roles.map(role => getRole(role, client.guilds.cache.first())));
+ const missingChannels = await Promise.all(channels.map(channel => getChannel(channel, client.guilds.cache.first())));
+
+ if (missingRoles.some(role => !role)) {
+  console.log("\u001b[31m", `Missing roles in your server configuration: ${missingRoles.filter(role => !role).join(', ')}`);
   }
 
-  if (missingC.length > 0) {
-    console.log(
-      "\u001b[31m",
-      `[MISSING CONFIGURATION]`,
-      "\u001b[33m",
-      `The following Channels could not be found in your server.\n`, `\u001b[31m`, `[${missingC.join(
-        ", "
-      )}]`, `\n  `
-    );
-  }
-  if (missingCat.length > 0) {
-    console.log(
-      "\u001b[31m",
-      `[MISSING CONFIGURATION]`,
-      "\u001b[33m",
-      `The following Categories could not be found in your server.\n`, `\u001b[31m`, `[${missingCat.join(
-        ", "
-      )}]`, `\n  `,
-    );
+  if (missingChannels.some(channel => !channel)) {
+  console.log("\u001b[31m", `Missing channels in your server configuration: ${missingChannels.filter(channel => !channel).join(', ')}`);
   }
+
+  console.log("\u001b[32m", "Configs initialized, No problems were detected.");
+  console.log(`    `);
+
 });