From fbff8e2e52b8076cbab5e908ecdb2524665702e5 Mon Sep 17 00:00:00 2001
From: Strencher <46447572+Strencher@users.noreply.github.com>
Date: Fri, 24 Mar 2023 17:32:11 +0100
Subject: [PATCH] Fix: - Fix sourceURL for client bundle - Fix export getters
 throwing errors

---
 injector/src/modules/betterdiscord.js  |  1 +
 renderer/src/modules/webpackmodules.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/injector/src/modules/betterdiscord.js b/injector/src/modules/betterdiscord.js
index 7a323652..cd455ee9 100644
--- a/injector/src/modules/betterdiscord.js
+++ b/injector/src/modules/betterdiscord.js
@@ -60,6 +60,7 @@ export default class BetterDiscord {
                     return false;
                 }
             })();
+            //# sourceURL=betterdiscord/renderer.js
         `);
 
         if (!success) return; // TODO: cut a fatal log
diff --git a/renderer/src/modules/webpackmodules.js b/renderer/src/modules/webpackmodules.js
index 96be30b6..6d6f0ff0 100644
--- a/renderer/src/modules/webpackmodules.js
+++ b/renderer/src/modules/webpackmodules.js
@@ -159,14 +159,18 @@ export default class WebpackModules {
         for (let i = 0; i < indices.length; i++) {
             const index = indices[i];
             if (!modules.hasOwnProperty(index)) continue;
-            const module = modules[index];
+            
+            let module = null;
+            try {module = modules[index]} catch {continue;};
+
             const {exports} = module;
             if (!exports || exports === window || exports === document.documentElement) continue;
             
-            if (typeof(exports) === "object" && searchExports) {
+            if (typeof(exports) === "object" && searchExports && exports[Symbol.toStringTag] !== "DOMTokenList") {
                 for (const key in exports) {
-                    let foundModule = null;
-                    const wrappedExport = exports[key];
+                    let foundModule = null, wrappedExport = null;
+                    try {wrappedExport = exports[key];} catch {continue;}
+
                     if (!wrappedExport) continue;
                     if (wrappedFilter(wrappedExport, module, index)) foundModule = wrappedExport;
                     if (!foundModule) continue;
@@ -481,4 +485,4 @@ export default class WebpackModules {
     }
 }
 
-WebpackModules.initialize();
\ No newline at end of file
+WebpackModules.initialize();