From f7d7b66cf644353c59159bb6e0b6bec58fe260ae Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 24 Sep 2024 17:53:41 +0200
Subject: [PATCH] fix #100

---
 src/events/message/messageCreate.ts | 13 +++++++++++--
 src/utils/reminder.ts               |  1 +
 src/utils/time.ts                   | 11 ++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/events/message/messageCreate.ts b/src/events/message/messageCreate.ts
index 31d25ea..2ccdd20 100644
--- a/src/events/message/messageCreate.ts
+++ b/src/events/message/messageCreate.ts
@@ -133,9 +133,17 @@ export default async (message: Message, client: Client) => {
       }
 
       // Footer
-      let footer = `Posté le ${showDate(loc, quoted_post.createdAt)}`;
+      let footer = `Posté le ${showDate(
+        message.guild?.preferredLocale ?? client.config.default_lang,
+        loc,
+        quoted_post.createdAt,
+      )}`;
       if (quoted_post.editedAt) {
-        footer += ` et modifié le ${showDate(loc, quoted_post.editedAt)}`;
+        footer += ` et modifié le ${showDate(
+          message.guild?.preferredLocale ?? client.config.default_lang,
+          loc,
+          quoted_post.editedAt,
+        )}`;
       }
 
       let author = "Auteur";
@@ -143,6 +151,7 @@ export default async (message: Message, client: Client) => {
         author += " & Citateur";
       } else {
         footer += `\nCité par ${userWithNickname(message.member!) ?? "?"} le ${showDate(
+          message.guild?.preferredLocale ?? client.config.default_lang,
           loc,
           message.createdAt,
         )}`;
diff --git a/src/utils/reminder.ts b/src/utils/reminder.ts
index ee77218..b15318b 100644
--- a/src/utils/reminder.ts
+++ b/src/utils/reminder.ts
@@ -414,6 +414,7 @@ export const embedListReminders = async (
         const expiration = `${loc.get("c_reminder8")} ${timeDeltaToString(remind.expiration_date)}`;
         embed.addFields({
           name: `#${remind.id} • ${loc.get("c_reminder9")} ${showDate(
+            local,
             loc,
             new Date(Number(remind.creation_date)),
           )}\n${expiration}`,
diff --git a/src/utils/time.ts b/src/utils/time.ts
index a92221f..61f8a88 100644
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -5,15 +5,8 @@
  * @param date Date
  * @returns String
  */
-export const showDate = (locale: Map<string, unknown>, date: Date) => {
-  const timezoned = new Date(date.getTime() + date.getTimezoneOffset() * 60000);
-
-  console.log(date.getTimezoneOffset());
-
-  return `${timezoned.toDateString()} ${locale.get("u_time_at")} ${
-    timezoned.toTimeString().split(" ")[0]
-  }`;
-};
+export const showDate = (tz: string, locale: Map<string, unknown>, date: Date) =>
+  date.toLocaleString(tz).replace(" ", ` ${locale.get("u_time_at")} `);
 
 enum TimeSecond {
   Year = 31536000,