From 71ade7d658652522b6e8d124618b54e37b9dc039 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 18 Feb 2025 16:31:21 -0300
Subject: [PATCH] Make sure i18n find does not match the wrong mapping

---
 src/webpack/common/utils.ts | 5 ++---
 src/webpack/webpack.ts      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 9ed1489c8..fd555c217 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { runtimeHashMessageKey } from "@utils/intlHash";
 import type { Channel } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
@@ -58,8 +57,8 @@ export const { match, P }: Pick<typeof import("ts-pattern"), "match" | "P"> = ma
 export const lodash: typeof import("lodash") = findByPropsLazy("debounce", "cloneDeep");
 
 export const i18n = mapMangledModuleLazy('defaultLocale:"en-US"', {
-    t: filters.byProps(runtimeHashMessageKey("DISCORD")),
-    intl: filters.byProps("string", "format"),
+    t: m => m?.[Symbol.toStringTag] === "IntlMessagesProxy",
+    intl: m => m != null && Object.getPrototypeOf(m)?.withFormatters != null
 }, true);
 
 export let SnowflakeUtils: t.SnowflakeUtils;
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 6b17bd1d6..3a7fe2a52 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -504,7 +504,7 @@ function getAllPropertyNames(object: Record<PropertyKey, any>, includeNonEnumera
 
     const getKeys = includeNonEnumerable ? Object.getOwnPropertyNames : Object.keys;
     do {
-        getKeys(object).forEach(name => names.add(name));
+        getKeys(object).forEach(name => name !== "__esModule" && names.add(name));
         object = Object.getPrototypeOf(object);
     } while (object != null);