Updated settings to remove null check and crushed the smaller settings functions.

src/commands/private-help.ts

@@ -22,6 +22,8 @@ export default {
         .setRequired(false)
     ),
   handler: async function (client: Client, interaction: ChatInputCommandInteraction) {
+    if (!interaction.guildId) return;
+
     if (!interaction.channel || !interaction.channel.isSendable())
       return interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Missing permissions to send to channel.' });
 
@@ -37,9 +39,7 @@ export default {
       .addComponents(button);
 
     await interaction.channel.send({ components: [row], content });
-
+    await Database.updateGuildSetting(interaction.guildId, 'private_help_channel_id', interaction.channelId)
-    await Database.setPrivateHelpChannel(interaction.guildId!, interaction.channelId);
-
     interaction.reply({ flags: [MessageFlags.Ephemeral], content: 'Sent.' });
   }
 };

src/commands/settings.ts

@@ -118,186 +118,137 @@ export default {
         .setRequired(false)
     ),
   handler: async function (client: Client, interaction: ChatInputCommandInteraction) {
+    if (!interaction.guildId) return; // This shouldn't occur, but TypeScript doesn't know that.
     await interaction.deferReply({ flags: [MessageFlags.Ephemeral] });
 
     let response = '';
-
     const settings = await Database.getGuildSettings(interaction.guildId!);
-
+    if (!settings) await Database.putGuild(interaction.guildId);
-    if (!settings) {
-      await Database.putGuild(interaction.guildId!);
-    }
 
     const generalChannel = interaction.options.getChannel('general-channel');
-
     if (generalChannel) {
-      await Database.setGuildGeneralChatId(interaction.guildId!, generalChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'general_chat_id', generalChannel.id);
-
+      response += `\`general_chat_id\` has been set to: ${generalChannel}.\n`;
-      response += `General channel set to ${generalChannel}.\n`;
     }
 
     const ticketsChannel = interaction.options.getChannel('tickets-channel');
-
     if (ticketsChannel) {
-      await Database.setGuildTicketsLogsChannelId(interaction.guildId!, ticketsChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'tickets_channel_id', ticketsChannel.id);
-
+      response += `\`tickets_channel_id\` has been set to: ${ticketsChannel}.\n`;
-      response += `Tickets logs channel set to ${ticketsChannel}.\n`;
     }
 
     const eventLogsChannel = interaction.options.getChannel('event-logs-channel');
-
     if (eventLogsChannel) {
-      await Database.setGuildEventsLogsChannelId(interaction.guildId!, eventLogsChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'event_logs_channel_id', eventLogsChannel.id);
-
+      response += `\`event_logs_channel_id\` has been set to: ${eventLogsChannel}.\n`;
-      response += `Event logs channel set to ${eventLogsChannel}.\n`;
     }
 
     const discordLogsChannel = interaction.options.getChannel('discord-logs-channel');
-
     if (discordLogsChannel) {
-      await Database.setGuildDiscordLogsChannelId(interaction.guildId!, discordLogsChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'discord_logs_channel_id', discordLogsChannel.id);
-
+      response += `\`discord_logs_channel_id\` has been set to: ${discordLogsChannel}.\n`;
-      response += `Discord logs channel set to ${discordLogsChannel}.\n`;
     }
 
     const auditLogsChannel = interaction.options.getChannel('audit-logs-channel');
-
     if (auditLogsChannel) {
-      await Database.setGuildAuditLogsChannelId(interaction.guildId!, auditLogsChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'audit_logs_channel_id', auditLogsChannel.id);
-
+      response += `\`audit_logs_channel_id\` has been set to: ${auditLogsChannel}.\n`;
-      response += `Audit logs channel set to ${auditLogsChannel}.\n`;
     }
 
     const voiceLogsChannel = interaction.options.getChannel('voice-logs-channel');
-
     if (voiceLogsChannel) {
-      await Database.setGuildVoiceLogsChannelId(interaction.guildId!, voiceLogsChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'voice_logs_channel_id', voiceLogsChannel.id);
-
+      response += `\`voice_logs_channel_id\` has been set to: ${voiceLogsChannel}.\n`;
-      response += `Voice logs channel set to ${voiceLogsChannel}.\n`;
     }
 
     const newMemberLogsChannel = interaction.options.getChannel('new-member-channel');
-
     if (newMemberLogsChannel) {
-      await Database.setGuildNewMemberLogsChannel(interaction.guildId!, newMemberLogsChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'new_member_channel_id', newMemberLogsChannel.id);
-
+      response += `\`new_member_channel_id\` has been set to: ${newMemberLogsChannel}.\n`;
-      response += `New member logs channel set to ${newMemberLogsChannel}.\n`;
     }
 
     const moderatorChannel = interaction.options.getChannel('moderator-channel');
-
     if (moderatorChannel) {
-      await Database.setGuildModeratorChannel(interaction.guildId!, moderatorChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'moderator_channel_id', moderatorChannel.id);
-
+      response += `\`moderator_channel_id\` has been set to": ${moderatorChannel}.\n`;
-      response += `Moderator channel set to ${moderatorChannel}.\n`;
     }
 
     const adminRole = interaction.options.getRole('admin-role');
-
     if (adminRole) {
-      await Database.setGuildAdminRole(interaction.guildId!, adminRole.id);
+      await Database.updateGuildSetting(interaction.guildId, 'admin_role_id', adminRole.id);
-
+      response += `\`admin_role_id\` has been set to: ${adminRole}.\n`;
-      response += `Admin role set to ${adminRole}.\n`;
     }
 
     const privateHelperRole = interaction.options.getRole('private-helper-role');
-
     if (privateHelperRole) {
-      await Database.setGuildPrivateHelperRole(interaction.guildId!, privateHelperRole.id);
+      await Database.updateGuildSetting(interaction.guildId, 'private_help_role_id', privateHelperRole.id);
-
+      response += `\`private_help_role_id\` has been set to: ${privateHelperRole}.\n`;
-      response += `Private helper role set to ${privateHelperRole}.\n`;
     }
 
     const devWatchRole = interaction.options.getRole('devwatch-role');
-
     if (devWatchRole) {
-      await Database.setGuildDevWatchRole(interaction.guildId!, devWatchRole.id);
+      await Database.updateGuildSetting(interaction.guildId, 'devwatch_role_id', devWatchRole.id);
-
+      response += `\`private_help_role_id\` has been set to ${devWatchRole}.\n`;
-      response += `DevWatch role set to ${devWatchRole}.\n`;
     }
 
     const addCategory = interaction.options.getChannel('add-staff-category');
     if (addCategory) {
       if (addCategory.type == ChannelType.GuildCategory) {
-        await Database.putGuildArraySetting('staff_categories', interaction.guildId!, addCategory.id);
+        await Database.putGuildArraySetting('staff_categories', interaction.guildId, addCategory.id);
-
         response += `Added ${addCategory.toString()} as a staff category.\n`;
-      } else {
+      } else response += `Error adding staff category: ${addCategory.toString()} isn't a category.`;
-        response += `Error adding staff category: ${addCategory.toString()} isn't a category.`;
-      }
     }
 
     const removeCategory = interaction.options.getChannel('remove-staff-category');
     if (removeCategory) {
-      if (removeCategory.type == ChannelType.GuildCategory) {
+      if (removeCategory.type == ChannelType.GuildCategory)
-        if (await Database.removeGuildArraySetting('staff_categories', interaction.guildId!, removeCategory.id)) {
+        if (await Database.removeGuildArraySetting('staff_categories', interaction.guildId, removeCategory.id))
           response += `Removed ${removeCategory.toString()} as a staff category\n`;
-        } else {
+        else response += `Error removing staff category: ${removeCategory.toString()} isn't a staff category.`;
-          response += `Error removing staff category: ${removeCategory.toString()} isn't a staff category.`;
+      else response += `Error removing staff category: ${removeCategory.toString()} isn't a category.`;
-        }
-      } else {
-        response += `Error removing staff category: ${removeCategory.toString()} isn't a category.`;
-      }
     }
 
     const addSafeChannel = interaction.options.getChannel('add-safe-channel');
     if (addSafeChannel) {
       if (addSafeChannel.type == ChannelType.GuildText) {
-        await Database.putGuildArraySetting('safe_channels', interaction.guildId!, addSafeChannel.id);
+        await Database.putGuildArraySetting('safe_channels', interaction.guildId, addSafeChannel.id);
-
         response += `Added ${addSafeChannel.toString()} as a SFW cannel.\n`;
-      } else {
+      } else response += `Error adding SFW channel: ${addSafeChannel.toString()} isn't a text channel.`;
-        response += `Error adding SFW channel: ${addSafeChannel.toString()} isn't a text channel.`;
-      }
     }
 
     const removeSafeChannel = interaction.options.getChannel('remove-safe-channel');
     if (removeSafeChannel) {
-      if (removeSafeChannel.type == ChannelType.GuildText) {
+      if (removeSafeChannel.type == ChannelType.GuildText)
-        if (await Database.removeGuildArraySetting('safe_channels', interaction.guildId!, removeSafeChannel.id)) {
+        if (await Database.removeGuildArraySetting('safe_channels', interaction.guildId, removeSafeChannel.id))
           response += `Removed ${removeSafeChannel.toString()} as a safe channel\n`;
-        } else {
+        else response += `Error removing safe channel: ${removeSafeChannel.toString()} isn't a safe channel.`;
-          response += `Error removing safe channel: ${removeSafeChannel.toString()} isn't a safe channel.`;
+      else response += `Error removing safe channel: ${removeSafeChannel.toString()} isn't a text channel.`;
-        }
-      } else {
-        response += `Error removing safe channel: ${removeSafeChannel.toString()} isn't a text channel.`;
-      }
     }
 
     const addLinkSkipChannel = interaction.options.getChannel('add-link-skip-channel');
     if (addLinkSkipChannel) {
       if (addLinkSkipChannel.type == ChannelType.GuildText) {
-        await Database.putGuildArraySetting('link_skip_channels', interaction.guildId!, addLinkSkipChannel.id);
+        await Database.putGuildArraySetting('link_skip_channels', interaction.guildId, addLinkSkipChannel.id);
-
         response += `Added ${addLinkSkipChannel.toString()} as a link skip channel.\n`;
-      } else {
+      } else response += `Error adding link skip channel: ${addLinkSkipChannel.toString()} isn't a text channel.`;
-        response += `Error adding link skip channel: ${addLinkSkipChannel.toString()} isn't a text channel.`;
-      }
     }
 
     const removeLinkSkipChannel = interaction.options.getChannel('remove-link-skip-channel');
     if (removeLinkSkipChannel) {
-      if (removeLinkSkipChannel.type == ChannelType.GuildText) {
+      if (removeLinkSkipChannel.type == ChannelType.GuildText)
-        if (await Database.removeGuildArraySetting('link_skip_channels', interaction.guildId!, removeLinkSkipChannel.id)) {
+        if (await Database.removeGuildArraySetting('link_skip_channels', interaction.guildId, removeLinkSkipChannel.id))
           response += `Removed ${removeLinkSkipChannel.toString()} as a staff category\n`;
-        } else {
+        else response += `Error removing link skip channel: ${removeLinkSkipChannel.toString()} isn't a link skip channel.`;
-          response += `Error removing link skip channel: ${removeLinkSkipChannel.toString()} isn't a link skip channel.`;
+      else response += `Error removing link skip channel: ${removeLinkSkipChannel.toString()} isn't a text channel.`;
-        }
-      } else {
-        response += `Error removing link skip channel: ${removeLinkSkipChannel.toString()} isn't a text channel.`;
-      }
     }
 
     const githubReleaseChannel = interaction.options.getChannel('github-release-channel');
