From 453ca0808e4f3b463c4cea2be0fa0bb8206640e5 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Tue, 13 Oct 2020 19:22:14 +0300
Subject: [PATCH] logs: fix weird timestamp on message deletion

---
 backend/src/plugins/Logs/util/onMessageDelete.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/plugins/Logs/util/onMessageDelete.ts b/backend/src/plugins/Logs/util/onMessageDelete.ts
index 86eb9c5d..3319f4f2 100644
--- a/backend/src/plugins/Logs/util/onMessageDelete.ts
+++ b/backend/src/plugins/Logs/util/onMessageDelete.ts
@@ -4,7 +4,7 @@ import { useMediaUrls, stripObjectToScalars, resolveUser } from "../../../utils"
 import { LogType } from "../../../data/LogType";
 import moment from "moment-timezone";
 import { GuildPluginData } from "knub";
-import { LogsPluginType } from "../types";
+import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types";
 import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
 
 export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType>, savedMessage: SavedMessage) {
@@ -19,6 +19,11 @@ export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType
       }
     }
 
+    // See comment on FORMAT_NO_TIMESTAMP in types.ts
+    const config = pluginData.config.get();
+    const timestampFormat =
+      (config.format.timestamp !== FORMAT_NO_TIMESTAMP ? config.format.timestamp : null) ?? config.timestamp_format;
+
     pluginData.state.guildLogs.log(
       LogType.MESSAGE_DELETE,
       {
@@ -27,7 +32,7 @@ export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType
         messageDate: pluginData
           .getPlugin(TimeAndDatePlugin)
           .inGuildTz(moment.utc(savedMessage.data.timestamp, "x"))
-          .format(pluginData.config.get().format.timestamp),
+          .format(timestampFormat),
         message: savedMessage,
       },
       savedMessage.id,