Merge remote-tracking branch 'upstream/main'

Added a comment explaining the purpose of the module fixes and improved error handling for timestamp localization.

.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.shiggycord.dev)
+# 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.

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",

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).

scripts/serve.mjs

@@ -19,7 +19,7 @@ export function serve(options) {
     if (pathname?.endsWith(".js")) {
       try {
         let fileToServe;
-        if (pathname === "/shiggycord.min.js") {
+        if (pathname === "/gooncord.min.js") {
           const { config, context, timeTook } = await buildBundle({
             minify: true,
           });
@@ -30,7 +30,7 @@ export function serve(options) {
             true,
           );
           fileToServe = config.outfile.replace(/\.js$/, ".min.js");
-        } else if (pathname === "/shiggycord.js") {
+        } else if (pathname === "/gooncord.js") {
           const { config, context, timeTook } = await buildBundle();
           printBuildSuccess(context.hash, args["release-branch"], timeTook);
           fileToServe = config.outfile;
@@ -55,7 +55,7 @@ export function serve(options) {
 
   server.listen(args.port ?? 4040);
 
-  console.info(chalk.bold.yellowBright("Serving ShiggyCord on:"));
+  console.info(chalk.bold.yellowBright("Serving GoonCord on:"));
 
   const netInterfaces = os.networkInterfaces();
   for (const netinterfaces of Object.values(netInterfaces)) {

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: [
       {
@@ -20,8 +20,8 @@ export default () =>
     execute([ephemeral], ctx) {
       const info = getDebugInfo();
       const content = [
-        "**ShiggyCord Debug Info**",
-        `> ShiggyCord: ${info.bunny.version} (${info.bunny.loader.name} ${info.bunny.loader.version})`,
+        "**💦GoonCord Goon 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})`,
@@ -29,11 +29,13 @@ export default () =>
         `> Device: ${info.device.model}`,
       ].join("\n");
 
-        if (ephemeral?.value) {
-            messageUtil.sendBotMessage(ctx.channel.id, content);
-        } else {
-            const fixNonce = (BigInt(Date.now() - 1420070400000) << 22n).toString();
-            messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {nonce:fixNonce});
-        }
-    }
-};
+      if (ephemeral?.value) {
+        messageUtil.sendBotMessage(ctx.channel.id, content);
+      } else {
+        const fixNonce = Date.now().toString();
+        messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {
+          nonce: fixNonce,
+        });
+      }
+    },
+  };

src/core/commands/plugins.ts

@@ -190,7 +190,7 @@ export default () =>
       if (ephemeral?.value) {
         messageUtil.sendBotMessage(ctx.channel.id, content);
       } else {
-        const fixNonce = (BigInt(Date.now() - 1420070400000) << 22n).toString();
+        const fixNonce = Date.now().toString();
         messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {
           nonce: fixNonce,
         });

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,15 +4,13 @@
   "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",
   "ASSET_TYPES": "Asset Types",
   "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,14 +22,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",
@@ -42,7 +39,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",
@@ -70,9 +66,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",
@@ -95,7 +90,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",
@@ -124,7 +119,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/messagefix/index.ts

@@ -33,7 +33,7 @@ export default defineCorePlugin({
     ) {
       // Ensure options exists and has a nonce
       options = options || {};
-      options.nonce = options.nonce || (BigInt(Date.now() - 1420070400000) << 22n).toString();
+      options.nonce = options.nonce || Date.now().toString();
 
       // Call original with fixed parameters
       return originalSendMessage.call(

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",

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

@@ -32,19 +32,7 @@ export default function General() {
   const navigation = NavigationNative.useNavigation();
 
   // Custom Community Card Button
-  const CommunityCardButton = ({
-    icon,
-    label,
-    subLabel,
-    color,
-    onPress,
-  }: {
-    icon?: number | { uri: string };
-    label: string;
-    subLabel?: string | null;
-    color?: string;
-    onPress?: () => void;
-  }) => (
+  const CommunityCardButton = ({ icon, label, subLabel, color, onPress }) => (
     <TouchableOpacity style={{ flex: 1 }} onPress={onPress} activeOpacity={0.7}>
       <Card
         style={{
@@ -72,7 +60,7 @@ export default function General() {
             }}
           >
             <TableRow.Icon
-              source={icon as any}
+              source={icon}
               style={{
                 tintColor: "#FFFFFF",
                 width: 24,
@@ -125,8 +113,8 @@ export default function General() {
       >
         <TableRowGroup title="App Information">
           <TableRow
-            label="ShiggyCord"
-            icon={<TableRow.Icon source={{ uri: shiggycordIcon ?? "" }} />}
+            label="💦GoonCord💦"
+            icon={<TableRow.Icon source={{ uri: shiggycordIcon }} />}
             trailing={<TableRow.TrailingText text={debugInfo.bunny.version} />}
           />
           <TableRow

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

@@ -401,4 +401,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 />,
         },
       })),