-
     if (githubReleaseChannel) {
-      await Database.setGuildGithubReleaseChannel(interaction.guildId!, githubReleaseChannel.id);
+      await Database.updateGuildSetting(interaction.guildId, 'github_release_channel', githubReleaseChannel.id);
-
+      response += `\`github_release_channel\` has been set to ${githubReleaseChannel}.\n`;
-      response += `Github releases channel set to ${githubReleaseChannel}.\n`;
     }
 
     if (response.length == 0) return interaction.editReply({ content: 'No settings provided.' });
-
     interaction.editReply({ content: response });
   }
 };

src/shared/Database.ts

@@ -114,6 +114,21 @@ export const enum PrivateHelpTicketStatus {
   CLOSED = 1
 }
 
+type GuildSettingKey =
+  | 'general_chat_id'
+  | 'tickets_channel_id'
+  | 'event_logs_channel_id'
+  | 'discord_logs_channel_id'
+  | 'audit_logs_channel_id'
+  | 'voice_logs_channel_id'
+  | 'new_member_channel_id'
+  | 'moderator_channel_id'
+  | 'admin_role_id'
+  | 'private_help_role_id'
+  | 'devwatch_role_id'
+  | 'github_release_channel'
+  | 'private_help_channel_id';
+
 export class Database {
   private static db: SqliteDatabase;
 
@@ -176,64 +191,16 @@ export class Database {
 
   // -- START SETTINGS --
 
-  static async getGuildSettings(guildId: string): Promise<GuildSettings | undefined> {
+  static async getGuildSettings(guildId: string): Promise<GuildSettings> {
-    return await Database.db.get<GuildSettings>('SELECT * FROM settings WHERE guild_id = ?', guildId);
+    return await Database.db.get<GuildSettings>('SELECT * FROM settings WHERE guild_id = ?', guildId) as GuildSettings;
   }
 
   static async putGuild(guildId: string) {
     await Database.db.run('INSERT INTO settings(guild_id) VALUES (?)', guildId);
   }
 
-  static async setGuildGeneralChatId(guildId: string, id: string) {
+  static async updateGuildSetting(guildId: string, key: GuildSettingKey, value: string) {
-    await Database.db.run('UPDATE settings SET general_chat_id = ? WHERE guild_id = ?', id, guildId);
+    await Database.db.run(`UPDATE settings SET ${key} = ? WHERE guild_id = ?`, value, guildId);
-  }
-
-  static async setGuildTicketsLogsChannelId(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET tickets_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildEventsLogsChannelId(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET event_logs_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildDiscordLogsChannelId(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET discord_logs_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildAuditLogsChannelId(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET audit_logs_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildVoiceLogsChannelId(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET voice_logs_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildNewMemberLogsChannel(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET new_member_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildModeratorChannel(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET moderator_channel_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildAdminRole(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET admin_role_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildPrivateHelperRole(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET private_help_role_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildDevWatchRole(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET devwatch_role_id = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setGuildGithubReleaseChannel(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET github_release_channel = ? WHERE guild_id = ?', id, guildId);
-  }
-
-  static async setPrivateHelpChannel(guildId: string, id: string) {
-    await Database.db.run('UPDATE settings SET private_help_channel_id = ? WHERE guild_id = ?', id, guildId);
   }
 
   // Since "setting" has guaranteed values and is never set by the user, this shouldn't cause any security issues.