feat: shorten code + add /database reconnect

wdhdev · Jun 25, 2023 · 87800d1 · 87800d1
1 parent 5c87242
commit 87800d1
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 132 deletions.
diff --git a/src/commands/developer/database.js b/src/commands/developer/database.js
@@ -1,4 +1,5 @@
 const emoji = require("../../config.json").emojis;
+const mongoose = require("mongoose");
 
 const devSchema = require("../../models/devSchema");
 
@@ -37,6 +38,13 @@ module.exports = {
                     required: true
                 }
             ]
+        },
+
+        {
+            type: 1,
+            name: "reconnect",
+            description: "Reconnect the bot to the database.",
+            options: []
         }
     ],
     default_member_permissions: null,
@@ -140,6 +148,21 @@ module.exports = {
 
                 return;
             }
+
+            if(interaction.options.getSubcommand() === "reconnect") {
+                await mongoose.connection.close();
+                console.log("Disconnected from Database!");
+
+                const database = require("../../util/database/connect");
+                await database();
+
+                const result = new Discord.EmbedBuilder()
+                    .setColor(client.config_embeds.default)
+                    .setDescription(`${emoji.successful} Reconnected to the database!`)
+
+                await interaction.editReply({ embeds: [result] });
+                return;
+            }
         } catch(err) {
             client.logCommandError(err, interaction, Discord);
         }

