added

package.json

@@ -26,7 +26,11 @@
   "author": "CorwinDev",
   "license": "ISC",
   "dependencies": {
+<<<<<<< HEAD
     "@discordjs/voice": "^0.14.0",
+=======
+    "@discordjs/voice": "^0.7.5",
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
     "@haileybot/captcha-generator": "^1.7.0",
     "@iamtraction/google-translate": "^2.0.1",
     "@top-gg/sdk": "^3.1.3",
@@ -34,11 +38,19 @@
     "canvacord": "^5.4.8",
     "chalk": "^4.1.2",
     "discord-giveaways": "^6.0.1",
+<<<<<<< HEAD
     "discord-image-generation": "^1.4.15",
     "discord.js": "^14.7.1",
     "dompurify": "^2.4.1",
     "dotenv": "^16.0.3",
     "erela.js": "^2.4.0",
+=======
+    "discord-image-generation": "^1.4.9",
+    "discord.js": "^14.7.1",
+    "dompurify": "^2.3.5",
+    "dotenv": "^10.0.0",
+    "erela.js": "^2.3.3",
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
     "erela.js-apple": "^1.2.6",
     "erela.js-deezer": "^1.0.7",
     "erela.js-facebook": "^1.0.4",

src/bot.js

@@ -162,6 +162,7 @@ fs.readdirSync('./src/handlers').forEach((dir) => {
 client.login(process.env.DISCORD_TOKEN);
 
 process.on('unhandledRejection', error => {
+<<<<<<< HEAD
     console.error('Unhandled promise rejection:', error);
     if (error.length > 1000) error = error.slice(0, 950) + '... view console for details';
     if (error.stack.length > 1000) error.stack = error.stack.slice(0, 950) + '... view console for details';
@@ -175,6 +176,18 @@ process.on('unhandledRejection', error => {
             {
                 name: "Stack error",
                 value: error.stack ? Discord.codeBlock(error.stack) : "No stack error",
+=======
+    const embed = new Discord.EmbedBuilder()
+        .setTitle(`🚨・Unhandled promise rejection`)
+        .setFields([
+            {
+                name: `Error`,
+                value: `\`\`\`${error}\`\`\``,
+            },
+            {
+                name: `Stack error`,
+                value: `\`\`\`${error.stack}\`\`\``,
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
             }
         ])
         .setColor(client.config.colors.normal)
@@ -189,7 +202,11 @@ process.on('unhandledRejection', error => {
 process.on('warning', warn => {
     const embed = new Discord.EmbedBuilder()
         .setTitle(`🚨・New warning found`)
+<<<<<<< HEAD
         .addFields([
+=======
+        .setFields([
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
             {
                 name: `Warn`,
                 value: `\`\`\`${warn}\`\`\``,
@@ -207,7 +224,11 @@ process.on('warning', warn => {
 client.on('shardError', error => {
     const embed = new Discord.EmbedBuilder()
         .setTitle(`🚨・A websocket connection encountered an error`)
+<<<<<<< HEAD
         .addFields([
+=======
+        .setFields([
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
             {
                 name: `Error`,
                 value: `\`\`\`${error}\`\`\``,

src/commands/developers/eval.js

@@ -57,7 +57,11 @@ module.exports = async (client, interaction, args) => {
             });
         }
         else {
+<<<<<<< HEAD
             const output = new Discord.AttachmentBuilder(Buffer.from(outputResponse), { name: 'output.txt' });
+=======
+            const output = new Discord.MessageAttachment(Buffer.from(outputResponse), 'output.txt');
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
             var embed2 = new Discord.EmbedBuilder()
                 .setAuthor(client.user.username, client.user.avatarURL())
                 .addFields(

src/handlers/helppanel/changelogs.js

@@ -2,6 +2,10 @@ const Discord = require('discord.js');
 
 module.exports = async (client) => {
     client.on('interactionCreate', async (interaction) => {
+<<<<<<< HEAD
+=======
+        console.log(interaction)
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
         if (!interaction.isStringSelectMenu()) return;
 
         if (interaction.customId == "Bot-helppanel") {

src/index.js

@@ -4,6 +4,10 @@ require('dotenv').config('./.env');
 
 const webhook = require("./config/webhooks.json");
 const config = require("./config/bot.js");
+<<<<<<< HEAD
+=======
+// Check if .env webhook_id and webhook_token are set
+>>>>>>> d66e109605f85a2a9d710732e8db419070b0f6e8
 if (process.env.WEBHOOK_ID && process.env.WEBHOOK_TOKEN) {
     webhook.startLogs.id = process.env.WEBHOOK_ID;
     webhook.startLogs.token = process.env.WEBHOOK_TOKEN;