From 6c01bb62003eb6ce341ad2dbf7f215f002a15a88 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        | 31 -------------------
 .../events/runAutomodOnThreadEvents.ts        |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/backend/src/data/GuildSavedMessages.ts b/backend/src/data/GuildSavedMessages.ts
index 43cffcaf..e6c51e91 100644
--- a/backend/src/data/GuildSavedMessages.ts
+++ b/backend/src/data/GuildSavedMessages.ts
@@ -25,28 +25,7 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
     this.toBePermanent = new Set();
   }
 
-<<<<<<< HEAD
   protected msgToSavedMessageData(msg: Message): ISavedMessageData {
-=======
-  public static msgToSavedMessage(message: Message): SavedMessage {
-    const postedAt = moment.utc(message.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
-
-    return {
-      data: GuildSavedMessages.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,
-    };
-  }
-
-  public static msgToSavedMessageData(msg: Message): ISavedMessageData {
->>>>>>> clean up
     const data: ISavedMessageData = {
       author: {
         username: msg.author.username,
@@ -227,12 +206,8 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
     await this.insertBulk(items);
   }
 
-<<<<<<< HEAD
   protected async msgToInsertReadyEntity(msg: Message): Promise<Partial<SavedMessage>> {
     const savedMessageData = this.msgToSavedMessageData(msg);
-=======
-    const savedMessageData = GuildSavedMessages.msgToSavedMessageData(msg);
->>>>>>> clean up
     const postedAt = moment.utc(msg.createdTimestamp, "x").format("YYYY-MM-DD HH:mm:ss");
 
     return {
@@ -332,15 +307,9 @@ export class GuildSavedMessages extends BaseGuildRepository<SavedMessage> {
     this.events.emit(`update:${id}`, [newMessage, oldMessage]);
   }
 
-<<<<<<< HEAD
   async saveEditFromMsg(msg: Message): Promise<void> {
     const newData = this.msgToSavedMessageData(msg);
     await this.saveEdit(msg.id, newData);
-=======
-  async saveEditFromMsg(msg: Message) {
-    const newData = GuildSavedMessages.msgToSavedMessageData(msg);
-    return this.saveEdit(msg.id, newData);
->>>>>>> clean up
   }
 
   async setPermanent(id: string): Promise<void> {
diff --git a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
index 284ca46d..7e7889e9 100644
--- a/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
+++ b/backend/src/plugins/Automod/events/runAutomodOnThreadEvents.ts
@@ -27,7 +27,7 @@ export const RunAutomodOnThreadCreate = typedGuildEventListener<AutomodPluginTyp
         (m) => m.thread?.id === thread.id || m.reference?.channelId === thread.id,
       );
       if (sourceMessage) {
-        const savedMessage = GuildSavedMessages.msgToSavedMessage(sourceMessage);
+        const savedMessage = pluginData.state.savedMessages.msgToSavedMessage(sourceMessage);
         savedMessage.channel_id = thread.id;
         context.message = savedMessage;
       }