From b550ce0c8e12db80d148c02566f719ea770de6d2 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Sat, 4 Sep 2021 20:53:32 +0300
Subject: [PATCH] More+ debug

---
 .../src/plugins/MessageSaver/events/SaveMessagesEvts.ts    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts b/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts
index 56b7e680..3e1e91a6 100644
--- a/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts
+++ b/backend/src/plugins/MessageSaver/events/SaveMessagesEvts.ts
@@ -3,7 +3,7 @@ import { messageSaverEvt } from "../types";
 import { SECONDS } from "../../../utils";
 import moment from "moment-timezone";
 
-const recentlyCreatedMessages: Map<Snowflake, [debugId: number, timestamp: number]> = new Map();
+const recentlyCreatedMessages: Map<Snowflake, [debugId: number, timestamp: number, guildId: string]> = new Map();
 const recentlyCreatedMessagesToKeep = 100;
 
 setInterval(() => {
@@ -45,13 +45,14 @@ export const MessageCreateEvt = messageSaverEvt({
     if (recentlyCreatedMessages.has(meta.args.message.id)) {
       const ourDebugId = meta.pluginData.state.debugId;
       const oldDebugId = recentlyCreatedMessages.get(meta.args.message.id)![0];
-      const context = `${ourDebugId} : ${oldDebugId} / ${meta.pluginData.guild.id} : ${meta.args.message.guildId} / ${meta.args.message.channelId} / ${meta.args.message.id}`;
+      const oldGuildId = recentlyCreatedMessages.get(meta.args.message.id)![2];
+      const context = `${ourDebugId} : ${oldDebugId} / ${meta.pluginData.guild.id} : ${oldGuildId} : ${meta.args.message.guildId} / ${meta.args.message.channelId} / ${meta.args.message.id}`;
       const timestamp = moment(recentlyCreatedMessages.get(meta.args.message.id)![1]).format("HH:mm:ss.SSS");
       // tslint:disable-next-line:no-console
       console.warn(`Tried to save duplicate message from messageCreate event: ${context} / saved at: ${timestamp}`);
       return;
     }
-    recentlyCreatedMessages.set(meta.args.message.id, [meta.pluginData.state.debugId, Date.now()]);
+    recentlyCreatedMessages.set(meta.args.message.id, [meta.pluginData.state.debugId, Date.now(), meta.pluginData.guild.id]);
 
     await meta.pluginData.state.savedMessages.createFromMsg(meta.args.message);
   },