Additional mysql conversions + bug fixes

TheMonDon · TheMonDon · commit 3f4ce013b592 · 2026-03-11T21:02:16.000-05:00
diff --git a/commands/Moderator/ban.js b/commands/Moderator/ban.js
@@ -1,7 +1,5 @@
 const Command = require('../../base/Command.js');
 const { EmbedBuilder } = require('discord.js');
-const { QuickDB } = require('quick.db');
-const db = new QuickDB();
 
 class Ban extends Command {
   constructor(client) {
@@ -21,7 +19,6 @@ class Ban extends Command {
       return this.client.util.errorEmbed(msg, 'The bot is missing Ban Members permission.');
 
     const successColor = msg.settings.embedSuccessColor;
-    const logChan = await db.get(`servers.${msg.guild.id}.logs.channel`);
     const regex = /^\d{17,19}$/;
 
     let banMem = await this.client.util.getMember(msg, args[0]);
@@ -60,7 +57,23 @@ class Ban extends Command {
 
     msg.guild.members.ban(banMem, { reason });
 
-    if (logChan) {
+    const [logRows] = await this.client.db.execute(
+      /* sql */ `
+        SELECT
+          channel_id,
+          member_banned,
+          no_log_channels
+        FROM
+          log_settings
+        WHERE
+          server_id = ?
+      `,
+      [msg.guild.id],
+    );
+    const logChannelID = logRows[0].channel_id;
+    const logSystem = logRows[0].member_banned;
+
+    if (logRows.length && logChannelID && logSystem === 1) {
       // Embed for reply
       const em2 = new EmbedBuilder()
         .setTitle('User Banned')
@@ -69,7 +82,7 @@ class Ban extends Command {
         .setDescription('Full info posted in the log channel.');
 
       const reply = await msg.channel.send({ embeds: [em2] });
-      msg.guild.channels.cache.get(logChan).send({ embeds: [em] });
+      msg.guild.channels.cache.get(logChannelID).send({ embeds: [em] });
 
       setTimeout(() => {
         reply.delete();
diff --git a/commands/Moderator/kick.js b/commands/Moderator/kick.js
@@ -1,7 +1,5 @@
 const Command = require('../../base/Command.js');
 const { EmbedBuilder } = require('discord.js');
-const { QuickDB } = require('quick.db');
-const db = new QuickDB();
 
 class Kick extends Command {
   constructor(client) {
@@ -18,10 +16,10 @@ class Kick extends Command {
 
   async run(msg, args) {
     if (msg.guild.members.me.permissions.has('ManageMessages')) msg.delete();
-    if (!msg.guild.members.me.permissions.has('KickMembers'))
+    if (!msg.guild.members.me.permissions.has('KickMembers')) {
       return this.client.util.errorEmbed(msg, 'The bot is missing the Kick Members permission.');
+    }
 
-    const logChan = await db.get(`servers.${msg.guild.id}.logs.channel`);
     const kickMem = await this.client.util.getMember(msg, args[0]);
     if (!kickMem) return this.client.util.errorEmbed(msg, 'Member is either not in server or is invalid.');
     if (!kickMem.kickable) return this.client.util.errorEmbed(msg, 'The member is not kickable by the bot.');
@@ -32,6 +30,22 @@ class Kick extends Command {
 
     kickMem.kick(reason);
 
+    const [logRows] = await this.client.db.execute(
+      /* sql */ `
+        SELECT
+          channel_id,
+          member_kicked,
+          no_log_channels
+        FROM
+          log_settings
+        WHERE
+          server_id = ?
+      `,
+      [msg.guild.id],
+    );
+    const logChannelID = logRows[0].channel_id;
+    const logSystem = logRows[0].member_kicked;
+
     const em = new EmbedBuilder()
       .setTitle('User Kicked')
       .setAuthor({ name: msg.member.displayName, iconURL: msg.member.displayAvatarURL() })
@@ -44,15 +58,15 @@ class Kick extends Command {
       .setFooter({ text: `User ID: ${kickMem.id}` })
       .setTimestamp();
 
-    if (logChan) {
+    if (logRows.length && logChannelID && logSystem === 1) {
       const em2 = new EmbedBuilder()
         .setTitle('User Kicked')
         .setColor('#FFA500')
         .setAuthor({ name: msg.member.displayName, iconURL: msg.member.displayAvatarURL() })
         .setDescription('Full info posted in the log channel.');
 
       const reply = await msg.channel.send({ embeds: [em2] });
-      msg.guild.channels.cache.get(logChan).send({ embeds: [em] });
+      msg.guild.channels.cache.get(logChannelID).send({ embeds: [em] });
       setTimeout(() => {
         reply.delete();
       }, 30000);
diff --git a/commands/Moderator/unban.js b/commands/Moderator/unban.js
@@ -1,7 +1,5 @@
 const Command = require('../../base/Command.js');
 const { EmbedBuilder } = require('discord.js');
-const { QuickDB } = require('quick.db');
-const db = new QuickDB();
 
 class Unban extends Command {
   constructor(client) {
@@ -17,10 +15,9 @@ class Unban extends Command {
   }
 
   async run(msg, args) {
-    if (!msg.guild.members.me.permissions.has('BanMembers'))
+    if (!msg.guild.members.me.permissions.has('BanMembers')) {
       return msg.channel.send('The bot is missing Ban Members permission.');
-
-    const logChan = await db.get(`servers.${msg.guild.id}.logs.channel`);
+    }
 
     // Regex to check if the input for userID is a number
     const regex = /\d+/g;
@@ -29,7 +26,11 @@ class Unban extends Command {
     const reason = args.join(' ');
     const successColor = msg.settings.embedSuccessColor;
 
-    if (!userID.matches(regex)) return msg.channel.send(`Please provide a valid User ID. \nInput: ${userID}`);
+    if (!userID.matches(regex)) {
+      return msg.channel.send(
+        `Please provide a valid User ID. \nInput: ${this.client.util.clean(this.client, userID)}`,
+      );
+    }
     if (msg.guild.members.me.permissions.has('ManageMessages')) msg.delete();
 
     try {
@@ -42,6 +43,23 @@ class Unban extends Command {
       const unbanP = await msg.guild.members.unban(userID, { reason }).catch((err) => {
         return msg.channel.send(`An error occurred: ${err}`);
       });
+
+      const [logRows] = await this.client.db.execute(
+        /* sql */ `
+          SELECT
+            channel_id,
+            member_banned,
+            no_log_channels
+          FROM
+            log_settings
+          WHERE
+            server_id = ?
+        `,
+        [msg.guild.id],
+      );
+      const logChannelID = logRows[0].channel_id;
+      const logSystem = logRows[0].member_banned;
+
       const embed = new EmbedBuilder()
         .setTitle('Member Unbanned')
         .setAuthor({ name: msg.member.displayName, iconURL: msg.member.displayAvatarURL() })
@@ -54,14 +72,14 @@ class Unban extends Command {
         .setFooter({ text: `ID: ${unbanP.id}` })
         .setTimestamp();
 
-      if (logChan) {
+      if (logRows.length && logChannelID && logSystem === 1) {
         const em2 = new EmbedBuilder()
           .setTitle('User unbanned')
           .setColor(successColor)
           .setAuthor({ name: msg.member.displayName, iconURL: msg.member.displayAvatarURL() })
           .setDescription('Full info posted in the log channel.');
 
-        msg.guild.channels.cache.get(logChan).send({ embeds: [embed] });
+        msg.guild.channels.cache.get(logChannelID).send({ embeds: [embed] });
         return msg.channel.send({ embeds: [em2] }).then((msg) => {
           setTimeout(() => msg.delete(), 30000);
         });
diff --git a/events/Guild/guildCreate.mjs b/events/Guild/guildCreate.mjs
@@ -1,6 +1,3 @@
-import { QuickDB } from 'quick.db';
-const db = new QuickDB();
-
 export async function run(client, guild) {
   // Wait 1 second to try and solve guild somehow being undefined
   client.util.wait(1000);
@@ -11,11 +8,6 @@ export async function run(client, guild) {
     );
     client.logger.log(`New guild has been joined: ${guild.name} (${guild.id}) with ${guild.memberCount - 1} members`);
 
-    const leaveTimestamp = await db.get(`servers.${guild.id}.leave_timestamp`);
-    if (leaveTimestamp) {
-      await db.delete(`servers.${guild.id}.leave_timestamp`);
-    }
-
     const [timestampRows] = await client.db.execute(
       /* sql */ `
         SELECT
diff --git a/events/Guild/guildDelete.mjs b/events/Guild/guildDelete.mjs
@@ -1,6 +1,3 @@
-import { QuickDB } from 'quick.db';
-const db = new QuickDB();
-
 export async function run(client, guild) {
   // Wait 1 second to try and solve guild somehow being undefined
   client.util.wait(1000);
@@ -13,8 +10,6 @@ export async function run(client, guild) {
       client.logger.log(`Left guild: ${guild.name} (${guild.id}) with ${guild.memberCount} members`);
     }
 
-    await db.set(`servers.${guild.id}.leave_timestamp`, Date.now());
-
     const timestamp = Date.now();
     await client.db.execute(
       /* sql */ `
diff --git a/index.js b/index.js
@@ -899,6 +899,8 @@ const loadMysql = async () => {
         member_join BOOLEAN DEFAULT FALSE,
         member_leave BOOLEAN DEFAULT FALSE,
         member_timeout BOOLEAN DEFAULT FALSE,
+        member_kicked BOOLEAN DEFAULT FALSE,
+        member_banned BOOLEAN DEFAULT FALSE,
         message_deleted BOOLEAN DEFAULT FALSE,
         message_updated BOOLEAN DEFAULT FALSE,
         role_created BOOLEAN DEFAULT FALSE,
diff --git a/slash_commands/Administrator/auto-role.js b/slash_commands/Administrator/auto-role.js
@@ -1,6 +1,4 @@
 const { SlashCommandBuilder, InteractionContextType, EmbedBuilder } = require('discord.js');
-const { QuickDB } = require('quick.db');
-const db = new QuickDB();
 
 exports.conf = {
   permLevel: 'Administrator',
@@ -47,23 +45,46 @@ exports.run = async (interaction) => {
     .setColor(interaction.settings.embedColor)
     .setAuthor({ name: interaction.member.displayName, iconURL: interaction.member.displayAvatarURL() });
 
+  const [autoRoleRows] = await interaction.client.db.execute(
+    /* sql */ `
+      SELECT
+        roles
+      FROM
+        auto_roles
+      WHERE
+        server_id = ?
+    `,
+    [interaction.guild.id],
+  );
+  let autoRoles = autoRoleRows[0]?.roles ? JSON.parse(autoRoleRows[0].roles) : [];
+
   switch (type) {
     case 'add': {
-      const autoRoles = (await db.get(`servers.${interaction.guild.id}.autoRoles`)) || [];
       if (autoRoles.includes(role.id)) {
         embed.setDescription('This role is already set as an auto-role.');
         return interaction.editReply({ embeds: [embed] });
       }
 
       autoRoles.push(role.id);
-      await db.set(`servers.${interaction.guild.id}.autoRoles`, autoRoles);
+      await interaction.client.db.execute(
+        /* sql */
+        `
+          INSERT INTO
+            auto_roles (server_id, roles)
+          VALUES
+            (?, ?) ON DUPLICATE KEY
+          UPDATE roles =
+          VALUES
+            (roles)
+        `,
+        [interaction.guild.id, JSON.stringify(autoRoles)],
+      );
 
       embed.setDescription(`The ${role} role will be given to all new members when they join the server.`);
       return interaction.editReply({ embeds: [embed] });
     }
 
     case 'remove': {
-      let autoRoles = (await db.get(`servers.${interaction.guild.id}.autoRoles`)) || [];
       if (!autoRoles.includes(role.id)) {
         embed
           .setDescription(`The ${role} role is not as as an auto-role.`)
@@ -72,15 +93,25 @@ exports.run = async (interaction) => {
       }
 
       autoRoles = autoRoles.filter((r) => r !== role.id);
-      await db.set(`servers.${interaction.guild.id}.autoRoles`, autoRoles);
+      await interaction.client.db.execute(
+        /* sql */
+        `
+          INSERT INTO
+            auto_roles (server_id, roles)
+          VALUES
+            (?, ?) ON DUPLICATE KEY
+          UPDATE roles =
+          VALUES
+            (roles)
+        `,
+        [interaction.guild.id, JSON.stringify(autoRoles)],
+      );
 
       embed.setDescription(`The ${role} role will no longer be given to new members when they join the server.`);
       return interaction.editReply({ embeds: [embed] });
     }
 
     case 'list': {
-      const autoRoles = (await db.get(`servers.${interaction.guild.id}.autoRoles`)) || [];
-
       // Fetch all roles to ensure uncached roles are included
       const allRoles = await interaction.guild.roles.fetch();
 
@@ -89,7 +120,19 @@ exports.run = async (interaction) => {
 
       // Update the database if roles were removed
       if (validRoles.length !== autoRoles.length) {
-        await db.set(`servers.${interaction.guild.id}.autoRoles`, validRoles);
+        await interaction.client.db.execute(
+          /* sql */
+          `
+            INSERT INTO
+              auto_roles (server_id, roles)
+            VALUES
+              (?, ?) ON DUPLICATE KEY
+            UPDATE roles =
+            VALUES
+              (roles)
+          `,
+          [interaction.guild.id, JSON.stringify(validRoles)],
+        );
       }
 
       // If no valid roles remain, send an appropriate message
diff --git a/slash_commands/Economy/balance.js b/slash_commands/Economy/balance.js
diff --git a/slash_commands/Economy/blackjack.js b/slash_commands/Economy/blackjack.js
diff --git a/slash_commands/Moderator/unban.js b/slash_commands/Moderator/unban.js
