From 12c8d689928410ab58f8dc1eb6fe255491556d3c Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Wed, 20 Oct 2021 21:00:23 +0100
Subject: [PATCH] resolve leftover conflict

---
 backend/src/data/GuildSavedMessages.ts | 42 --------------------------
 1 file changed, 42 deletions(-)

diff --git a/backend/src/data/GuildSavedMessages.ts b/backend/src/data/GuildSavedMessages.ts
index 4d762528..66ff2e42 100644
--- a/backend/src/data/GuildSavedMessages.ts
+++ b/backend/src/data/GuildSavedMessages.ts
@@ -140,38 +140,10 @@ 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;
@@ -251,16 +223,8 @@ 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 {
@@ -360,15 +324,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 = this.msgToSavedMessageData(msg);
-    return this.saveEdit(msg.id, newData);
->>>>>>> 95a0ce8c (clean up)
   }
 
   async setPermanent(id: string): Promise<void> {