src/plugins/_api/badges/index.tsx

@@ -73,17 +73,19 @@ export default definePlugin({
             find: ".description,delay:",
             replacement: [
                 {
-                    match: /(alt:" ","aria-hidden":!0,src:)(.{0,20}(\i)\.icon\))/,
+                    // alt: "", aria-hidden: false, src: originalSrc
-                    replace: (_, rest, originalSrc, badge) => `...${badge}.props,${rest}${badge}.image??(${originalSrc})`
+                    match: /alt:" ","aria-hidden":!0,src:(?=.{0,20}(\i)\.icon)/,
+                    // ...badge.props, ..., src: badge.image ?? ...
+                    replace: "...$1.props,$& $1.image??"
                 },
                 {
                     match: /(?<="aria-label":(\i)\.description,.{0,200})children:/,
-                    replace: "children:$1.component?$self.renderBadgeComponent({...$1}) :"
+                    replace: "children:$1.component ? $self.renderBadgeComponent({ ...$1 }) :"
                 },
                 // conditionally override their onClick with badge.onClick if it exists
                 {
                     match: /href:(\i)\.link/,
-                    replace: "...($1.onClick&&{onClick:vcE=>$1.onClick(vcE,$1)}),$&"
+                    replace: "...($1.onClick && { onClick: vcE => $1.onClick(vcE, $1) }),$&"
                 }
             ]
         }

src/plugins/consoleShortcuts/index.ts

@@ -153,7 +153,13 @@ function makeShortcuts() {
         openModal: { getter: () => ModalAPI.openModal },
         openModalLazy: { getter: () => ModalAPI.openModalLazy },
 
-        Stores: Webpack.fluxStores
+        Stores: {
+            getter: () => Object.fromEntries(
+                Common.Flux.Store.getAll()
+                    .map(store => [store.getName(), store] as const)
+                    .filter(([name]) => name.length > 1)
+            )
+        }
     };
 }
 

src/plugins/crashHandler/index.ts

@@ -173,15 +173,6 @@ export default definePlugin({
         } catch (err) {
             CrashHandlerLogger.debug("Failed to pop all layers.", err);
         }
-        try {
-            FluxDispatcher.dispatch({
-                type: "DEV_TOOLS_SETTINGS_UPDATE",
-                settings: { displayTools: false, lastOpenTabId: "analytics" }
-            });
-        } catch (err) {
-            CrashHandlerLogger.debug("Failed to close DevTools.", err);
-        }
-
         if (settings.store.attemptToNavigateToHome) {
             try {
                 NavigationRouter.transitionToGuild("@me");
@@ -190,6 +181,7 @@ export default definePlugin({
             }
         }
 
+
         // Set isRecovering to false before setting the state to allow us to handle the next crash error correcty, in case it happens
         setImmediate(() => isRecovering = false);
 

src/webpack/webpack.ts

@@ -20,7 +20,6 @@ import { makeLazy, proxyLazy } from "@utils/lazy";
 import { LazyComponent } from "@utils/lazyReact";
 import { Logger } from "@utils/Logger";
 import { canonicalizeMatch } from "@utils/patches";
-import { FluxStore } from "@webpack/types";
 
 import { traceFunction } from "../debug/Tracer";
 import { Flux } from "./common";
@@ -38,8 +37,6 @@ export const onceReady = new Promise<void>(r => _resolveReady = r);
 export let wreq: WebpackRequire;
 export let cache: WebpackRequire["c"];
 
-export const fluxStores: Record<string, FluxStore> = {};
-
 export type FilterFn = (mod: any) => boolean;
 
 export type PropsFilter = Array<string>;
@@ -431,24 +428,9 @@ export function findByCodeLazy(...code: CodeFilter) {
  * Find a store by its displayName
  */
 export function findStore(name: StoreNameFilter) {
-    let res = fluxStores[name] as any;
+    const res = Flux.Store.getAll
-    if (res == null) {
+        ? Flux.Store.getAll().find(filters.byStoreName(name))
-        for (const store of Flux.Store.getAll?.() ?? []) {
+        : find(filters.byStoreName(name), { isIndirect: true });
-            const storeName = store.getName();
-
-            if (storeName === name) {
-                res = store;
-            }
-
-            if (fluxStores[storeName] == null) {
-                fluxStores[storeName] = store;
-            }
-        }
-
-        if (res == null) {
-            res = find(filters.byStoreName(name), { isIndirect: true });
-        }
-    }
 
     if (!res)
         handleModuleNotFound("findStore", name);