fix DB inconsistencies (requires migration)

removes the 'fix' to some IDs being stored as <#> too, as this requires the DB to be manually migrated anyway to prevent data loss

Author: ZakaHaceCosas

docker-compose.yml

@@ -6,4 +6,3 @@ services:
     volumes:
       - ./data.db:/app/data.db
       - ./.env:/app/.env
-

src/utils/channelCheck.ts

@@ -39,7 +39,7 @@ export async function channelCheck(options: {
 
   async function reset() {
     await dm?.send({ embeds: [embed] });
-    await resetSetting(guild.id, setting.category, setting.setting);
+    resetSetting(guild.id, setting.category, setting.setting);
     return false;
   }
 

src/utils/database/settings.ts

@@ -262,7 +262,7 @@ export async function getSetting<
     return null;
   }
 
-  const res = getQuery.all(JSON.stringify(guildID), `${key}.${setting}`) as TypeOfDefinition<
+  const res = getQuery.all(guildID, `${key}.${setting}`) as TypeOfDefinition<
     typeof tableDefinition
   >[];
   const set = settingsDefinition[key].settings[setting];
@@ -281,8 +281,6 @@ export async function getSetting<
         return (Number(value) == 1 ? true : false) as SqlType<typeof set.type>;
       case "INTEGER":
         return parseInt(value) as SqlType<typeof set.type>;
-      case "CHANNEL":
-        return value.replace("<#", "").replace(">", "");
       default:
         return value as SqlType<typeof set.type>;
     }
@@ -307,27 +305,27 @@ export async function getSettingCategory<K extends keyof typeof settingsDefiniti
   return array;
 }
 
-export async function setSetting<
+export function setSetting<
   K extends keyof typeof settingsDefinition,
   S extends keyof (typeof settingsDefinition)[K]["settings"],
 >(guildID: string, key: K, setting: S, value: any) {
   const set = Array.isArray(value) ? dekominator(value) : value;
-  deleteQuery.all(JSON.stringify(guildID), `${key}.${setting}`);
-  insertQuery.run(JSON.stringify(guildID), `${key}.${setting}`, set);
+  deleteQuery.all(guildID, `${key}.${setting}`);
+  insertQuery.run(guildID, `${key}.${setting}`, set);
 }
 
-export async function resetSetting<
+export function resetSetting<
   K extends keyof typeof settingsDefinition,
   S extends keyof (typeof settingsDefinition)[K]["settings"],
 >(guildID: string, key: K, setting: S) {
-  deleteQuery.run(JSON.stringify(guildID), `${key}.${setting}`);
+  deleteQuery.run(guildID, `${key}.${setting}`);
 }
 
-export async function resetSettingCategory<K extends keyof typeof settingsDefinition>(
+export function resetSettingCategory<K extends keyof typeof settingsDefinition>(
   guildID: string,
   key: K,
 ) {
-  deleteCategoryQuery.run(JSON.stringify(guildID), `%${key}%`);
+  deleteCategoryQuery.run(guildID, `%${key}%`);
 }
 
 export function listPublicServers(): Promise<
@@ -338,14 +336,14 @@ export function listPublicServers(): Promise<
   }[]
 > {
   const publicGuildSet = new Set(
-    (listPublicQuery.all() as TypeOfDefinition<typeof tableDefinition>[]).map(entry =>
-      JSON.parse(entry.guildID),
+    (listPublicQuery.all() as TypeOfDefinition<typeof tableDefinition>[]).map(
+      entry => entry.guildID,
     ),
   );
 
   const inviteGuildsSet = new Set(
     (listPublicWithInvitesEnabledQuery.all() as TypeOfDefinition<typeof tableDefinition>[]).map(
-      entry => JSON.parse(entry.guildID),
+      entry => entry.guildID,
     ),
   );
 
@@ -363,7 +361,7 @@ export function listPublicServers(): Promise<
 
 export async function deletePublicServer(guildId: string) {
   try {
-    deletePublicQuery.all(JSON.stringify(guildId));
+    deletePublicQuery.all(guildId);
   } catch (error) {
     return await errorEmbed({
       client,

src/utils/embeds/serverEmbed.ts

@@ -123,8 +123,8 @@ export async function serverEmbed(options: Options) {
 
   if (invite?.show) {
     async function noPerms(channel?: NewsChannel | TextChannel | StageChannel | VoiceChannel) {
-      await resetSetting(guild.id, "serverboard", "server_invite");
-      await resetSetting(guild.id, "serverboard", "invite_channel");
+      resetSetting(guild.id, "serverboard", "server_invite");
+      resetSetting(guild.id, "serverboard", "invite_channel");
       const errEmbed = new EmbedBuilder()
         .setAuthor({
           name: `${dot}Serverboard is misconfigured in your server!`,

src/utils/embeds/settingsEmbed.ts

@@ -90,7 +90,7 @@ async function setSettingPlease(
   value: any,
   table: "server" | "user",
 ) {
-  if (table == "server") return await setSetting(id, key, setting, value);
+  if (table == "server") return setSetting(id, key, setting, value);
   else return await setUserSetting(id, key, setting, value);
 }
 
@@ -268,8 +268,8 @@ export async function settingsEmbed(
         ?.permissions.has("CreateInstantInvite") ||
         !guild!.members.cache.get(interaction.client.user.id)?.permissions.has("ManageGuild"))
     ) {
-      await resetSetting(guild!.id, "serverboard", "server_invite");
-      await resetSetting(guild!.id, "serverboard", "invite_channel");
+      resetSetting(guild!.id, "serverboard", "server_invite");
+      resetSetting(guild!.id, "serverboard", "invite_channel");
       text = `${dotCheck({ string: ":warning:", doubleSpace: true, twoSides: true, includeString: true })}${humanizeSettings(name)}\n-# The **Create Invite** and/or the **Manage Server** permissions are required for this setting to work.`;
       component.setDisabled(true);
     }