From 80b96ba2c75b7b0c21a94a2bdd62c58aa75427c5 Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Sat, 4 Sep 2021 22:44:02 +0100
Subject: [PATCH] use savedmessages state instead of static method

---
 backend/src/data/GuildSavedMessages.ts        | 34 ++++++++++++++++++-
 .../events/runAutomodOnThreadEvents.ts        |  1 -
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/backend/src/data/GuildSavedMessages.ts b/backend/src/data/GuildSavedMessages.ts
index 2602d5ef..4d762528 100644
--- a/backend/src/data/GuildSavedMessages.ts
+++ b/backend/src/data/GuildSavedMessages.ts
@@ -140,10 +140,38 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
     return data;
   }
 
+<<<<<<< HEAD
   protected async _processEntityFromDB(entity: SavedMessage | undefined) {
     if (entity == null) {
       return entity;
     }
+=======
+  public msgToSavedMessage(message: Message): SavedMessage {
+    const postedAt = moment.utc(message.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
+
+    return {
+      data: this.msgToSavedMessageData(message),
+      id: message.id,
+      guild_id: (message.channel as GuildChannel).guildId,
+      channel_id: message.channelId,
+      user_id: message.author.id,
+      is_bot: message.author.bot,
+      posted_at: postedAt,
+      // @ts-expect-error
+      deleted_at: null,
+      is_permanent: false,
+    };
+  }
+
+  find(id) {
+    return this.messages
+      .createQueryBuilder()
+      .where("guild_id = :guild_id", { guild_id: this.guildId })
+      .andWhere("id = :id", { id })
+      .andWhere("deleted_at IS NULL")
+      .getOne();
+  }
+>>>>>>> 14aceada (use savedmessages state instead of static method)
 
     entity.data = await decryptJson(entity.data as unknown as string);
     return entity;
@@ -223,12 +251,16 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
     await this.insertBulk(items);
   }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   protected async msgToInsertReadyEntity(msg: Message): Promise<Partial<SavedMessage>> {
     const savedMessageData = this.msgToSavedMessageData(msg);
 =======
     const savedMessageData = GuildSavedMessages.msgToSavedMessageData(msg);
 >>>>>>> 95a0ce8c (clean up)
+=======
+    const savedMessageData = this.msgToSavedMessageData(msg);
+>>>>>>> 14aceada (use savedmessages state instead of static method)
     const postedAt = moment.utc(msg.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
 
     return {
@@ -334,7 +366,7 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
     await this.saveEdit(msg.id, newData);
 =======
   async saveEditFromMsg(msg: Message) {
-    const newData = GuildSavedMessages.msgToSavedMessageData(msg);
+    const newData = this.msgToSavedMessageData(msg);
     return this.saveEdit(msg.id, newData);
 >>>>>>> 95a0ce8c (clean up)
   }
diff --git a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
index b1077c55..4a3ceaf6 100644
--- a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
+++ b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
@@ -1,5 +1,4 @@
 import { typedGuildEventListener } from "knub";
-import { GuildSavedMessages } from "../../../data/GuildSavedMessages";
 import { runAutomod } from "../functions/runAutomod";
 import { AutomodContext, AutomodPluginType } from "../types";