From dcd88116521bc17d11020b1e00c19957fb27748e Mon Sep 17 00:00:00 2001
From: OTKUSteyler <90369564+OTKUSteyler@users.noreply.github.com>
Date: Mon, 5 Jan 2026 01:36:09 +0100
Subject: [PATCH] Revert "Merge remote-tracking branch 'upstream/main' into
 dev"

This reverts commit 81b32a491e4506fe931d7652f615c906433f0491, reversing
changes made to 179679f215e64626a7ec99b7f786c58c810671bc.
---
 src/core/commands/debug.ts           | 18 ++++++++++--------
 src/core/commands/plugins.ts         |  2 +-
 src/core/plugins/messagefix/index.ts |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/core/commands/debug.ts b/src/core/commands/debug.ts
index b35f9d2..466af61 100644
--- a/src/core/commands/debug.ts
+++ b/src/core/commands/debug.ts
@@ -29,11 +29,13 @@ export default () =>
         `> Device: ${info.device.model}`,
       ].join("\n");
 
-        if (ephemeral?.value) {
-            messageUtil.sendBotMessage(ctx.channel.id, content);
-        } else {
-            const fixNonce = (BigInt(Date.now() - 1420070400000) << 22n).toString();
-            messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {nonce:fixNonce});
-        }
-    }
-};
+      if (ephemeral?.value) {
+        messageUtil.sendBotMessage(ctx.channel.id, content);
+      } else {
+        const fixNonce = Date.now().toString();
+        messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {
+          nonce: fixNonce,
+        });
+      }
+    },
+  };
diff --git a/src/core/commands/plugins.ts b/src/core/commands/plugins.ts
index dccefd9..b83f6a7 100644
--- a/src/core/commands/plugins.ts
+++ b/src/core/commands/plugins.ts
@@ -190,7 +190,7 @@ export default () =>
       if (ephemeral?.value) {
         messageUtil.sendBotMessage(ctx.channel.id, content);
       } else {
-        const fixNonce = (BigInt(Date.now() - 1420070400000) << 22n).toString();
+        const fixNonce = Date.now().toString();
         messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {
           nonce: fixNonce,
         });
diff --git a/src/core/plugins/messagefix/index.ts b/src/core/plugins/messagefix/index.ts
index 0b35216..15731a8 100644
--- a/src/core/plugins/messagefix/index.ts
+++ b/src/core/plugins/messagefix/index.ts
@@ -33,7 +33,7 @@ export default defineCorePlugin({
     ) {
       // Ensure options exists and has a nonce
       options = options || {};
-      options.nonce = options.nonce || (BigInt(Date.now() - 1420070400000) << 22n).toString();
+      options.nonce = options.nonce || Date.now().toString();
 
       // Call original with fixed parameters
       return originalSendMessage.call(