Merge remote-tracking branch 'upstream/main'

This reverts commit 5205d8559f, reversing
changes made to 945acc1738.

.forgejo/workflows/build.yaml

@@ -53,4 +53,4 @@ jobs:
           git fetch origin
           git checkout github || git checkout -b github
           git merge origin/main --no-edit --allow-unrelated-histories
-          git push --force origin github
+          git push --force origin github

.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,40 @@
-# ShiggyCord [![Discord](https://img.shields.io/discord/1427396621905432699?style=social&logo=discord&label=ShiggyCord)](https://discord.gg/nQykFF9Ud6)
+# GoonCord [![Discord](https://img.shields.io/discord/1427396621905432699?style=social&logo=discord&label=ShiggyCord)](https://discord.gg/nQykFF9Ud6)
 
-Bundle based on Kettu, made just for fun
+An unofficial fork of ShiggyGord, made just for fun
+Idea taken from me 
 
 ## 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 Manger](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.

Stuff/uwu

@@ -0,0 +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/GoonCord"
   },
   "scripts": {
     "build": "node scripts/build.mjs",

shims/weakref.js

@@ -1,128 +0,0 @@
-// @ts-nocheck
-/**
- * WeakRef / FinalizationRegistry shim
- *
- * Purpose:
- * - Provide a safe fallback when the runtime doesn't implement WeakRef or FinalizationRegistry.
- * - This fallback avoids a ReferenceError and keeps code paths functional, but it does NOT
- *   emulate true weak-reference GC behavior. Use it only as a compatibility fallback.
- *
- */
-
-let _shimWarned = false;
-
-function _warnOnce(msg) {
-    if (!_shimWarned) {
-        // keep this quiet by default; print only when fallback is actually used
-        try {
-            // Prefer console.warn when available
-            if (typeof console !== "undefined" && typeof console.warn === "function") {
-                console.warn(`[weakref-shim] ${msg}`);
-            }
-        } catch (_) {}
-        _shimWarned = true;
-    }
-}
-
-/**
- * WeakRef fallback
- * - Keeps a strong reference to the target (so it will not be GC'd).
- * - Implements the minimal `deref()` API.
- */
-class WeakRefFallback {
-    constructor(value) {
-        // Keep a strong reference: this is *not* weak.
-        this.__value = value;
-        _warnOnce(
-            "WeakRef is not available in this runtime. Using a strong-reference fallback — memory usage/semantics may differ."
-        );
-    }
-
-    deref() {
-        return this.__value;
-    }
-}
-
-/**
- * FinalizationRegistry fallback
- * - No-op registry: register/unregister do nothing.
- * - Implement `cleanupSome` as a best-effort sync call when a callback is provided,
- *   but it cannot be tied to GC.
- */
-class FinalizationRegistryFallback {
-    constructor(cleanupCallback) {
-        // store callback to allow optional manual invocation via cleanupSome
-        this.__cleanupCallback = typeof cleanupCallback === "function" ? cleanupCallback : null;
-        _warnOnce(
-            "FinalizationRegistry is not available in this runtime. Using a no-op fallback — finalizers will not run based on GC."
-        );
-    }
-
-    /**
-     * register(target, heldValue, unregisterToken?)
-     * - No-op in fallback. We keep no strong references here on purpose (can't emulate GC).
-     */
-    register(_target /*, _heldValue, _unregisterToken */) {
-        // intentionally no-op
-    }
-
-    /**
-     * unregister(unregisterToken)
-     * - No-op in fallback.
-     */
-    unregister(_unregisterToken) {
-        // intentionally no-op
-    }
-
-    /**
-     * cleanupSome(callback?)
-     * - If provided a callback or a stored cleanup callback exists, call it immediately.
-     * - This is NOT equivalent to real FinalizationRegistry cleanup; it's only a manual helper.
-     */
-    cleanupSome(callback) {
-        const cb = typeof callback === "function" ? callback : this.__cleanupCallback;
-        if (typeof cb === "function") {
-            try {
-                cb();
-            } catch (e) {
-                try {
-                    if (typeof console !== "undefined" && typeof console.error === "function") {
-                        console.error("[weakref-shim] error running cleanupSome callback:", e);
-                    }
-                } catch (_) {}
-            }
-        }
-    }
-}
-
-// If native implementations exist, prefer them; otherwise install fallbacks.
-// We assign to globalThis so code using `WeakRef`/`FinalizationRegistry` globals doesn't crash.
-const NativeWeakRef =
-    typeof globalThis !== "undefined" && typeof globalThis.WeakRef === "function" ? globalThis.WeakRef : undefined;
-
-const NativeFinalizationRegistry =
-    typeof globalThis !== "undefined" && typeof globalThis.FinalizationRegistry === "function"
-        ? globalThis.FinalizationRegistry
-        : undefined;
-
-const WeakRefImpl = NativeWeakRef ?? WeakRefFallback;
-const FinalizationRegistryImpl = NativeFinalizationRegistry ?? FinalizationRegistryFallback;
-
-try {
-    if (typeof globalThis !== "undefined") {
-        if (typeof globalThis.WeakRef === "undefined") {
-            // Install fallback
-            globalThis.WeakRef = WeakRefImpl;
-        }
-        if (typeof globalThis.FinalizationRegistry === "undefined") {
-            globalThis.FinalizationRegistry = FinalizationRegistryImpl;
-        }
-    }
-} catch (e) {
-    // Some embedder environments may forbid writing globals; ignore in that case.
-    _warnOnce("Unable to assign WeakRef/FinalizationRegistry to globalThis: " + (e && e.message));
-}
-
-// Export the implementations so the inject mechanism (or explicit imports) can reference them.
-// Export names are sorted to satisfy lint rules that require sorted exports.
-export { FinalizationRegistryImpl as FinalizationRegistry, WeakRefImpl as WeakRef };

src/core/commands/reload.ts

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

src/core/i18n/default.json

@@ -4,12 +4,10 @@
   "ARE_YOU_SURE_TO_CLEAR_DATA": "Are you sure you wish to clear the data of {name}?",
   "ARE_YOU_SURE_TO_DELETE_PLUGIN": "Are you sure you wish to delete {name}? This will clear all of the plugin's data.",
   "ARE_YOU_SURE_TO_DELETE_THEME": "Are you sure you wish to delete {name}?",
-  "AUTO_DEBUGGER": "Automatically connect to Debugger",
-  "AUTO_DEVTOOLS": "Automatically connect to Devtools",
   "ASSET_BROWSER": "Asset Browser",
   "BRAND": "Brand",
-  "SHIGGYCORD": "ShiggyCold",
-  "SHIGGYCORD_URL": "ShiggyCold URL",
+  "SHIGGYCORD": "💦GoonCord💦",
+  "SHIGGYCORD_URL": "GoonCord URL",
   "BROWSER": "Browser",
   "BYTECODE": "Bytecode",
   "CANCEL": "Cancel",
@@ -21,14 +19,13 @@
   "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)",
   "COMMAND_EVAL_OPT_CODE": "The code to evaluate.",
   "COMMAND_PLUGINS_DESC": "Send list of installed plugins.",
   "COMMAND_PLUGINS_OPT_EPHEMERALLY": "Send plugins list ephemerally.",
-  "COMMAND_RELOAD_DESC": "Reload Discord.",
   "COMPONENT": "Component",
   "CONFIRMATION_LINK_IS_A_TYPE": "This link is a **{urlType, select, plugin {Plugin} theme {Theme} other {Add-on}}**, would you like to install it?",
   "CONNECT_TO_DEBUG_WEBSOCKET": "Connect to debug WebSocket",
@@ -39,7 +36,6 @@
   "DEBUG": "Debug",
   "DEBUGGER_URL": "Debugger URL",
   "DELETE": "Delete",
-  "DEVTOOLS_URL": "DevTools URL",
   "DESC_EXTRACT_FONTS_FROM_THEME": "Looks out for \"fonts\" field in your currently applied theme and install it.",
   "DEVELOPER": "Developer",
   "DEVELOPER_SETTINGS": "Developer Settings",
@@ -67,9 +63,8 @@
   "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",
   "MACHINE_ID": "Machine ID",
   "MANUFACTURER": "Manufacturer",
@@ -91,7 +86,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",
@@ -120,7 +115,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/i18n/index.ts

@@ -51,7 +51,7 @@ export function initFetchI18nStrings() {
       _loadedLocale.add(resolvedLocale);
 
       fetch(
-        `https://raw.githubusercontent.com/kmmiio99o/i18n/main/resources/${resolvedLocale}/shiggycord.json`,
+        `https://raw.githubusercontent.com/OTKUSteyler/i18n/main/resources/${resolvedLocale}/gooncord.json`,
       )
         .then((r) => r.json())
         .then((strings) => (_loadedStrings[resolvedLocale] = strings))

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/shiggyenhancements/index.tsx

@@ -29,7 +29,7 @@ declare module "@lib/api/settings" {
 }
 
 const soundUrl =
-  "https://github.com/kmmiio99o/kmmiio99o.github.io/raw/refs/heads/main/music/shiggycord.mp3";
+  "https://github.com/OTKUSteyler/GoonCord/raw/refs/heads/main/Stuff/All%20I%20Want%20For%20Christmas%20(Is%20Fark).mp3";
 const soundId = 6971;
 let soundDuration = -1;
 let timeoutId: NodeJS.Timeout | null = null;

src/core/ui/settings/index.ts

@@ -11,7 +11,7 @@ export { shiggycordIcon };
 
 export default function initSettings() {
   registerSection({
-    name: "ShiggyCord",
+    name: "GoonCord",
     items: [
       {
         key: "SHIGGYCORD",
@@ -21,11 +21,20 @@ export default function initSettings() {
         useTrailing: () => `(${version})`,
       },
       {
-        key: "BUNNY_PLUGINS",
+        key: "CORE_PLUGINS",
         title: () => Strings.PLUGINS,
         icon: findAssetId("ActivitiesIcon"),
         render: () => import("@core/ui/settings/pages/Plugins"),
       },
+      {
+        key: "BUNNY_PLUGINS",
+        title: () => "External Plugins",
+        icon:
+          findAssetId("DownloadIcon") ??
+          findAssetId("LinkIcon") ??
+          findAssetId("ActivitiesIcon"),
+        render: () => import("@core/ui/settings/pages/Plugins"),
+      },
       {
         key: "BUNNY_THEMES",
         title: () => Strings.THEMES,

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 }}
           >
-            Jolly your discord client!
+            Goon your discord client!
           </Text>
         </View>
 

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

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

src/core/ui/settings/pages/Plugins/CorePlugins.tsx

@@ -0,0 +1,45 @@
+import { React } from "@metro/common";
+import AddonPage from "@core/ui/components/AddonPage";
+import PluginCard from "@core/ui/settings/pages/Plugins/components/PluginCard";
+import { corePluginInstances, registeredPlugins } from "@lib/addons/plugins";
+import { UnifiedPluginModel } from "@core/ui/settings/pages/Plugins/models";
+import unifyBunnyPlugin from "@core/ui/settings/pages/Plugins/models/bunny";
+import { Strings } from "@core/i18n";
+
+/**
+ * Core plugins settings page
+ *
+ * This page shows only the built-in core plugins. Core plugins are always
+ * installed (can't be uninstalled) and are registered in `corePluginInstances`.
+ *
+ * We reuse the existing `AddonPage` + `PluginCard` components and feed them
+ * the normalized `UnifiedPluginModel` objects produced by `unifyBunnyPlugin`.
+ */
+
+export default function CorePlugins() {
+  return (
+    <AddonPage<UnifiedPluginModel>
+      CardComponent={PluginCard}
+      title={Strings.PLUGINS}
+      searchKeywords={[
+        "name",
+        "description",
+        (p) =>
+          p.authors
+            ?.map((a: any) => (typeof a === "string" ? a : a.name))
+            .join() || "",
+      ]}
+      // Provide simple sort options so the Search input renders round and a sort menu appears
+      sortOptions={{
+        "Name (A-Z)": (a, b) => a.name.localeCompare(b.name),
+        "Name (Z-A)": (a, b) => b.name.localeCompare(a.name),
+      }}
+      // Only core plugins: map corePluginInstances -> registeredPlugins -> unify
+      items={[...corePluginInstances.keys()]
+        .map((id) => registeredPlugins.get(id))
+        .filter((m): m is any => m !== undefined)
+        .map(unifyBunnyPlugin)}
+      ListHeaderComponent={() => null}
+    />
+  );
+}

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

@@ -702,7 +702,7 @@ export default function Plugins() {
           // Use the insertion order of pluginSettings so newly-installed plugins
           // (which add entries to pluginSettings) appear first.
           const installedBnIds = Object.keys(pluginSettings || {})
-            .filter((id) => registeredPlugins.has(id))
+            .filter((id) => registeredPlugins.has(id) && !isCorePlugin(id))
             .slice()
             .reverse();
 
@@ -710,12 +710,12 @@ export default function Plugins() {
             .map((id) => registeredPlugins.get(id)!)
             .map(unifyBunnyPlugin);
 
-          // Merge lists: show Vendetta-managed plugins first,
+          // Merge lists: show Vendetta-managed plugins first (recent first),
           // then Bunny-installed externals (recent first).
           const allPlugins = [...vdPlugins, ...bnPlugins];
 
-          // Include core plugins in the list
-          return allPlugins;
+          // Filter out core plugins from the list
+          return allPlugins.filter((plugin) => !isCorePlugin(plugin.id));
         }}
         ListHeaderComponent={() => null}
         installAction={{

src/index.ts

@@ -126,5 +126,5 @@ export default async () => {
   }
 
   // Final ready log for basic UI availability.
-  logger.log("ShiggyCord is ready.");
+  logger.log("GoonCord is ready.");
 };

src/lib/addons/themes/colors/patches/storage.ts

@@ -12,22 +12,39 @@ const mmkvStorage = proxyLazy(() => {
 
 export default function patchStorage() {
     const patchedKeys = new Set(["ThemeStore", "SelectivelySyncedUserSettingsStore"]);
+    const sanitizedKeys = new Set<string>();
 
     const patches = [
         after("get", mmkvStorage, ([key], ret) => {
-            if (!_colorRef.current || !patchedKeys.has(key)) return;
+            if (!patchedKeys.has(key)) return;
 
             const state = findInTree(ret._state, s => typeof s.theme === "string");
-            if (state) state.theme = _colorRef.key;
+            if (!state) return;
+
+            const lastSetDiscordTheme = _colorRef.lastSetDiscordTheme ?? "darker";
+
+            if (/^bn-theme-\d+$/.test(state.theme) && !/^bn-theme-\d+$/.test(lastSetDiscordTheme) && !sanitizedKeys.has(key)) {
+                try {
+                    const newVal = { ...ret._state, theme: lastSetDiscordTheme };
+                    mmkvStorage.set(key, newVal);
+                    sanitizedKeys.add(key);
+                } catch (e) {
+                }
+                state.theme = lastSetDiscordTheme;
+                return;
+            }
+
+            if (_colorRef.current) state.theme = _colorRef.key;
         }),
         before("set", mmkvStorage, ([key, value]) => {
             if (!patchedKeys.has(key)) return;
 
             const json = JSON.stringify(value);
             const lastSetDiscordTheme = _colorRef.lastSetDiscordTheme ?? "darker";
+            const replacementTheme = /^bn-theme-\d+$/.test(lastSetDiscordTheme) ? "darker" : lastSetDiscordTheme;
             const replaced = json.replace(
                 /"theme":"bn-theme-\d+"/,
-                `"theme":${JSON.stringify(lastSetDiscordTheme)}`
+                `"theme":${JSON.stringify(replacementTheme)}`
             );
 
             return [key, JSON.parse(replaced)];

src/lib/api/debug.ts

@@ -399,4 +399,4 @@ export function initDebugger() {
             logger.error("Failed to connect to ReactDevTools during startup:", e);
         }
     }
-}
+}

src/lib/ui/settings/patches/panel.tsx

@@ -57,15 +57,15 @@ export function patchPanelUI(unpatches: (() => void | boolean)[]) {
       after("default", findByNameLazy("getScreens", false), (_a, screens) => ({
         ...screens,
         VendettaCustomPage: {
-          title: "ShiggyCord",
+          title: "GoonCord",
           render: () => <CustomPageRenderer />,
         },
         BUNNY_CUSTOM_PAGE: {
-          title: "ShiggyCord",
+          title: "GoonCord",
           render: () => <CustomPageRenderer />,
         },
         SHIGGYCORD_CUSTOM_PAGE: {
-          title: "ShiggyCord",
+          title: "GoonCord",
           render: () => <CustomPageRenderer />,
         },
       })),