src/bot/client.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import { Client } from "discord.js";
 

src/bot/config.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import dotenv from "dotenv";
 import Logger from "../utils/Logger";

src/bot/deploy-commands.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import { REST, Routes } from "discord.js";
 import { commands } from "../commands";

src/bot/index.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 export * from "./client";
 export * from "./config";

src/bot/types.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 export type DeployCommandsProps = {
   guildId: string;

src/commands/confess.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import {
   CommandInteraction,
@@ -26,14 +26,11 @@ import { BotClient } from "../bot";
 import { dt } from "../main";
 import { StoreMan } from "../storeman";
 import getRandomColor from "../utils/getRandomColor";
-import Logger from "../utils/Logger";
-
-const logger = new Logger("(/) confess");
 
 export const data = new SlashCommandBuilder()
   .setName("confess")
   .setDescription("Send a confession")
-  .addStringOption((option) =>
+  .addStringOption(option =>
     option
       .setName("message")
       .setRequired(true)
@@ -41,76 +38,68 @@ export const data = new SlashCommandBuilder()
   );
 
 export async function execute(interaction: CommandInteraction) {
-  try {
+  if (dt.isBanned(interaction.guild?.id!, interaction.user.id)) {
-    if (dt.isBanned(interaction.guild?.id!, interaction.user.id)) {
-      return interaction.reply({
-        content: "You are banned from confessions in this server!",
-        ephemeral: true,
-      });
-    }
-
-    if (!dt.getGuildInfo(interaction.guild?.id!)) {
-      return interaction.reply({
-        content:
-          "The bot hasn't been set up yet! Ask the server admins to set it up.",
-        ephemeral: true,
-      });
-    }
-
-    const confessChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
-      .confessChannel;
-    const adminChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
-      .modChannel;
-    // @ts-ignore
-    const messageContent = interaction.options.getString("message");
-
-    const color = getRandomColor();
-    const messageId = StoreMan.genId();
-    const userConfessionEmbed = new EmbedBuilder()
-      .setColor(color)
-      .setTitle(`Anonymous Confession \`${messageId}\``)
-      // @ts-ignore
-      .setDescription(messageContent);
-
-    const adminConfessionEmbed = new EmbedBuilder()
-      .setColor(color)
-      .setTitle(`Anonymous Confession \`${messageId}\``)
-      // @ts-ignore
-      .setDescription(messageContent)
-      .addFields(
-        {
-          name: "Author",
-          value: interaction.user.displayName,
-        },
-        {
-          name: "Author ID",
-          value: interaction.user.id,
-        },
-      );
-
-    const message = await (
-      BotClient.channels.cache.get(confessChannel!) as TextChannel
-    ).send({
-      embeds: [userConfessionEmbed],
-    });
-
-    await (BotClient.channels.cache.get(adminChannel!) as TextChannel).send({
-      embeds: [adminConfessionEmbed],
-    });
-
-    dt.addConfession(
-      message,
-      messageId,
-      interaction.user.displayName,
-      interaction.user.id,
-      messageContent,
-    );
-
     return interaction.reply({
-      content: "Confession sent!",
+      content: "You are banned from confessions in this server!",
+      ephemeral: true
+    });
+  }
+
+  if (!dt.getGuildInfo(interaction.guild?.id!)) {
+    return interaction.reply({
+      content:
+        "The bot hasn't been set up yet! Ask the server admins to set it up.",
       ephemeral: true,
     });
-  } catch (err) {
-    logger.error("An error occured:", err);
   }
+
+
+  const confessChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
+    .confessChannel;
+  const adminChannel = dt.getGuildInfo(interaction.guild?.id!)?.settings
+    .modChannel;
+  // @ts-ignore
+  const messageContent = interaction.options.getString("message");
+
+  const color = getRandomColor();
+  const messageId = StoreMan.genId();
+  const userConfessionEmbed = new EmbedBuilder()
+    .setColor(color)
+    .setTitle(`Anonymous Confession \`${messageId}\``)
+    // @ts-ignore
+    .setDescription(messageContent);
+  
+  const adminConfessionEmbed = new EmbedBuilder()
+    .setColor(color)
+    .setTitle(`Anonymous Confession \`${messageId}\``)
+    // @ts-ignore
+    .setDescription(messageContent)
+    .addFields({
+        name: "Author",
+        value: interaction.user.displayName
+      },
+      {
+        name: "Author ID",
+        value: interaction.user.id
+      }
+    );
+
+  const message = await (
+    BotClient.channels.cache.get(confessChannel!) as TextChannel
+  )
+    .send({
+      embeds: [userConfessionEmbed]
+    });
+
+  await (BotClient.channels.cache.get(adminChannel!) as TextChannel)
+    .send({
+      embeds: [adminConfessionEmbed]
+    });
+
+  dt.addConfession(message, messageId, interaction.user.displayName, interaction.user.id, messageContent);
+
+  return interaction.reply({
+    content: "Confession sent!",
+    ephemeral: true,
+  });
 }

src/commands/confessban.ts

@@ -14,26 +14,19 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
-import {
+import { CommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
-  CommandInteraction,
-  PermissionFlagsBits,
-  SlashCommandBuilder,
-} from "discord.js";
 import { dt } from "../main";
-import Logger from "../utils/Logger";
-
-const logger = new Logger("(/) confessban");
 
 export const data = new SlashCommandBuilder()
   .setName("confessban")
   .setDescription("Ban a user from submitting confessions.")
-  .addStringOption((option) =>
+  .addStringOption(option =>
     option
       .setName("id")
       .setDescription("The confession ID to ban")
-      .setRequired(true),
+      .setRequired(true)
   )
   .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers);
 
@@ -41,20 +34,16 @@ export async function execute(interaction: CommandInteraction) {
   const result = dt.addBan(
     interaction.guild?.id!,
     // @ts-ignore
-    interaction.options.getString("id"),
+    interaction.options.getString("id")
   );
 
-  try {
+  return result
-    return result
+    ? interaction.reply({
-      ? interaction.reply({
+        content: "User was banned.",
-          content: "User was banned.",
+        ephemeral: true
-          ephemeral: true,
+      })
-        })
+    : interaction.reply({
-      : interaction.reply({
+        content: "No confession with that ID was found.",
-          content: "No confession with that ID was found.",
+        ephemeral: true
-          ephemeral: true,
+      });
-        });
-  } catch (err) {
-    logger.error("An error occured:", err);
-  }
 }

src/commands/confessdel.ts

@@ -14,27 +14,22 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
-import {
+import { CommandInteraction, EmbedBuilder, SlashCommandBuilder, TextChannel } from "discord.js";
-  CommandInteraction,
-  EmbedBuilder,
-  SlashCommandBuilder,
-  TextChannel,
-} from "discord.js";
 import { dt } from "../main";
 import { BotClient } from "../bot";
 import getRandomColor from "../utils/getRandomColor";
-import Logger from "../utils/Logger";
-
-const logger = new Logger("(/) confessdel");
 
 export const data = new SlashCommandBuilder()
   .setName("confessdel")
   .setDescription("Deletes a confession")
-  .addStringOption((option) =>
+  .addStringOption(option => 
-    option.setName("id").setDescription("The confession id").setRequired(true),
+    option
-  );
+      .setName("id")
+      .setDescription("The confession id")
+      .setRequired(true)
+  )
 
 export async function execute(interaction: CommandInteraction) {
   if (!dt.getGuildInfo(interaction.guild?.id!)) {
@@ -50,41 +45,30 @@ export async function execute(interaction: CommandInteraction) {
   const result = dt.getConfession(interaction.guild?.id!, idVal);
 
   if (result) {
-    try {
+    const confession = dt.getConfession(interaction.guild?.id!, idVal)?.messageId;
-      const confession = dt.getConfession(
+    const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings.confessChannel!;
-        interaction.guild?.id!,
+    const emptyEmbed = new EmbedBuilder()
-        idVal,
+      .setColor(getRandomColor())
-      )?.messageId;
+      .setTitle("Confession Deleted")
-      const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings
+      // @ts-ignore
-        .confessChannel!;
+      .setDescription("[Confession Deleted]");
-      const emptyEmbed = new EmbedBuilder()
-        .setColor(getRandomColor())
-        .setTitle("Confession Deleted")
-        // @ts-ignore
-        .setDescription("[Confession Deleted]");
 
-      await (BotClient.channels.cache.get(channelId) as TextChannel).messages
+    await (BotClient.channels.cache.get(channelId) as TextChannel).messages.fetch(confession!).then(e => {
-        .fetch(confession!)
+      e.edit({
-        .then((e) => {
+        embeds: [emptyEmbed]
-          e.edit({
+      })
-            embeds: [emptyEmbed],
+    });
-          });
-        });
 
-      dt.delConfesssion(interaction, idVal);
+    dt.delConfesssion(interaction, idVal);
 
-      return interaction.reply({
+    return interaction.reply({
-        content: "Confession removed.",
+      content: "Confession removed.",
-        ephemeral: true,
+      ephemeral: true
-      });
+    })
-    } catch (err) {
-      logger.error("An error occured:", err);
-    }
   } else {
     return interaction.reply({
-      content:
+      content: "Either the confession wasn't found or you may not be allowed to remove it.",
-        "Either the confession wasn't found or you may not be allowed to remove it.",
+      ephemeral: true
-      ephemeral: true,
     });
   }
 }

src/commands/confesspardon.ts

@@ -14,47 +14,36 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
-import {
+import { CommandInteraction, PermissionFlagsBits, SlashCommandBuilder } from "discord.js";
-  CommandInteraction,
-  PermissionFlagsBits,
-  SlashCommandBuilder,
-} from "discord.js";
 import { dt } from "../main";
-import Logger from "../utils/Logger";
-
-const logger = new Logger("(/) confesspardon");
 
 export const data = new SlashCommandBuilder()
   .setName("confesspardon")
   .setDescription("Unbans a user from confessions")
-  .addStringOption((option) =>
+  .addStringOption(option => 
     option
       .setName("id")
       .setDescription("The confession ID to unban")
-      .setRequired(true),
+      .setRequired(true)
   )
-  .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages);
+  .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages)
 
 export function execute(interaction: CommandInteraction) {
   const result = dt.removeBan(
     interaction.guild?.id!,
     // @ts-ignore
-    interaction.options.getString("id"),
+    interaction.options.getString("id")
   );
 
-  try {
+  return result
-    return result
+    ? interaction.reply({
-      ? interaction.reply({
+        content: "User was unbanned.",
-          content: "User was unbanned.",
+        ephemeral: true
-          ephemeral: true,
+      })
-        })
+    : interaction.reply({
-      : interaction.reply({
+        content: "No confession with that ID was found.",
-          content: "No confession with that ID was found.",
+        ephemeral: true
-          ephemeral: true,
+      });
-        });
-  } catch (err) {
-    logger.error("An error occured:", err);
-  }
 }

src/commands/index.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import * as confess from "./confess";
 import * as confessdel from "./confessdel";

src/commands/ping.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import { CommandInteraction, SlashCommandBuilder } from "discord.js";
 

src/commands/setup.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import {
   ActionRowBuilder,
@@ -28,8 +28,6 @@ import {
 import { dt } from "../main";
 import Logger from "../utils/Logger";
 
-const logger = new Logger("(/) setup");
-
 export const data = new SlashCommandBuilder()
   .setName("setup")
   .setDescription("Setup the bot.")
@@ -54,87 +52,83 @@ export async function execute(interaction: CommandInteraction) {
   const channelRow =
     new ActionRowBuilder<ChannelSelectMenuBuilder>().addComponents(channelList);
 
-  try {
+  const response = await interaction.reply({
-    const response = await interaction.reply({
+    content: `# Let's get started, ${interaction.user.displayName}!\nFirst, let's choose a channel for your confessions.`,
-      content: `# Let's get started, ${interaction.user.displayName}!\nFirst, let's choose a channel for your confessions.`,
+    ephemeral: true,
-      ephemeral: true,
+    components: [channelRow],
-      components: [channelRow],
+  });
+
+  const collector = response.createMessageComponentCollector({
+    componentType: ComponentType.ChannelSelect,
+    time: 45_000,
+  });
+
+  collector.on("collect", async (i) => {
+    confessChannel = i.values[0];
+
+    await i.update({
+      content: "Awesome!",
+      components: [],
     });
 
-    const collector = response.createMessageComponentCollector({
+    collector.stop();
+
+    const logChannelList = new ChannelSelectMenuBuilder()
+      .addChannelTypes(ChannelType.GuildText)
+      .setCustomId("logChannels")
+      .setPlaceholder("Choose a channel.");
+
+    const logChannelRow =
+      new ActionRowBuilder<ChannelSelectMenuBuilder>().addComponents(
+        logChannelList,
+      );
+
+    const logResponse = await interaction.followUp({
+      content: "# Now, select a logging channel, for moderation purposes.",
+      ephemeral: true,
+      components: [logChannelRow],
+    });
+
+    const logCollector = logResponse.createMessageComponentCollector({
       componentType: ComponentType.ChannelSelect,
       time: 45_000,
     });
 
-    collector.on("collect", async (i) => {
+    logCollector.on("collect", async (ij) => {
-      confessChannel = i.values[0];
+      logChannel = ij.values[0];
 
-      await i.update({
+      await ij.update({
-        content: "Awesome!",
+        content: "Setup Complete!",
         components: [],
       });
 
-      collector.stop();
+      dt.setup(guildId!, {
-
+        confessChannel: confessChannel,
-      const logChannelList = new ChannelSelectMenuBuilder()
+        modChannel: logChannel,
-        .addChannelTypes(ChannelType.GuildText)
+        bans: [],
-        .setCustomId("logChannels")
-        .setPlaceholder("Choose a channel.");
-
-      const logChannelRow =
-        new ActionRowBuilder<ChannelSelectMenuBuilder>().addComponents(
-          logChannelList,
-        );
-
-      const logResponse = await interaction.followUp({
-        content: "# Now, select a logging channel, for moderation purposes.",
-        ephemeral: true,
-        components: [logChannelRow],
       });
 
-      const logCollector = logResponse.createMessageComponentCollector({
+      logCollector.stop();
-        componentType: ComponentType.ChannelSelect,
-        time: 45_000,
-      });
-
-      logCollector.on("collect", async (ij) => {
-        logChannel = ij.values[0];
-
-        await ij.update({
-          content: "Setup Complete!",
-          components: [],
-        });
-
-        dt.setup(guildId!, {
-          confessChannel: confessChannel,
-          modChannel: logChannel,
-          bans: [],
-        });
-
-        logCollector.stop();
-      });
-
-      logCollector.on("end", (content) => {
-        // If there is no content, follow up with an error message.
-        !content.size &&
-          interaction.followUp({
-            content: "No channel selected. Please try again.",
-            ephemeral: true,
-            components: [],
-          });
-      });
     });
 
-    collector.on("end", (collected) => {
+    logCollector.on("end", (content) => {
-      // Same as above logCollector end
+      // If there is no content, follow up with an error message.
-      !collected.size &&
+      !content.size &&
         interaction.followUp({
-          content: "No channel selected. Try again.",
+          content: "No channel selected. Please try again.",
           ephemeral: true,
           components: [],
         });
     });
-  } catch (err) {
+  });
-    logger.error("An error occured:", err);
+
-  }
+  collector.on("end", (collected) => {
+    // Same as above logCollector end
+    !collected.size &&
+      interaction.followUp({
+        content: "No channel selected. Try again.",
+        ephemeral: true,
+        components: []
+      });
+  });
 }

src/environment.d.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 declare global {
   namespace NodeJS {

src/main.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import { BotClient, BOT_TOKEN, deployCommands } from "./bot";
 import { commands } from "./commands";

src/storeman/client.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import fs from "fs";
 import crypto from "crypto";
@@ -38,14 +38,14 @@ export class StoreMan {
     id: string,
     author: string,
     authorId: string,
-    content: string,
+    content: string
   ): Confession {
     return {
       id: id,
       messageId: message.id,
       author: author,
       authorId: authorId,
-      content: content,
+      content: content
     };
   }
 
@@ -117,13 +117,7 @@ export class StoreMan {
   }
 
   // Attempts to add a confession. Returns true if the confession is sent, false if otherwise.
-  public addConfession(
+  public addConfession(message: Message, id: string, author: string, authorId: string, content: string): boolean {
-    message: Message,
-    id: string,
-    author: string,
-    authorId: string,
-    content: string,
-  ): boolean {
     const guildId = message.guild?.id;
 
     for (const guild of this.data) {
@@ -133,9 +127,7 @@ export class StoreMan {
           return false;
         }
 
-        guild.confessions.push(
+        guild.confessions.push(StoreMan.toConfession(message, id, author, authorId, content));
-          StoreMan.toConfession(message, id, author, authorId, content),
-        );
         this.saveFile();
         return true;
       }
@@ -146,10 +138,7 @@ export class StoreMan {
     );
   }
 
-  public getConfession(
+  public getConfession(guildId: string, confessionId: string): Confession | null {
-    guildId: string,
-    confessionId: string,
-  ): Confession | null {
     for (const guild of this.data) {
       if (guild.id === guildId) {
         for (const confession of guild.confessions) {
@@ -164,10 +153,7 @@ export class StoreMan {
   }
 
   // Attempts to delete a confession. If it is sucessfully deleted, returns true, else false.
-  public delConfesssion(
+  public delConfesssion({ guild, user }: CommandInteraction, confessionId: string): boolean {
-    { guild, user }: CommandInteraction,
-    confessionId: string,
-  ): boolean {
     const guildId = guild?.id;
     const userId = user.id;
 
@@ -175,7 +161,7 @@ export class StoreMan {
       if (guild.id === guildId) {
         for (const confession of guild.confessions) {
           if (confession.authorId === userId) {
-            guild.confessions = guild.confessions.filter((confession) => {
+            guild.confessions = guild.confessions.filter(confession => {
               return confession.id !== confessionId;
             });
 
@@ -222,8 +208,7 @@ export class StoreMan {
       if (guild.id === guildId) {
         if (confession) {
           // Only add the user to the ban list if they aren't banned already
-          !this.isBanned(guildId, confession.authorId) &&
+          !this.isBanned(guildId, confession.authorId) && guild.settings.bans.push(confession.authorId!);
-            guild.settings.bans.push(confession.authorId!);
 
           this.saveFile();
           return true;
@@ -239,7 +224,7 @@ export class StoreMan {
     for (const guild of this.data) {
       if (guild.id === guildId) {
         if (this.getConfession(guildId, confessionId)) {
-          guild.settings.bans = guild.settings.bans.filter((ban) => {
+          guild.settings.bans = guild.settings.bans.filter(ban => {
             return ban !== this.getConfession(guildId, confessionId)?.authorId!;
           });
 

src/storeman/config.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import dotenv from "dotenv";
 dotenv.config();

src/storeman/index.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 export * from "./client";
 export * from "./config";

src/storeman/types.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 export interface Confession {
   id: string;

src/utils/Logger.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import chalk from "chalk";
 import { LOG_LEVEL } from "./config";

src/utils/config.ts

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
 import dotenv from "dotenv";
 dotenv.config();

src/utils/getRandomColor.ts

@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+*/
 
-const getRandomColor = () => (Math.random() * 0xffffff) << 0;
+const getRandomColor = () => (Math.random() * 0xFFFFFF << 0);
 
 export default getRandomColor;