src/commands/confess.ts

@@ -58,22 +58,20 @@ export async function execute(interaction: CommandInteraction) {
     .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}\``)
+    .setTitle(`Anonymous Confession \`ID ${messageId}\``)
     // @ts-ignore
-    .setDescription(messageContent);
+    .setDescription(`"${interaction.options.getString("message")}"`);
   
   const adminConfessionEmbed = new EmbedBuilder()
     .setColor(color)
-    .setTitle(`Anonymous Confession \`${messageId}\``)
+    .setTitle(`Anonymous Confession \`ID ${messageId}\``)
     // @ts-ignore
-    .setDescription(messageContent)
+    .setDescription(`"${interaction.options.getString("message")}"`)
     .addFields({
         name: "Author",
         value: interaction.user.displayName
@@ -96,7 +94,7 @@ export async function execute(interaction: CommandInteraction) {
       embeds: [adminConfessionEmbed]
     });
 
-  dt.addConfession(message, messageId, interaction.user.displayName, interaction.user.id, messageContent);
+  dt.addConfession(message, messageId, interaction.user.displayName, interaction.user.id);
 
   return interaction.reply({
     content: "Confession sent!",

src/commands/confessdel.ts

@@ -16,11 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { CommandInteraction, EmbedBuilder, SlashCommandBuilder, TextChannel } from "discord.js";
+import { CommandInteraction, IntegrationApplication, SlashCommandBuilder, TextChannel } from "discord.js";
 import { dt } from "../main";
 import { BotClient } from "../bot";
-import getRandomColor from "../utils/getRandomColor";
-import Logger from "../utils/Logger";
 
 export const data = new SlashCommandBuilder()
   .setName("confessdel")
@@ -43,25 +41,20 @@ export async function execute(interaction: CommandInteraction) {
   
   // @ts-ignore
   const idVal = interaction.options.getString("id");
-  const result = dt.getConfession(interaction.guild?.id!, idVal);
+
+  const result = dt.delConfesssion(
+    interaction,
+    idVal
+  );
 
   if (result) {
     const confession = dt.getConfession(interaction.guild?.id!, idVal)?.messageId;
     const channelId = dt.getGuildInfo(interaction.guild?.id!)?.settings.confessChannel!;
-    const emptyEmbed = new EmbedBuilder()
-      .setColor(getRandomColor())
-      .setTitle("Confession Deleted")
-      // @ts-ignore
-      .setDescription("[Confession Deleted]");
 
-    await (BotClient.channels.cache.get(channelId) as TextChannel).messages.fetch(confession!).then(e => {
-      e.edit({
-        embeds: [emptyEmbed]
-      })
+    await (BotClient.channels.cache.get(channelId) as TextChannel).messages.fetch(confession!).then(message => {
+      message.delete();
     });
 
-    dt.delConfesssion(interaction, idVal);
-
     return interaction.reply({
       content: "Confession removed.",
       ephemeral: true

src/storeman/client.ts

@@ -21,7 +21,6 @@ import crypto from "crypto";
 import { Confession, GuildData, GuildSettings } from "./types";
 import { DATA_DIR } from "./config";
 import { CommandInteraction, Message } from "discord.js";
-import Logger from "../utils/Logger";
 
 export class StoreMan {
   public static readonly fullPath: string =
@@ -39,14 +38,13 @@ export class StoreMan {
     id: string,
     author: string,
     authorId: string,
-    content: string
   ): Confession {
     return {
       id: id,
       messageId: message.id,
       author: author,
       authorId: authorId,
-      content: content
+      content: message.content.replace(/(# Confession .{4}:\n)/, ""),
     };
   }
 
@@ -118,7 +116,7 @@ export class StoreMan {
   }
 
   // Attempts to add a confession. Returns true if the confession is sent, false if otherwise.
-  public addConfession(message: Message, id: string, author: string, authorId: string, content: string): boolean {
+  public addConfession(message: Message, id: string, author: string, authorId: string): boolean {
     const guildId = message.guild?.id;
 
     for (const guild of this.data) {
@@ -128,7 +126,7 @@ export class StoreMan {
           return false;
         }
 
-        guild.confessions.push(StoreMan.toConfession(message, id, author, authorId, content));
+        guild.confessions.push(StoreMan.toConfession(message, id, author, authorId));
         this.saveFile();
         return true;
       }
@@ -143,7 +141,6 @@ export class StoreMan {
     for (const guild of this.data) {
       if (guild.id === guildId) {
         for (const confession of guild.confessions) {
-          Logger.log(confession);
           if (confession.id === confessionId) {
             return confession;
           }