fix

Author: Killerclaws12

Events/Client/Ready.js

@@ -1,62 +1,10 @@
-const { Discord, ActivityType } = require("discord.js");
+const { Discord, ActivityType } = require('discord.js');
 
-const index = require("../../index.js");
-const { loadCommands } = require("../../Handlers/commandHandler");
-const { fetchAllMembers } = require("../../Functions/memberTracking.js");
+const index = require('../../index.js');
+const { loadCommands } = require('../../Handlers/commandHandler');
+const { fetchAllMembers } = require('../../Functions/memberTracking.js');
 
 module.exports = {
-<<<<<<< HEAD
-  name: "ready",
-  once: true,
-  /**
-   * @param {Discord.Client} client
-   */
-  async execute(client) {
-    await loadCommands(client);
-    await client.expiringDocumentsManager.infractions.init();
-    await client.expiringDocumentsManager.giveaways.init();
-    await client.expiringDocumentsManager.reminders.init();
-
-    if (process.env.LIVE === "true") {
-      process.on("uncaughtException", async (e) =>
-        console.log(e.stack || "Unknown Error")
-      );
-      process.on("unhandledRejection", async (e) =>
-        console.log(e.stack || "Unknown Rejection")
-      );
-    }
-
-    index.server.listen(2053, () => console.log("The client is now ready."));
-
-    // Check if maintenance mode is enabled
-    const maintenanceMode = false; // Replace with your own check for maintenance mode
-    if (maintenanceMode) {
-      // Set bot status to "Maintenance Mode"
-      client.user.setPresence({
-        activities: [{ name: "Maintenance Mode", type: ActivityType.Watching }],
-        status: "dnd",
-      });
-      // Disable all commands
-      client.commands.forEach((command) => {
-        command.enabled = false;
-      });
-      // Return to prevent further execution
-      return;
-    }
-
-    client.user.setPresence({
-      activities: [
-        {
-          name: `${client.guilds.cache.size} servers!`,
-          type: ActivityType.Watching,
-        },
-      ],
-      status: "online",
-    });
-
-    await fetchAllMembers(client);
-  },
-=======
     name: 'ready',
     once: true,
     /**
@@ -77,14 +25,32 @@ module.exports = {
 
         index.server.listen(2053, () => console.log('The client is now ready.'));
 
+        // Check if maintenance mode is enabled
+        const maintenanceMode = false; // Replace with your own check for maintenance mode
+        if (maintenanceMode) {
+            // Set bot status to "Maintenance Mode"
+            client.user.setPresence({
+                activities: [{ name: 'Maintenance Mode', type: ActivityType.Watching }],
+                status: 'dnd',
+            });
+            // Disable all commands
+            client.commands.forEach((command) => {
+                command.enabled = false;
+            });
+            // Return to prevent further execution
+            return;
+        }
+
         client.user.setPresence({
             activities: [
-                { name: `${client.guilds.cache.size} servers!`, type: ActivityType.Watching },
+                {
+                    name: `${client.guilds.cache.size} servers!`,
+                    type: ActivityType.Watching,
+                },
             ],
             status: 'online',
         });
 
         await fetchAllMembers(client);
     },
->>>>>>> 373f9f29defc46f95764544e28e8eee070281d40
 };

index.js

@@ -172,32 +172,6 @@ app.use('/', router);
 module.exports.client = client;
 module.exports.server = server;
 
-<<<<<<< HEAD
-client.on("guildCreate", async (guild) => {
-  const whitelist = [
-    "1093043992553336882",
-    "1085642427286696026",
-    "1092158965212790877",
-    "992340846328434798",
-  ]; // replace with your whitelist of server IDs
-  if (!whitelist.includes(guild.id)) {
-    await guild.leave();
-  }
-});
-
-/*client.on("guildCreate", async (guild) => {
-  const whitelist = await Whitelist.find({}, { _id: 0, serverID: 1 }).lean();
-  const serverID = whitelist.map((w) => w.serverID);
-  if (!serverID.includes(guild.id)) {
-    await guild.leave();
-  }
-});*/ //Soon
-
-client.on("messageCreate", (message) => {
-  if (message.mentions.has(client.user)) {
-    message.reply("Hello! My prefix is `/`");
-  }
-=======
 client.on('guildCreate', async (guild) => {
     const whitelist = ['1093043992553336882', '1085642427286696026', '1092158965212790877']; // replace with your whitelist of server IDs
     if (!whitelist.includes(guild.id)) {
@@ -209,7 +183,6 @@ client.on('messageCreate', (message) => {
     if (message.mentions.has(client.user)) {
         message.reply('Hello! My prefix is `/`');
     }
->>>>>>> 373f9f29defc46f95764544e28e8eee070281d40
 });
 
 Mongoose.connect(process.env.MONGODB_URL).then(async () => {

package.json

@@ -1,37 +1,4 @@
 {
-<<<<<<< HEAD
-  "name": "guardianv-two",
-  "version": "1.7.0",
-  "main": "index.js",
-  "license": "Apache",
-  "scripts": {
-    "start": "node index.js",
-    "dev": "nodemon index.js"
-  },
-  "dependencies": {
-    "@octokit/rest": "^19.0.7",
-    "ascii-table": "^0.0.9",
-    "axios": "^1.2.1",
-    "canvacord": "^5.4.8",
-    "captcha-generator-alphanumeric": "^1.10.0",
-    "discord-html-transcripts": "^3.1.2",
-    "discord.js": "^14.7.1",
-    "dotenv": "^16.0.3",
-    "express": "^4.18.2",
-    "fs": "^0.0.1-security",
-    "glob": "^8.0.3",
-    "moment": "^2.29.4",
-    "mongoose": "^6.8.1",
-    "ms": "^2.1.3",
-    "node-fetch": "^3.3.1",
-    "nodemon": "^2.0.20",
-    "octokit": "^2.0.14",
-    "os": "^0.1.2"
-  },
-  "devDependencies": {
-    "@types/mongoose": "^5.11.97"
-  }
-=======
     "name": "guardianv-two",
     "version": "1.7.0",
     "main": "index.js",
@@ -64,5 +31,4 @@
     "devDependencies": {
         "@types/mongoose": "^5.11.97"
     }
->>>>>>> 373f9f29defc46f95764544e28e8eee070281d40
 }