diff --git a/src/handlers/button.js b/src/handlers/button.js
@@ -4,10 +4,9 @@ module.exports = (client) => {
     loadButtons(client);
 
     const emoji = require("../config.json").emojis;
-    const Sentry = require("@sentry/node");
 
     client.logButtonError = async function(err, interaction, Discord) {
-        Sentry.captureException(err);
+        client.sentry.captureException(err);
 
         const error = new Discord.EmbedBuilder()
             .setColor(client.config_embeds.error)

diff --git a/src/handlers/command.js b/src/handlers/command.js
@@ -4,10 +4,9 @@ module.exports = (client) => {
     loadCommands(client);
 
     const emoji = require("../config.json").emojis;
-    const Sentry = require("@sentry/node");
 
     client.logCommandError = async function(err, interaction, Discord) {
-        Sentry.captureException(err);
+        client.sentry.captureException(err);
 
         const error = new Discord.EmbedBuilder()
             .setColor(client.config_embeds.error)

diff --git a/src/handlers/event.js b/src/handlers/event.js
@@ -3,10 +3,8 @@ module.exports = (client, Discord) => {
 
     loadEvents(client, Discord);
 
-    const Sentry = require("@sentry/node");
-
     client.logEventError = async function(err) {
-        Sentry.captureException(err);
+        client.sentry.captureException(err);
     }
 
     require("dotenv").config();

diff --git a/src/index.js b/src/index.js
@@ -1,115 +1,106 @@
-const Sentry = require("@sentry/node");
+(async () => {
+    const Sentry = require("@sentry/node");
 
-require("dotenv").config();
+    require("dotenv").config();
 
-Sentry.init({
-    dsn: process.env.sentry_dsn,
-    tracesSampleRate: 1.0
-})
+    Sentry.init({
+        dsn: process.env.sentry_dsn,
+        tracesSampleRate: 1.0
+    })
 
-const config = require("./config.json");
+    const config = require("./config.json");
 
-const Discord = require("discord.js");
-const client = new Discord.Client({
-    intents: 3276799,
-    presence: {
-        activities: [
-            {
-                name: config.presence.activity,
-                type: config.presence.activityType,
-            }
-        ],
-        status: config.presence.status
-    }
-})
+    const Discord = require("discord.js");
+    const client = new Discord.Client({
+        intents: 3276799,
+        presence: {
+            activities: [
+                {
+                    name: config.presence.activity,
+                    type: config.presence.activityType,
+                }
+            ],
+            status: config.presence.status
+        }
+    })
 
-// Error Handling
-client.on("error", (err) => {
-    Sentry.captureException(err);
-    console.error(err);
-})
+    // Error Handling
+    client.on("error", (err) => Sentry.captureException(err));
+    client.on("warn", (warn) => Sentry.captureMessage(warn));
+    process.on("unhandledRejection", (err) => Sentry.captureException(err));
 
-client.on("warn", (warn) => {
-    Sentry.captureMessage(warn);
-    console.warn(warn);
-})
+    // Connect to Database
+    const database = require("./util/database/connect");
+    await database();
 
-process.on("unhandledRejection", (err) => {
-    Sentry.captureException(err);
-    console.error(err);
-})
+    // Configs
+    client.config_channels = config.channels;
+    client.config_default = config.default;
+    client.config_embeds = config.embeds;
+    client.config_emojis = config.emojis;
+    client.config_presence = config.presence;
+    client.config_roles = config.roles;
 
-// Connect to Database
-const database = require("./util/database");
-database();
+    // Handlers
+    client.buttons = new Discord.Collection();
+    client.commands = new Discord.Collection();
+    client.events = new Discord.Collection();
 
-// Configs
-client.config_channels = config.channels;
-client.config_default = config.default;
-client.config_embeds = config.embeds;
-client.config_emojis = config.emojis;
-client.config_presence = config.presence;
-client.config_roles = config.roles;
+    ["button", "command", "event"].forEach(handler => {
+        require(`./handlers/${handler}`) (client, Discord);
+    })
 
-// Handlers
-client.buttons = new Discord.Collection();
-client.commands = new Discord.Collection();
-client.events = new Discord.Collection();
+    // Login
+    client.login(process.env.token);
 
-["button", "command", "event"].forEach(handler => {
-    require(`./handlers/${handler}`) (client, Discord);
-})
+    // Constants
+    client.commandIds = new Discord.Collection();
+    client.sentry = Sentry;
 
-// Login
-client.login(process.env.token);
-
-// Global
-client.sentry = Sentry;
-client.commandIds = new Discord.Collection();
-
-client.validPermissions = [
-    "CreateInstantInvite",
-    "KickMembers",
-    "BanMembers",
-    "Administrator",
-    "ManageChannels",
-    "ManageGuild",
-    "AddReactions",
-    "ViewAuditLog",
-    "PrioritySpeaker",
-    "Stream",
-    "ViewChannel",
-    "SendMessages",
-    "SendTTSMessages",
-    "ManageMessages",
-    "EmbedLinks",
-    "AttachFiles",
-    "ReadMessageHistory",
-    "MentionEveryone",
-    "UseExternalEmojis",
-    "ViewGuildInsights",
-    "Connect",
-    "Speak",
-    "MuteMembers",
-    "DeafenMembers",
-    "MoveMembers",
-    "UseVAD",
-    "ChangeNickname",
-    "ManageNicknames",
-    "ManageRoles",
-    "ManageWebhooks",
-    "ManageEmojisAndStickers",
-    "UseApplicationCommands",
-    "RequestToSpeak",
-    "ManageEvents",
-    "ManageThreads",
-    "CreatePublicThreads",
-    "CreatePrivateThreads",
-    "UseExternalStickers",
-    "SendMessagesInThreads",
-    "UseEmbeddedActivities",
-    "ModerateMembers",
-    "ViewCreatorMonetizationAnalytics",
-    "UseSoundboard",
-    "SendVoiceMessages"
-]
+    client.validPermissions = [
+        "CreateInstantInvite",
+        "KickMembers",
+        "BanMembers",
+        "Administrator",
+        "ManageChannels",
+        "ManageGuild",
+        "AddReactions",
+        "ViewAuditLog",
+        "PrioritySpeaker",
+        "Stream",
+        "ViewChannel",
+        "SendMessages",
+        "SendTTSMessages",
+        "ManageMessages",
+        "EmbedLinks",
+        "AttachFiles",
+        "ReadMessageHistory",
+        "MentionEveryone",
+        "UseExternalEmojis",
+        "ViewGuildInsights",
+        "Connect",
+        "Speak",
+        "MuteMembers",
+        "DeafenMembers",
+        "MoveMembers",
+        "UseVAD",
+        "ChangeNickname",
+        "ManageNicknames",
+        "ManageRoles",
+        "ManageWebhooks",
+        "ManageEmojisAndStickers",
+        "UseApplicationCommands",
+        "RequestToSpeak",
+        "ManageEvents",
+        "ManageThreads",
+        "CreatePublicThreads",
+        "CreatePrivateThreads",
+        "UseExternalStickers",
+        "SendMessagesInThreads",
+        "UseEmbeddedActivities",
+        "ModerateMembers",
+        "ViewCreatorMonetizationAnalytics",
+        "UseSoundboard",
+        "SendVoiceMessages"
+    ]
+})()
diff --git a/src/scripts/register.js b/src/scripts/register.js
@@ -48,4 +48,4 @@ module.exports = async (client) => {
             console.error(err);
         }
     })();
-}
+}
diff --git a/src/util/database.js b/src/util/database.js
diff --git a/src/util/database/connect.js b/src/util/database/connect.js
@@ -0,0 +1,17 @@
+const mongoose = require("mongoose");
+const Sentry = require("@sentry/node");
+
+require("dotenv").config();
+
+module.exports = async function () {
+    return mongoose.connect(process.env.database, {
+        keepAlive: true,
+        useNewUrlParser: true,
+        useUnifiedTopology: true
+    }).then(() => {
+        console.log("Connected to Database!");
+    }).catch(err => {
+        Sentry.captureException(err);
+        process.exit(1);
+    })
+}