Update index.ts

fix: prevent account-switch cold launch splash hang

.github/workflows/release.yml

@@ -98,7 +98,7 @@ jobs:
           tag_name: ${{ steps.prepare.outputs.tag }}
           name: Release ${{ steps.prepare.outputs.tag }}
           files: |
-            dist/shiggycord.js
-            dist/shiggycord.min.js
+            dist/gooncord.js
+            dist/gooncord.min.js
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,39 +1,41 @@
-# ShiggyCord [![Discord](https://img.shields.io/discord/1427396621905432699?style=social&logo=discord&label=ShiggyCord)](https://discord.shiggycord.dev)
+# GoonCord [![Discord](https://img.shields.io/discord/1427396621905432699?style=social&logo=discord&label=ShiggyCord)](https://discord.shiggycord.dev)
 
-Bundle based on Kettu, made just for fun
+Bundle based on ShiggyCord, made just for fun
 
 ## Installing
 
 ### Android
 
-- Rooted: [Shiggy Xposed](https://github.com/kmmiio99o/ShiggyXposed)
+- Rooted: [Goon Xposed](https://github.com/OTKUSteyler/GoonXposed)
 
-- Non-Rooted: [Shiggy Manager](https://github.com/kmmiio99o/ShiggyManager)
+- Non-Rooted: [Goon Manager](https://github.com/OTKUSteyler/GoonManager)
 
 ### Android/iOS
 - **Injecting bundle:**
   ```url
-  https://github.com/kmmiio99o/ShiggyCord/releases/latest/download/shiggycord.js
+  https://github.com/OTKUSteyler/GoonCord/releases/latest/download/gooncord.js
   ```
 
 ## Building
-1. Install a ShiggyCord loader with loader config support (any mentioned in the [Installing](#installing) section).
+1. Install a GoonCord loader with loader config support (any mentioned in the [Installing](#installing) section).
 1. Go to Settings > General and enable Developer Settings.
 1. Clone the repo:
     ```
-    git clone https://github.com/kmmiio99o/Shiggycord.git
+    git clone https://github.com/OTKUSteyler/gooncord.git
     ```
 1. Install dependencies:
     ```
     bun i
     ```
-1. Build ShiggyCord's code:
+1. Build GoonCord's code:
     ```
     bun run build
     ```
 1. In the newly created `dist` directory, run a HTTP server. I recommend [http-server](https://www.npmjs.com/package/http-server).
-1. Go to Settings > Developer enabled earlier. Enable `Load from custom url` and input the IP address and port of the server (e.g. `http://192.168.1.236:4040/shiggycord.js`) in the new input box labelled `ShiggyCord URL`.
-1. Restart Discord. Upon reload, you should notice that your device will download ShiggyCord's bundled code from your server, rather than GitHub.
+1. Go to Settings > Developer enabled earlier. Enable `Load from custom url` and input the IP address and port of the server (e.g. `http://192.168.1.236:4040/gooncord.js`) in the new input box labelled `GoonCord URL`.
+1. Restart Discord. Upon reload, you should notice that your device will download GoonCord's bundled code from your server, rather than GitHub.
 1. Make your changes, rebuild, reload, go wild!
 
-Alternatively, you can directly *serve* the bundled code by running `bun run serve`. `shiggycord.js` will be served on your local address under the port 4040. You will then insert `http://<local ip address>:4040/shiggycord.js` as a custom url and reload. Whenever you restart your mobile client, the script will rebuild the bundle as your client fetches it.
+Alternatively, you can directly *serve* the bundled code by running `bun run serve`. `gooncord.js` will be served on your local address under the port 4040. You will then insert `http://<local ip address>:4040/gooncord.js` as a custom url and reload. Whenever you restart your mobile client, the script will rebuild the bundle as your client fetches it.
+
+![OTKUSteyler](https://count.getloli.com/@OTKUSteyler?name=OTKUSteyler&theme=miku&padding=7&offset=0&align=top&scale=1&pixelated=1&darkmode=1)

package.json

@@ -1,9 +1,9 @@
 {
-  "name": "ShiggyCord",
+  "name": "GoonCord",
   "private": true,
   "author": {
-    "name": "kmmiio99o",
-    "url": "https://github.com/kmmiio99o"
+    "name": "OTKUSteyler",
+    "url": "https://github.com/OTKUSteyler"
   },
   "scripts": {
     "build": "node scripts/build.mjs",

scripts/build.mjs

@@ -30,7 +30,7 @@ let context = null;
 const config = {
   entryPoints: ["src/entry.ts"],
   bundle: true,
-  outfile: "dist/shiggycord.js",
+  outfile: "dist/gooncord.js",
   format: "iife",
   splitting: false,
   // Enable minification by default for release builds (when a release-branch is provided).
@@ -77,7 +77,7 @@ const config = {
                 constModules: {
                   globals: {
                     "bunny-build-info": {
-                      version: `"1.4.1.7"`,
+                      version: `"1.4.1.8"`,
                     },
                   },
                 },

src/core/commands/debug.ts

@@ -8,7 +8,7 @@ import { messageUtil } from "@metro/common";
 
 export default () =>
   <ApplicationCommand>{
-    name: "debug",
+    name: "Goon",
     description: Strings.COMMAND_DEBUG_DESC,
     options: [
       {
@@ -24,8 +24,8 @@ export default () =>
         else{ info.device.codename = "(" + info.device.codename + ")" }
 
         const content = [
-            "**ShiggyCord Debug Info**",
-            `> ShiggyCord: ${info.bunny.version} (${info.bunny.loader.name} ${info.bunny.loader.version})`,
+            "**💦GoonCord💦 Debug Info**",
+            `> GoonCord: ${info.bunny.version} (${info.bunny.loader.name} ${info.bunny.loader.version})`,
             `> Discord: ${info.discord.version} (${info.discord.build})`,
             `> React: ${info.react.version} (RN ${info.react.nativeVersion})`,
             `> Hermes: ${info.hermes.version} (bcv${info.hermes.bytecodeVersion})`,

src/core/commands/reload.ts

@@ -4,7 +4,7 @@ import { BundleUpdaterManager } from "@lib/api/native/modules";
 
 export default () =>
   <ApplicationCommand>{
-    name: "reload",
+    name: "ReGoon",
     description: Strings.COMMAND_RELOAD_DESC,
     options: [],
     execute() {

src/core/debug/patches/patchAnimatedValue.ts

@@ -1,112 +0,0 @@
-import { instead } from "@lib/api/patcher";
-import { logger } from "@lib/utils/logger";
-import { _lazyContextSymbol } from "@metro/lazy";
-import { requireModule } from "@metro/internals/modules";
-import { LazyModuleContext } from "@metro/types";
-import { findByNameLazy } from "@metro/wrappers";
-
-function log(...messages: any[]) {
-  try {
-    logger.warn("[ShiggyCord] patchAnimatedValue:", ...messages);
-  } catch {}
-}
-
-/**
- * Discord's bundled React Native throws `AnimatedValue: Attempting to set value
- * to undefined` when a `undefined` value reaches an `Animated.Value` — either
- * through `setValue()` (which calls `_updateValue`) or through the constructor.
- * Some of Discord's own flows (and third-party plugins) hit this during
- * animation setup, which bubbles up to the React ErrorBoundary and makes
- * ShiggyCord render its custom crash screen.
- *
- * Fix the root cause instead of masking the symptom:
- * - `_updateValue` is a prototype method, so one patch covers every instance no
- *   matter which module captured the class reference.
- * - The constructor is guarded by swapping the public `Animated.Value`
- *   reference (and the module's `default` export) for a patched proxy so that
- *   `new Animated.Value(undefined)` can no longer throw.
- */
-export default function patchAnimatedValue() {
-  const unpatchers: Array<() => boolean> = [];
-
-  const install = (Class: any, source: string) => {
-    try {
-      if (
-        !Class?.prototype ||
-        typeof Class.prototype._updateValue !== "function"
-      ) {
-        log(`${source}: resolved value is not AnimatedValue, skipping`);
-        return;
-      }
-
-      // setValue(undefined) → _updateValue(undefined). Keep the last value.
-      unpatchers.push(
-        instead(
-          "_updateValue",
-          Class.prototype,
-          function (this: any, args: any[], origFunc: Function) {
-            if (args[0] === undefined) args[0] = this?._value ?? 0;
-            return origFunc(...args);
-          },
-        ),
-      );
-
-      // Constructor guard: coerce non-number to 0 so `new Animated.Value(undefined)` can't throw.
-      const guard = (args: any[], origFunc: Function) => {
-        if (typeof args[0] !== "number") args[0] = 0;
-        return origFunc(...args);
-      };
-
-      // 1. Module exports (`require(...).default`).
-      try {
-        const ctxt: LazyModuleContext | undefined =
-          findByNameLazy("AnimatedValue")[_lazyContextSymbol];
-        if (ctxt?.moduleId != null) {
-          const moduleExports = requireModule(ctxt.moduleId);
-          if (moduleExports?.default === Class) {
-            unpatchers.push(instead("default", moduleExports, guard));
-          }
-        }
-      } catch {}
-
-      // 2. The public `Animated.Value` namespace reference.
-      try {
-        const ReactNative: any = require("react-native");
-        const Animated = ReactNative?.Animated;
-        if (Animated && Animated.Value === Class) {
-          unpatchers.push(instead("Value", Animated, guard));
-        }
-      } catch {}
-
-      log(`${source}: patched _updateValue + constructor guard`);
-    } catch (e) {
-      log(`${source}: patch failed`, e);
-    }
-  };
-
-  // Primary: Discord's own RN Animated namespace (most reliable, no full scan).
-  try {
-    const ReactNative: any = require("react-native");
-    install(ReactNative?.Animated?.Value, "react-native.Animated.Value");
-    if (unpatchers.length > 0) {
-      return () => unpatchers.forEach((unpatch) => unpatch());
-    }
-  } catch (e) {
-    log("react-native.Animated path failed", e);
-  }
-
-  // Fallback: byName lookup.
-  try {
-    const ctxt: LazyModuleContext =
-      findByNameLazy("AnimatedValue")[_lazyContextSymbol];
-    if (ctxt) {
-      ctxt.getExports((Class: any) => install(Class, "findByNameLazy"));
-    } else {
-      log("no lazy context found");
-    }
-  } catch (e) {
-    log("findByNameLazy path failed", e);
-  }
-
-  return () => unpatchers.forEach((unpatch) => unpatch());
-}

src/core/debug/patches/patchSafeCard.ts

@@ -1,141 +0,0 @@
-import React from "react";
-import { View } from "react-native";
-import { byProps } from "@metro/filters";
-import { findExports } from "@metro/finders";
-import { findByStoreNameLazy } from "@metro/wrappers";
-import { instead } from "@lib/api/patcher";
-import { logger } from "@lib/utils/logger";
-import { isSemanticColor, resolveSemanticColor, semanticColors } from "@ui/color";
-
-const ThemeStore = findByStoreNameLazy("ThemeStore");
-
-function log(...messages: any[]) {
-  try {
-    logger.warn("[ShiggyCord] patchSafeCard:", ...messages);
-  } catch {}
-}
-
-let cardHealthy = false;
-
-const FALLBACK_STYLE = {
-  borderRadius: 8,
-  padding: 16,
-};
-
-function resolveCardBackground(): string | undefined {
-  try {
-    const color = semanticColors?.CARD_BACKGROUND_DEFAULT;
-    if (isSemanticColor(color)) return resolveSemanticColor(color);
-    if (typeof color === "string") return color;
-  } catch {}
-
-  return undefined;
-}
-
-export default function patchSafeCard() {
-  const unpatchers: Array<() => boolean> = [];
-
-  try {
-    const cardModule = findExports(byProps("Card"));
-    const origCard = cardModule?.Card;
-    if (typeof origCard !== "function") {
-      log("no Card function on the resolved module, skipping");
-      return () => unpatchers.forEach((unpatch) => unpatch());
-    }
-
-    log("resolved design Card from first-match module");
-
-    let cardBackground = resolveCardBackground();
-
-    const unsubscribeTheme = ThemeStore?.addChangeListener?.(() => {
-      const resolved = resolveCardBackground();
-      if (resolved) cardBackground = resolved;
-    });
-    if (typeof unsubscribeTheme === "function") {
-      unpatchers.push(() => {
-        unsubscribeTheme();
-        return true;
-      });
-    }
-
-    class CardProbeBoundary extends React.Component<
-      {
-        fallback: React.ReactNode;
-        children?: React.ReactNode;
-      },
-      { hasError: boolean }
-    > {
-      state = { hasError: false };
-
-      static getDerivedStateFromError() {
-        return { hasError: true };
-      }
-
-      componentDidCatch(error: unknown) {
-        try {
-          log("Card render threw, using View fallback", error);
-        } catch {}
-      }
-
-      render() {
-        if (this.state.hasError) return this.props.fallback;
-        return this.props.children;
-      }
-    }
-
-    class HealthyProbe extends React.Component<{
-      onHealthy: () => void;
-      children?: React.ReactNode;
-    }> {
-      componentDidMount() {
-        this.props.onHealthy();
-      }
-
-      render() {
-        return this.props.children;
-      }
-    }
-
-    const SafeCard = function SafeCard(props: any) {
-      if (cardHealthy) return React.createElement(origCard, props);
-
-      return React.createElement(
-        CardProbeBoundary,
-        {
-          fallback: React.createElement(
-            View,
-            {
-              style: [
-                FALLBACK_STYLE,
-                ...(cardBackground
-                  ? [{ backgroundColor: cardBackground }]
-                  : []),
-                props?.style,
-              ],
-            },
-            props?.children,
-          ),
-        },
-        React.createElement(
-          HealthyProbe,
-          {
-            onHealthy: () => {
-              cardHealthy = true;
-            },
-          },
-          React.createElement(origCard, props),
-        ),
-      );
-    };
-
-    unpatchers.push(
-      instead("Card", cardModule, (args: any[]) => SafeCard(args[0] ?? {})),
-    );
-
-    log("patched design Card (adaptive probe on first mount)");
-  } catch (e) {
-    log("patch failed", e);
-  }
-
-  return () => unpatchers.forEach((unpatch) => unpatch());
-}

src/core/i18n/default.json

@@ -11,8 +11,8 @@
   "IMAGE_FILES": "Image Files",
   "TEXT_FILES": "Text Files",
   "BRAND": "Brand",
-  "SHIGGYCORD": "ShiggyCord",
-  "SHIGGYCORD_URL": "ShiggyCord URL",
+  "SHIGGYCORD": "GoonCord",
+  "SHIGGYCORD_URL": "GoonCord URL",
   "BROWSER": "Browser",
   "BYTECODE": "Bytecode",
   "CANCEL": "Cancel",
@@ -24,7 +24,7 @@
   "CLEAR_DATA_SUCCESSFUL": "Cleared data for {name}",
   "CODEBERG": "Codeberg",
   "CODENAME": "Codename",
-  "COMMAND_DEBUG_DESC": "Send ShiggyCord debug info.",
+  "COMMAND_DEBUG_DESC": "Send 💦GoonCord💦 debug info.",
   "COMMAND_DEBUG_OPT_EPHEMERALLY": "Send debug info ephemerally.",
   "COMMAND_EVAL_DESC": "Evaluate JavaScript code.",
   "COMMAND_EVAL_OPT_ASYNC": "Whether to support 'await' in code. Must explicitly return for result (default: false)",
@@ -70,7 +70,7 @@
   "LABEL_EXTRACT_FONTS_FROM_THEME": "Extract font from theme",
   "LINKS": "Links",
   "LOAD_FROM_CUSTOM_URL": "Load from custom URL",
-  "LOAD_FROM_CUSTOM_URL_DEC": "Load ShiggyCord from a custom endpoint.",
+  "LOAD_FROM_CUSTOM_URL_DEC": "Load GoonCord from a custom endpoint.",
   "LOAD_REACT_DEVTOOLS": "Load React DevTools",
   "SHIGGY_URL": "ShiggyCord URL",
   "LOADER": "Loader",
@@ -94,7 +94,7 @@
   "PLUGINS": "Plugins",
   "REFETCH": "Refetch",
   "RELOAD": "Reload",
-  "RELOAD_DISCORD": "Reshiggy your Discord",
+  "RELOAD_DISCORD": "ReGoon your Discord",
   "RELOAD_IN_NORMAL_MODE": "Reload in Normal Mode",
   "RELOAD_IN_NORMAL_MODE_DESC": "Safe mode currently enabled, tap to reload in normal mode",
   "RELOAD_IN_SAFE_MODE": "Reload in Safe Mode",
@@ -123,7 +123,7 @@
   "UH_OH": "Uh Oh",
   "UNINSTALL": "Uninstall",
   "UNINSTALL_TITLE": "Uninstall {title}",
-  "URL_PLACEHOLDER": "https://github.com/kmmiio99o/ShiggyCord",
+  "URL_PLACEHOLDER": "https://github.com/OTKUSteyler/GoonCord",
   "VERSION": "Version",
   "VERSIONS": "Versions"
 }

src/core/plugins/badges/index.tsx

@@ -1,7 +1,6 @@
 import { after } from "@lib/api/patcher";
 import { onJsxCreate } from "@lib/api/react/jsx";
-import { findByName, findByNameLazy } from "@metro";
-import { useEffect, useState } from "react";
+import { findByNameLazy } from "@metro";
 import { defineCorePlugin } from "..";
 import { FluxDispatcher } from "@metro/common";
 
@@ -10,14 +9,9 @@ interface Badge {
     url: string;
 }
 
-interface CustomBadge {
-    label: string;
-    url: string;
-}
-
 interface UserBadgeData {
     roles?: string[];
-    custom?: CustomBadge[];
+    custom?: Badge[];
 }
 
 interface BadgeData {
@@ -33,6 +27,11 @@ interface RolesData {
     [roleName: string]: RoleData;
 }
 
+interface EquicordBadge {
+    tooltip: string;
+    badge: string;
+}
+
 const useBadgesModule = findByNameLazy("useBadges", false);
 
 const badgesCache = new Map<string, Badge[]>();
@@ -42,7 +41,7 @@ const pendingRequests = new Set<string>();
 export default defineCorePlugin({
     manifest: {
         id: "bunny.badges",
-    version: "1.1.0",
+        version: "1.2.0",
         type: "plugin",
         spec: 3,
         main: "",
@@ -74,27 +73,67 @@ export default defineCorePlugin({
             }
         });
 
+        // Small helper so one failing/optional source can't take down the others.
+        const safeFetchJson = async <T,>(url: string, fallback: T): Promise<T> => {
+            try {
+                const res = await fetch(url);
+                if (!res.ok) return fallback;
+                return (await res.json()) as T;
+            } catch {
+                return fallback;
+            }
+        };
+
         const fetchAndProcessBadges = async (userId: string) => {
             if (pendingRequests.has(userId)) return;
             pendingRequests.add(userId);
 
             try {
-                const [badgesRes, rolesRes] = await Promise.all([
-                    fetch("https://codeberg.org/raincord/badges/raw/branch/main/badges.json"),
-                    fetch("https://codeberg.org/raincord/badges/raw/branch/main/assets/roles/roles.json"),
+                const [
+                    goonBadgesData,
+                    goonRolesData,
+                    rainBadgesData,
+                    rainRolesData,
+                    equicordData,
+                ] = await Promise.all([
+                    safeFetchJson<BadgeData>(
+                        "https://codeberg.org/chocomint-chan/GoonCord_Badges/raw/branch/main/badges.json",
+                        {}
+                    ),
+                    safeFetchJson<RolesData>(
+                        "https://codeberg.org/chocomint-chan/GoonCord_Badges/raw/branch/main/assets/roles/roles.json",
+                        {}
+                    ),
+                    safeFetchJson<BadgeData>(
+                        "https://codeberg.org/raincord/badges/raw/branch/main/badges.json",
+                        {}
+                    ),
+                    safeFetchJson<RolesData>(
+                        "https://codeberg.org/raincord/badges/raw/branch/main/assets/roles/roles.json",
+                        {}
+                    ),
+                    safeFetchJson<Record<string, EquicordBadge[]>>(
+                        "https://badge.equicord.org/badges.json",
+                        {}
+                    ),
                 ]);
 
-                const badgesData: BadgeData = await badgesRes.json();
-                const rolesData: RolesData = await rolesRes.json();
-
-                const userBadgeData = badgesData[userId] || { roles: [], custom: [] };
-
                 const allBadges: Badge[] = [];
 
+                // GoonCord and raincord badge/role sets are keyed independently,
+                // so each source is resolved against its own roles file.
+                const badgeSources: Array<{ badges: BadgeData; roles: RolesData }> = [
+                    { badges: goonBadgesData, roles: goonRolesData },
+                    { badges: rainBadgesData, roles: rainRolesData },
+                ];
+
+                badgeSources.forEach(({ badges, roles }) => {
+                    const userBadgeData = badges[userId];
+                    if (!userBadgeData) return;
+
                     // process role badges
-                if (userBadgeData.roles) {
-                    userBadgeData.roles.forEach(roleName => {
-                        const roleData = rolesData[roleName];
+                    userBadgeData.roles?.forEach(roleName => {
+                        const roleData = roles[roleName];
                         if (roleData) {
                             allBadges.push({
                                 label: roleData.label,
@@ -102,12 +141,18 @@ export default defineCorePlugin({
                             });
                         }
                     });
-                }
 
                     // process custom badges
                     if (userBadgeData.custom) {
                         allBadges.push(...userBadgeData.custom);
                     }
+                });
+
+                // process equicord badges
+                const equicordUserBadges = equicordData[userId] ?? [];
+                equicordUserBadges.forEach(b => {
+                    allBadges.push({ label: b.tooltip, url: b.badge });
+                });
 
                 badgesCache.set(userId, allBadges);
 
@@ -122,12 +167,14 @@ export default defineCorePlugin({
                 });
 
                 FluxDispatcher.dispatch({ type: "USER_UPDATE", user: { id: userId } });
+            } catch (err) {
+                console.error("[bunny.badges] Failed to fetch/process badges:", err);
             } finally {
                 pendingRequests.delete(userId);
             }
         };
 
-        after("default", useBadgesModule, ([user], result) => {
+        return after("default", useBadgesModule, ([user], result) => {
             if (!user) return;
 
             const userId = user.userId;

src/core/plugins/favouriteanything/Settings.tsx

@@ -0,0 +1,13 @@
+import { Forms } from "@vendetta/ui/components";
+const { FormSection, FormText } = Forms;
+
+export default () => (
+    <FormSection title="FavouriteAnything">
+        <FormText>
+            Adds the favourite button to ALL media in the image viewer, not just GIFs!
+        </FormText>
+        <FormText style={{ marginTop: 8, color: "#b9bbbe" }}>
+            Images and videos can now be saved to your GIF favourites picker. Works by patching Discord's GIFFavButton to accept all media types.
+        </FormText>
+    </FormSection>
+)

src/core/plugins/favouriteanything/index.ts

@@ -0,0 +1,169 @@
+// src/core/plugins/favouriteanything/index.ts
+import { defineCorePlugin } from "..";
+import { findByProps } from "@metro";
+import { before } from "@lib/api/patcher";
+import { logger } from "@lib/utils/logger";
+
+type PatchCleanupFn = () => void;
+
+let origType: Function | null = null;
+let memoWrapper: any = null;
+let retryTimeout: ReturnType<typeof setTimeout> | null = null;
+let unpatchAddFavorite: PatchCleanupFn | null = null;
+let origUseFavoriteGIFsMobile: Function | null = null;
+let favMobileModule: any = null;
+
+const VIDEO_EXT = [".mp4", ".webm", ".mov", ".avi", ".mkv", ".flv", ".wmv", ".m4v", ".gifv"];
+const processed = new WeakSet<object>();
+
+function isVideo(url: string): boolean {
+    if (!url) return false;
+    const path = url.split("?")[0].toLowerCase();
+    return VIDEO_EXT.some(e => path.endsWith(e));
+}
+
+function makeVideoThumbnail(url: string): string {
+    if (!url) return url;
+    let out = url.replace("cdn.discordapp.com", "media.discordapp.net");
+    if (out.includes("media.discordapp.net") || out.includes("images-ext")) {
+        return out + (out.includes("?") ? "&" : "?") + "format=jpeg";
+    }
+    return url;
+}
+
+function findGIFFavButton(): any {
+    const modules = (globalThis as any).__bunny?.metro?.modules ?? (globalThis as any).modules;
+    if (!modules) return null;
+
+    for (const id in modules) {
+        try {
+            const mod = modules[id]?.publicModule?.exports;
+            if (!mod) continue;
+            const def = mod.default;
+            if (def?.$$typeof?.toString().includes("memo") && def.type) {
+                if (def.type.displayName === "GIFFavButton" || def.type.name === "GIFFavButton") return def;
+            }
+            if (typeof mod === "function" && (mod.displayName === "GIFFavButton" || mod.name === "GIFFavButton")) return mod;
+        } catch {}
+    }
+    return null;
+}
+
+function patchSource(source: any): any {
+    if (source.isGIFV) return source;
+    return {
+        ...source,
+        isGIFV: true,
+        embedURI: source.embedURI || source.sourceURI || source.uri,
+        videoURI: source.videoURI || source.uri,
+        embedProviderName: source.embedProviderName || "",
+    };
+}
+
+function applyPatch(): boolean {
+    memoWrapper = findGIFFavButton();
+    if (!memoWrapper) return false;
+
+    origType = memoWrapper.type;
+    memoWrapper.type = function PatchedGIFFavButton(props: any) {
+        const p = { ...props };
+        if (p.source && !p.source.isGIFV) p.source = patchSource(p.source);
+        return (origType as Function)(p);
+    };
+    (memoWrapper.type as any).displayName = "GIFFavButton";
+    return true;
+}
+
+function patchAddFavorite(): void {
+    const favModule = findByProps("addFavoriteGIF");
+    if (!favModule) return;
+
+    unpatchAddFavorite = before("addFavoriteGIF", favModule, (args: any[]) => {
+        const data = args[0];
+        if (!data || typeof data !== "object") return;
+        const url = data.url || "";
+        const src = data.src || "";
+
+        if (isVideo(url) || isVideo(src)) {
+            data.format = 2;
+        } else if (data.format === 2) {
+            data.format = 1;
+        }
+    });
+}
+
+function patchMobileFavorites(): void {
+    const mod = findByProps("useFavoriteGIFsMobile");
+    if (!mod) return;
+
+    favMobileModule = mod;
+    origUseFavoriteGIFsMobile = mod.useFavoriteGIFsMobile;
+
+    let lastFavs: any = null;
+    mod.useFavoriteGIFsMobile = function (...args: any[]) {
+        const result = (origUseFavoriteGIFsMobile as Function).apply(this, args);
+        if (result?.favorites && Array.isArray(result.favorites) && result.favorites !== lastFavs) {
+            lastFavs = result.favorites;
+            for (const item of result.favorites) {
+                if (!item || processed.has(item)) continue;
+                processed.add(item);
+                if (isVideo(item.url) || isVideo(item.src)) {
+                    item.src = makeVideoThumbnail(item.src || item.url);
+                }
+            }
+        }
+        return result;
+    };
+}
+
+export default defineCorePlugin({
+    manifest: {
+        id: "bunny.favouriteanything",
+        version: "1.0.0",
+        type: "plugin",
+        spec: 3,
+        main: "",
+        display: {
+            name: "FavouriteAnything",
+            description: "Adds the favourite button to ALL media, not just GIFs",
+            authors: [{ name: "TheUnrealZaka" }],
+        },
+    },
+
+    start() {
+        if (applyPatch()) {
+            logger.log("[FavouriteAnything] Patched GIFFavButton.");
+        } else {
+            let retries = 0;
+            const tryPatch = () => {
+                if (applyPatch()) {
+                    logger.log("[FavouriteAnything] Patched GIFFavButton (after retry).");
+                    retryTimeout = null;
+                } else if (retries++ < 50) {
+                    retryTimeout = setTimeout(tryPatch, 300);
+                } else {
+                    logger.error("[FavouriteAnything] GIFFavButton not found after retries.");
+                }
+            };
+            retryTimeout = setTimeout(tryPatch, 300);
+        }
+
+        patchAddFavorite();
+        patchMobileFavorites();
+    },
+
+    stop() {
+        if (retryTimeout) { clearTimeout(retryTimeout); retryTimeout = null; }
+        if (memoWrapper && origType) {
+            memoWrapper.type = origType;
+            origType = null;
+            memoWrapper = null;
+        }
+        if (unpatchAddFavorite) { unpatchAddFavorite(); unpatchAddFavorite = null; }
+        if (favMobileModule && origUseFavoriteGIFsMobile) {
+            favMobileModule.useFavoriteGIFsMobile = origUseFavoriteGIFsMobile;
+            origUseFavoriteGIFsMobile = null;
+            favMobileModule = null;
+        }
+    },
+});

src/core/plugins/fixembed/index.ts

@@ -42,19 +42,19 @@ function transformLinks(content: string, config: FixEmbedSettings): string {
   if (config.instagram) {
     result = result.replace(
       /https?:\/\/(?:www\.)?instagram\.com(\/[^\s]+)/gi,
-      "https://uuinstagram.com$1",
+      "https://kkinstagram.com$1",
     );
   }
   // TikTok: Replace domain, keep path
   if (config.tiktok) {
     result = result.replace(
       /https?:\/\/(?:www\.)?tiktok\.com(\/[^\s]+)/gi,
-      "https://tnktok.com$1",
+      "https://tiktokez.com$1",
     );
     // TikTok short links (vm.tiktok.com)
     result = result.replace(
       /https?:\/\/vm\.tiktok\.com\/([A-Za-z0-9]+)\/?/gi,
-      "https://vm.tnktok.com/$1",
+      "https://vm.tiktokez.com/$1",
     );
   }
   // Reddit: Replace domain, keep path

src/core/plugins/index.ts

@@ -35,6 +35,11 @@ export const getCorePlugins = (): CorePluginRecord => ({
   "bunny.badges": makeLazyPlugin(() => require("./badges")),
   "bunny.notrack": makeLazyPlugin(() => require("./notrack")),
   "bunny.fixembed": makeLazyPlugin(() => require("./fixembed")),
+  "bunny.favouriteanything": makeLazyPlugin(() => require("./favouriteanything")),
+  "bunny.nodelete": makeLazyPlugin(() => require("./nodelete")),
+  "bunny.maxverstappen": makeLazyPlugin(() => require("./maxverstappen")),
+  
+  
 });
 
 /**

src/core/plugins/maxverstappen/index.ts

@@ -0,0 +1,145 @@
+import { defineCorePlugin } from "..";
+import { findByProps } from "@metro";
+import { logger } from "@lib/utils/logger";
+
+const { ReactNative } = window as any;
+const { DCDSoundManager } = ReactNative?.NativeModules || {};
+
+const AUDIO_URL = "https://github.com/OTKUSteyler/GoonCord/raw/refs/heads/main/src/core/plugins/maxverstappen/Max%20Verstappen.mp3";
+const SOUND_ID = 6972;
+const TRIGGER_CHANCE = 0.33;
+const MAX_PATTERN = /\bmax\s*verst[ae]pp?en\b/i;
+
+let isPlaying = false;
+let isPrepared = false;
+let isPreparing = false;
+let soundDuration = 30000;
+let timeoutId: NodeJS.Timeout | null = null;
+let onMessageCreate: ((e: any) => void) | null = null;
+let onMessageSend: ((e: any) => void) | null = null;
+
+function shouldTrigger(): boolean {
+    return Math.random() < TRIGGER_CHANCE;
+}
+
+function checkText(text: string): boolean {
+    if (!text) return false;
+    return MAX_PATTERN.test(text) && shouldTrigger();
+}
+
+function ensurePrepared(): Promise<number> {
+    return new Promise((resolve) => {
+        if (isPrepared) return resolve(soundDuration);
+        if (isPreparing) return resolve(-1);
+
+        isPreparing = true;
+        DCDSoundManager.prepare(AUDIO_URL, "music", SOUND_ID, (error: any, sound: any) => {
+            isPreparing = false;
+            if (error) {
+                logger.error("[MaxVerstappen] Failed to prepare:", error);
+                return resolve(-1);
+            }
+            isPrepared = true;
+            soundDuration = sound?.duration || 30000;
+            resolve(soundDuration);
+        });
+    });
+}
+
+async function playAudio() {
+    if (!DCDSoundManager) return;
+    if (isPlaying) return;
+
+    const duration = await ensurePrepared();
+    if (duration === -1) return;
+
+    isPlaying = true;
+    try {
+        await DCDSoundManager.play(SOUND_ID);
+        timeoutId = setTimeout(() => {
+            DCDSoundManager.stop(SOUND_ID);
+            isPlaying = false;
+            timeoutId = null;
+        }, soundDuration);
+    } catch (e) {
+        logger.error("[MaxVerstappen] Playback error:", e);
+        isPlaying = false;
+    }
+}
+
+export default defineCorePlugin({
+    manifest: {
+        id: "bunny.maxverstappen",
+        version: "1.0.0",
+        type: "plugin",
+        spec: 3,
+        main: "",
+        display: {
+            name: "Max Verstappen",
+            description: "Plays audio when Max Verstappen is mentioned (33% chance)",
+            authors: [{ name: "GoonCord Team" }],
+        },
+    },
+
+    start() {
+        if (!DCDSoundManager) {
+            logger.error("[MaxVerstappen] DCDSoundManager not found");
+            return;
+        }
+
+        const FluxDispatcher = findByProps("dispatch", "subscribe");
+        if (!FluxDispatcher) {
+            logger.error("[MaxVerstappen] FluxDispatcher not found");
+            return;
+        }
+
+        onMessageCreate = ({ message }: any) => {
+            try {
+                if (!message?.content) return;
+                if (checkText(message.content)) playAudio();
+            } catch (e) {
+                logger.error("[MaxVerstappen] MESSAGE_CREATE error:", e);
+            }
+        };
+
+        onMessageSend = ({ message }: any) => {
+            try {
+                if (!message?.content) return;
+                if (checkText(message.content)) playAudio();
+            } catch (e) {
+                logger.error("[MaxVerstappen] MESSAGE_SEND error:", e);
+            }
+        };
+
+        FluxDispatcher.subscribe("MESSAGE_CREATE", onMessageCreate);
+        FluxDispatcher.subscribe("MESSAGE_SEND", onMessageSend);
+
+        logger.log("[MaxVerstappen] Enabled");
+    },
+
+    stop() {
+        if (DCDSoundManager && isPlaying) {
+            DCDSoundManager.stop(SOUND_ID);
+            isPlaying = false;
+        }
+
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+            timeoutId = null;
+        }
+
+        const FluxDispatcher = findByProps("dispatch", "subscribe");
+        if (FluxDispatcher) {
+            if (onMessageCreate) FluxDispatcher.unsubscribe("MESSAGE_CREATE", onMessageCreate);
+            if (onMessageSend) FluxDispatcher.unsubscribe("MESSAGE_SEND", onMessageSend);
+        }
+
+        onMessageCreate = null;
+        onMessageSend = null;
+        isPrepared = false;
+        isPreparing = false;
+        soundDuration = 30000;
+
+        logger.log("[MaxVerstappen] Disabled");
+    },
+});

src/core/plugins/nodelete/index.ts

@@ -0,0 +1,76 @@
+// src/core/plugins/NoDelete/index.ts
+import { defineCorePlugin } from "..";
+import { findByStoreName } from "@metro";
+import { before } from "@lib/api/patcher";
+import { logger } from "@lib/utils/logger";
+import { FluxDispatcher } from "@metro/common";
+
+type PatchCleanupFn = () => void;
+
+let patches: PatchCleanupFn[] = [];
+let MessageStore: any = null;
+let deleteable: string[] = [];
+
+function patchDispatcher(): PatchCleanupFn {
+    return before("dispatch", FluxDispatcher, (args: any[]) => {
+        try {
+            if (!MessageStore) MessageStore = findByStoreName("MessageStore");
+
+            const event = args[0];
+            if (!event || event?.type !== "MESSAGE_DELETE") return;
+            if (!event?.id || !event?.channelId) return;
+
+            if (deleteable.includes(event.id)) {
+                deleteable.splice(deleteable.indexOf(event.id), 1);
+                return;
+            }
+
+            deleteable.push(event.id);
+
+            args[0] = {
+                type: "MESSAGE_EDIT_FAILED_AUTOMOD",
+                messageData: {
+                    type: 1,
+                    message: {
+                        channelId: event.channelId,
+                        messageId: event.id,
+                    },
+                },
+                errorResponseBody: {
+                    code: 200000,
+                    message: "[deleted]",
+                },
+            };
+        } catch (e) {
+            logger.error("NoDelete: dispatcher patch failed", e);
+        }
+    });
+}
+
+export default defineCorePlugin({
+    manifest: {
+        id: "bunny.nodelete",
+        version: "1.0.0",
+        type: "plugin",
+        spec: 3,
+        main: "",
+        display: {
+            name: "NoDelete",
+            description: "Prevents messages from being deleted from your view",
+            authors: [{ name: "meqativ" }],
+        },
+    },
+
+    start() {
+        patches = [patchDispatcher()].filter(Boolean);
+        logger.log("NoDelete: Enabled");
+    },
+
+    stop() {
+        patches.forEach((p) => p?.());
+        patches = [];
+        deleteable = [];
+        MessageStore = null;
+        logger.log("NoDelete: Disabled");
+    },
+});

src/core/plugins/nodelete/settings.jsx

@@ -0,0 +1,90 @@
+import { React, ReactNative } from "@vendetta/metro/common";
+import { storage } from "@vendetta/plugin";
+import { useProxy } from "@vendetta/storage";
+import { showConfirmationAlert } from "@vendetta/ui/alerts";
+import { Forms } from "@vendetta/ui/components";
+import { getAssetIDByName } from "@vendetta/ui/assets";
+import { getTranslation } from "./translations.js";
+import ItemWithRemove from "../../common/ui/ItemWithRemove.jsx";
+import { findByStoreName, findByProps } from "@vendetta/metro";
+let UserStore, UncachedUserManager, Profiles;
+export default (props) => {
+	UserStore ??= findByStoreName("UserStore");
+	UncachedUserManager ??= findByProps("fetchProfile", "getUser", "setFlag");
+	Profiles ??= findByProps("showUserProfile");
+	async function openProfile(userId) {
+		const show = Profiles.showUserProfile;
+
+		UserStore.getUser(userId) ? show({ userId }) : UncachedUserManager.getUser(userId).then(({ id }) => show({ userId: id }));
+	}
+
+	useProxy(storage);
+	const [users, setUsers] = React.useState(storage["ignore"]["users"]);
+
+	const handleRemoveUser = (userId) => {
+		const newArr = users.filter((id) => id !== userId);
+		storage["ignore"].users = newArr;
+		setUsers(newArr);
+	};
+	const handleClearUsers = () => {
+		storage["ignore"].users = [];
+		setUsers([]);
+	};
+	let uncached = 0;
+
+	return (
+		<ReactNative.ScrollView style={{ flex: 1 }}>
+			<Forms.FormSection title={getTranslation("settings.titles.settings")} titleStyleType="no_border">
+				<Forms.FormRow label={getTranslation("settings.showTimestamps")} trailing={<Forms.FormSwitch value={storage.timestamps} onValueChange={(v) => (storage.timestamps = v)} />} />
+				<Forms.FormRow label={getTranslation("settings.ewTimestampFormat")} trailing={<Forms.FormSwitch value={storage["ew"]} onValueChange={(v) => (storage.ew = v)} />} />
+				<Forms.FormDivider />
+				<Forms.FormRow label={getTranslation("settings.youDeletedItWarning")} />
+			</Forms.FormSection>
+			<Forms.FormSection title={getTranslation("settings.titles.filters")}>
+				<Forms.FormRow label={getTranslation("settings.ignoreBots")} trailing={<Forms.FormSwitch value={storage["ignore"].bots} onValueChange={(value) => (storage["ignore"].bots = value)} />} />
+				<Forms.FormRow
+					label={getTranslation("settings.clearUsersLabel", true)?.make?.(users.length)}
+					trailing={<Forms.FormRow.Icon source={getAssetIDByName("ic_trash_24px")} />}
+					onPress={() => {
+						if (users.length !== 0)
+							showConfirmationAlert({
+								title: getTranslation("settings.confirmClear.title"),
+								content: getTranslation("settings.confirmClear.description", true)?.make?.(users.length),
+								confirmText: getTranslation("settings.confirmClear.yes"),
+								cancelText: getTranslation("settings.confirmClear.no"),
+								confirmColor: "brand",
+								onConfirm: handleClearUsers,
+							});
+					}}
+				/>
+				<ReactNative.ScrollView style={{ flex: 1, gap: 3, marginLeft: 15 }}>
+					{users.map((id) => {
+						const User = UserStore.getUser(id) ?? {};
+						let pfp = User?.getAvatarURL?.(null,26)?.replace?.(/\.(gif|webp)/, ".png");
+						if (!pfp) {
+							pfp = "https://cdn.discordapp.com/embed/avatars/1.png?size=48";
+							User.username = `${id} Uncached`;
+							User.discriminator = "0";
+							if (uncached === 0) User.username += ", press the avatar";
+							uncached++;
+						}
+
+						return (
+							<ItemWithRemove
+								imageSource={{ uri: pfp }}
+								onImagePress={() => {
+									openProfile(id);
+								}}
+								onRemove={() => handleRemoveUser(id)}
+								label={User.username + (User.discriminator == 0 ? "" : `#${User.discriminator}`)}
+								labelRemove={getTranslation("settings.removeUserButton")}
+							/>
+						);
+					})}
+				</ReactNative.ScrollView>
+				<Forms.FormDivider />
+				<Forms.FormRow label={getTranslation("settings.addUsersInfo")} />
+			</Forms.FormSection>
+		</ReactNative.ScrollView>
+	);
+};

src/core/plugins/nodelete/translations.js

@@ -0,0 +1,158 @@
+function slavicNoun(number, $1, $2, $5) {
+  let n = Math.abs(number);
+  n %= 100;
+  if (n >= 5 && n <= 20) return $5;
+
+  n %= 10;
+  if (n === 1) return $1;
+  if (n >= 2 && n <= 4) return $2;
+  return $5;
+}
+function latinNoun(number, $1, $x) {
+  return number === 1 ? $1 : $x;
+}
+export let massive = {};
+massive = {
+  settings: {
+    titles: {
+      settings: {
+        "en-GB": "Settings",
+        uk: "Налаштування",
+        ru: "Настройки",
+      },
+      filters: {
+        "en-GB": "Filters",
+        uk: "Фільтри",
+        ru: "Фильтры",
+      },
+    },
+    showTimestamps: {
+      "en-GB": "Show the time of deletion",
+      uk: "Показувати час видалення",
+      ru: "Показывать время удаления",
+    },
+    ewTimestampFormat: {
+      "en-GB": "Use 12-hour format",
+      uk: "Використовувати 12-годинний формат",
+      ru: "Использовать 12-часовой формат",
+    },
+    youDeletedItWarning: {
+      "en-GB": "The messages YOU deleted - are not saved",
+      uk: "Повідомлення які видалили ВИ - не зберігаются",
+      ru: "Сообщения удаленные ВАМИ - не сохраняются",
+    },
+    addUsersInfo: {
+      "en-GB": () =>
+        `To add or remove users from the ignore list, follow these steps:\n` +
+        `1. open their profile\n` +
+        `2. press the •••\n` +
+        `3. press "${massive.optionLabels[0]["en-GB"]}"\n` +
+        `4. 🎉`,
+      uk: () =>
+        `Щоб добавити когось до списку ігнорованих користувачів, виконайте ці дії:\n` +
+        `1. відкрите їх профіль\n` +
+        `2. натисніть •••\n` +
+        `3. натисніть "${massive.optionLabels[0]["uk"]}"\n` +
+        `4. 🎉`,
+      ru: () =>
+        `Чтобы добавить кого-то в список игнорированных пользователей - следуйте этим шагам\n` +
+        `1. откройте их профиль\n` +
+        `2. нажмите •••\n` +
+        `3. нажмите "${massive.optionLabels[0]["ru"]}"\n` +
+        `4. 🎉`,
+    },
+    ignoreBots: {
+      "en-GB": "Ignore bots",
+      uk: "Ігнорувати ботів",
+      ru: "Игнорировать ботов",
+    },
+    clearUsersLabel: {
+      "en-GB": (amount) =>
+        `You have ${amount} user${latinNoun(amount, "", "s")} in the ignored users list`,
+      uk: (amount) =>
+        `Ви маєте ${amount} користувач${slavicNoun(amount, "а", "а", "ів")} у списку ігнорованих користувачів`,
+      ru: (amount) =>
+        `Вы имеете ${amount} пользовател${slavicNoun(amount, "я", "я", "ей")} в списке игнорированных пользователей`,
+    },
+
+    confirmClear: {
+      title: {
+        "en-GB": "Hold on!",
+        uk: "Почекай-но!",
+        ru: "Положди-ка!",
+      },
+      description: {
+        "en-GB": (amount) =>
+          `This will remove ${amount} user${latinNoun(amount, "", "s")} from the ignored users list.\nDo you you really want to do that?`,
+        uk: (amount) =>
+          `Це прибере ${amount} користувач${slavicNoun(amount, "а", "а", "ів")} зі списку ігнорованих користувачів.\nВи дійсно хочете продовжити?`,
+        ru: (amount) =>
+          `Это уберет ${amount} пользовател${slavicNoun(amount, "я", "я", "ей")} из списка игнорированных пользователей.\nВы действительно хотите продолжить?`,
+      },
+      yes: {
+        "en-GB": "Yes",
+        uk: "Так",
+        ru: "Да",
+      },
+      no: {
+        "en-GB": "Cancel",
+        uk: "Відминити",
+        ru: "Отменить",
+      },
+    },
+    removeUserButton: {
+      "en-GB": "REMOVE",
+      uk: "ПРИБРАТИ",
+      ru: "УБРАТЬ",
+    },
+  },
+  optionLabels: [
+    {
+      "en-GB": "Add to NoDelete ignored users list",
+      uk: "Добавити до списку ігнорованих користувачів у NoDelete",
+      ru: "Добавить в список игнорированных пользователей в NoDelete",
+    },
+    {
+      "en-GB": "Remove from the NoDelete ignore list",
+      uk: "Прибрати з списку ігнорованих користувачів у NoDelete",
+      ru: "Убрать из списка игнорированных пользователей в NoDelete",
+    },
+  ],
+  toastLabels: [
+    {
+      "en-GB": "Added {user} to the ignored users list",
+      uk: "{user} добавлено до списку ігнорованих користувачів",
+      ru: "{user} добавлены в список игнорированных пользователей",
+    },
+    {
+      "en-GB": "Removed {user} from the ignored users list",
+      uk: "{user} прибрано зі списку ігнорованих користувачів",
+      ru: "{user} убраны из списка игнорированных пользователей",
+    },
+  ],
+  thisMessageWasDeleted: {
+    "en-GB": "This message was deleted",
+    uk: "Це повідомлення було видалено",
+    ru: "Это сообщение было удалено",
+  },
+};
+
+export const locale = () =>
+  vendetta.metro.findByStoreName("LocaleStore").locale;
+const defaultLocale = "en-GB";
+export function getTranslation(find, fn) {
+  let value = massive;
+
+  for (const key of find.split(".")) {
+    // biome-ignore lint/suspicious/noPrototypeBuiltins: meow
+    if (value?.hasOwnProperty(key)) {
+      value = value[key];
+    } else {
+      value = massive;
+    }
+  }
+  if (value === massive) return find;
+  let localized = value[locale()] ?? value[defaultLocale] ?? find;
+  if (typeof localized === "function" && !fn) localized = localized();
+  return fn ? { make: localized } : localized;
+}

src/core/ui/settings/index.ts

@@ -11,7 +11,7 @@ export { shiggycordIcon };
 
 export default function initSettings() {
   registerSection({
-    name: "ShiggyCord",
+    name: "GoonCord",
     items: [
       {
         key: "SHIGGYCORD",

src/core/ui/settings/pages/General/About.tsx

@@ -97,7 +97,7 @@ export default function About() {
             variant="text-md/medium"
             style={{ textAlign: "center", marginTop: 4 }}
           >
-            Shiggy your discord client!
+            💦Goon💦 your discord client!
           </Text>
         </View>
 

src/core/ui/settings/pages/General/index.tsx

@@ -125,7 +125,7 @@ export default function General() {
       >
         <TableRowGroup title="App Information">
           <TableRow
-            label="ShiggyCord"
+            label="GoonCord"
             icon={<TableRow.Icon source={{ uri: shiggycordIcon ?? "" }} />}
             trailing={<TableRow.TrailingText text={debugInfo.bunny.version} />}
           />

src/entry.ts

@@ -11,7 +11,7 @@ async function initializeShiggyCord() {
     Object.freeze = Object.seal = Object;
 
     await require("@metro/internals/caches").initMetroCache();
-    await require(".").default();
+    require(".").default();
   } catch (e) {
     const { ClientInfoManager } = require("@lib/api/native/modules");
     const stack = e instanceof Error ? e.stack : undefined;

src/index.ts

@@ -1,6 +1,4 @@
-import patchAnimatedValue from "@core/debug/patches/patchAnimatedValue";
 import patchErrorBoundary from "@core/debug/patches/patchErrorBoundary";
-import patchSafeCard from "@core/debug/patches/patchSafeCard";
 import initFixes from "@core/fixes";
 import { initFetchI18nStrings } from "@core/i18n";
 import initSettings from "@core/ui/settings";
@@ -32,8 +30,6 @@ export default async () => {
     ["patchCommands", () => patchCommands()],
     ["patchJsx", () => patchJsx()],
     ["patchErrorBoundary", () => patchErrorBoundary()],
-    ["patchAnimatedValue", () => patchAnimatedValue()],
-    ["patchSafeCard", () => patchSafeCard()],
     ["initVendettaObject", () => initVendettaObject()],
     ["initFetchI18nStrings", () => initFetchI18nStrings()],
     ["initSettings", () => initSettings()],

src/lib/addons/themes/colors/updater.ts

@@ -40,19 +40,55 @@ export function updateBunnyColor(colorManifest: ColorManifest | null, { update =
     });
 
     if (internalDef != null) {
+        // Register the synthetic key BEFORE calling native, and verify it actually
+        // landed in every table native reads from. If any registration step fails,
+        // bail out to a known-good theme instead of handing native an unknown key.
+        try {
             tokenRef.Theme[ref.key.toUpperCase()] = ref.key;
+
+            if (!FormDivider.DIVIDER_COLORS[ref.current!.reference]) {
+                throw new Error(`Missing divider color reference: ${ref.current!.reference}`);
+            }
             FormDivider.DIVIDER_COLORS[ref.key] = FormDivider.DIVIDER_COLORS[ref.current!.reference];
 
-        Object.keys(tokenRef.Shadow).forEach(k => tokenRef.Shadow[k][ref.key] = tokenRef.Shadow[k][ref.current!.reference]);
+            Object.keys(tokenRef.Shadow).forEach(k => {
+                if (!(ref.current!.reference in tokenRef.Shadow[k])) {
+                    throw new Error(`Missing shadow reference: ${ref.current!.reference}`);
+                }
+                tokenRef.Shadow[k][ref.key] = tokenRef.Shadow[k][ref.current!.reference];
+            });
+
             Object.keys(tokenRef.SemanticColor).forEach(k => {
+                if (!(ref.current!.reference in tokenRef.SemanticColor[k])) {
+                    throw new Error(`Missing semantic color reference: ${ref.current!.reference}`);
+                }
                 tokenRef.SemanticColor[k][ref.key] = {
                     ...tokenRef.SemanticColor[k][ref.current!.reference]
                 };
             });
+        } catch (e) {
+            console.error("Failed to register custom theme key, falling back", e);
+            ref.current = null; // force fallback path below
+        }
     }
 
     if (update) {
         AppearanceManager.setShouldSyncAppearanceSettings(false);
-        AppearanceManager.updateTheme(internalDef != null ? ref.key : ref.lastSetDiscordTheme);
+
+        const targetTheme = ref.current != null ? ref.key : ref.lastSetDiscordTheme;
+
+        // This is the actual crash site: a raw call into native code with no
+        // guard. Wrap it so a native-side rejection can't take the whole
+        // bridge/thread down — fall back to the last known-good Discord theme.
+        try {
+            AppearanceManager.updateTheme(targetTheme);
+        } catch (e) {
+            console.error(`Native rejected theme "${targetTheme}", reverting to "${ref.lastSetDiscordTheme}"`, e);
+            try {
+                AppearanceManager.updateTheme(ref.lastSetDiscordTheme);
+            } catch (e2) {
+                console.error("Fallback theme also failed to apply", e2);
+            }
+        }
     }
 }

src/metro/polyfills/redesign.ts

@@ -117,17 +117,13 @@ for (const [id, moduleExports] of cacher.getModules()) {
         }
 
         const exportsKeysLength = Reflect.ownKeys(actualExports).length;
-        if (_source[prop] && exportsKeysLength >= _source[prop]) {
+        if (_source[prop] && exportsKeysLength <= _source[prop]) {
             continue;
         }
 
         _module[prop] = actualExports[prop];
         _source[prop] = Reflect.ownKeys(actualExports).length;
         cacher.cacheId(id);
-
-        if (exportsKeysLength === 1) {
-            redesignProps.delete(prop);
-        }
     }
 }