Compare commits
No commits in common. "main" and "1.4.1.6" have entirely different histories.
25 changed files with 91 additions and 827 deletions
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
|
|
@ -98,7 +98,7 @@ jobs:
|
|||
tag_name: ${{ steps.prepare.outputs.tag }}
|
||||
name: Release ${{ steps.prepare.outputs.tag }}
|
||||
files: |
|
||||
dist/gooncord.js
|
||||
dist/gooncord.min.js
|
||||
dist/shiggycord.js
|
||||
dist/shiggycord.min.js
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
|
|||
24
README.md
24
README.md
|
|
@ -1,41 +1,39 @@
|
|||
# GoonCord [](https://discord.shiggycord.dev)
|
||||
# ShiggyCord [](https://discord.shiggycord.dev)
|
||||
|
||||
Bundle based on ShiggyCord, made just for fun
|
||||
Bundle based on Kettu, made just for fun
|
||||
|
||||
## Installing
|
||||
|
||||
### Android
|
||||
|
||||
- Rooted: [Goon Xposed](https://github.com/OTKUSteyler/GoonXposed)
|
||||
- Rooted: [Shiggy Xposed](https://github.com/kmmiio99o/ShiggyXposed)
|
||||
|
||||
- Non-Rooted: [Goon Manager](https://github.com/OTKUSteyler/GoonManager)
|
||||
- Non-Rooted: [Shiggy Manager](https://github.com/kmmiio99o/ShiggyManager)
|
||||
|
||||
### Android/iOS
|
||||
- **Injecting bundle:**
|
||||
```url
|
||||
https://github.com/OTKUSteyler/GoonCord/releases/latest/download/gooncord.js
|
||||
https://github.com/kmmiio99o/ShiggyCord/releases/latest/download/shiggycord.js
|
||||
```
|
||||
|
||||
## Building
|
||||
1. Install a GoonCord loader with loader config support (any mentioned in the [Installing](#installing) section).
|
||||
1. Install a ShiggyCord 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/OTKUSteyler/gooncord.git
|
||||
git clone https://github.com/kmmiio99o/Shiggycord.git
|
||||
```
|
||||
1. Install dependencies:
|
||||
```
|
||||
bun i
|
||||
```
|
||||
1. Build GoonCord's code:
|
||||
1. Build ShiggyCord'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/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. 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. Make your changes, rebuild, reload, go wild!
|
||||
|
||||
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.
|
||||
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "GoonCord",
|
||||
"name": "ShiggyCord",
|
||||
"private": true,
|
||||
"author": {
|
||||
"name": "OTKUSteyler",
|
||||
"url": "https://github.com/OTKUSteyler"
|
||||
"name": "kmmiio99o",
|
||||
"url": "https://github.com/kmmiio99o"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "node scripts/build.mjs",
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ let context = null;
|
|||
const config = {
|
||||
entryPoints: ["src/entry.ts"],
|
||||
bundle: true,
|
||||
outfile: "dist/gooncord.js",
|
||||
outfile: "dist/shiggycord.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.8"`,
|
||||
version: `"1.4.1.6"`,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.2 KiB |
|
|
@ -8,7 +8,7 @@ import { messageUtil } from "@metro/common";
|
|||
|
||||
export default () =>
|
||||
<ApplicationCommand>{
|
||||
name: "Goon",
|
||||
name: "debug",
|
||||
description: Strings.COMMAND_DEBUG_DESC,
|
||||
options: [
|
||||
{
|
||||
|
|
@ -24,8 +24,8 @@ export default () =>
|
|||
else{ info.device.codename = "(" + info.device.codename + ")" }
|
||||
|
||||
const content = [
|
||||
"**💦GoonCord💦 Debug Info**",
|
||||
`> GoonCord: ${info.bunny.version} (${info.bunny.loader.name} ${info.bunny.loader.version})`,
|
||||
"**ShiggyCord Debug Info**",
|
||||
`> ShiggyCord: ${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})`,
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import { BundleUpdaterManager } from "@lib/api/native/modules";
|
|||
|
||||
export default () =>
|
||||
<ApplicationCommand>{
|
||||
name: "ReGoon",
|
||||
name: "reload",
|
||||
description: Strings.COMMAND_RELOAD_DESC,
|
||||
options: [],
|
||||
execute() {
|
||||
BundleUpdaterManager.reload();
|
||||
},
|
||||
};
|
||||
};
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
"IMAGE_FILES": "Image Files",
|
||||
"TEXT_FILES": "Text Files",
|
||||
"BRAND": "Brand",
|
||||
"SHIGGYCORD": "GoonCord",
|
||||
"SHIGGYCORD_URL": "GoonCord URL",
|
||||
"SHIGGYCORD": "ShiggyCord",
|
||||
"SHIGGYCORD_URL": "ShiggyCord 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 💦GoonCord💦 debug info.",
|
||||
"COMMAND_DEBUG_DESC": "Send ShiggyCord 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 GoonCord from a custom endpoint.",
|
||||
"LOAD_FROM_CUSTOM_URL_DEC": "Load ShiggyCord 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": "ReGoon your Discord",
|
||||
"RELOAD_DISCORD": "Reshiggy 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/OTKUSteyler/GoonCord",
|
||||
"URL_PLACEHOLDER": "https://github.com/kmmiio99o/ShiggyCord",
|
||||
"VERSION": "Version",
|
||||
"VERSIONS": "Versions"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import { after } from "@lib/api/patcher";
|
||||
import { onJsxCreate } from "@lib/api/react/jsx";
|
||||
import { findByNameLazy } from "@metro";
|
||||
import { findByName, findByNameLazy } from "@metro";
|
||||
import { useEffect, useState } from "react";
|
||||
import { defineCorePlugin } from "..";
|
||||
import { FluxDispatcher } from "@metro/common";
|
||||
|
||||
|
|
@ -9,9 +10,14 @@ interface Badge {
|
|||
url: string;
|
||||
}
|
||||
|
||||
interface CustomBadge {
|
||||
label: string;
|
||||
url: string;
|
||||
}
|
||||
|
||||
interface UserBadgeData {
|
||||
roles?: string[];
|
||||
custom?: Badge[];
|
||||
custom?: CustomBadge[];
|
||||
}
|
||||
|
||||
interface BadgeData {
|
||||
|
|
@ -27,11 +33,6 @@ interface RolesData {
|
|||
[roleName: string]: RoleData;
|
||||
}
|
||||
|
||||
interface EquicordBadge {
|
||||
tooltip: string;
|
||||
badge: string;
|
||||
}
|
||||
|
||||
const useBadgesModule = findByNameLazy("useBadges", false);
|
||||
|
||||
const badgesCache = new Map<string, Badge[]>();
|
||||
|
|
@ -39,20 +40,20 @@ const badgeProps = new Map<string, Record<string, any>>();
|
|||
const pendingRequests = new Set<string>();
|
||||
|
||||
export default defineCorePlugin({
|
||||
manifest: {
|
||||
id: "bunny.badges",
|
||||
version: "1.2.0",
|
||||
type: "plugin",
|
||||
spec: 3,
|
||||
main: "",
|
||||
display: {
|
||||
name: "Badges",
|
||||
description: "Adds badges to user's profile",
|
||||
authors: [{ name: "cocobo1" }, { name: "pylixonly" }],
|
||||
},
|
||||
manifest: {
|
||||
id: "bunny.badges",
|
||||
version: "1.1.0",
|
||||
type: "plugin",
|
||||
spec: 3,
|
||||
main: "",
|
||||
display: {
|
||||
name: "Badges",
|
||||
description: "Adds badges to user's profile",
|
||||
authors: [{ name: "cocobo1" }, { name: "pylixonly" }],
|
||||
},
|
||||
},
|
||||
|
||||
start() {
|
||||
start() {
|
||||
onJsxCreate("ProfileBadge", (component, ret) => {
|
||||
if (ret.props.id?.startsWith("rain-")) {
|
||||
const cachedProps = badgeProps.get(ret.props.id);
|
||||
|
|
@ -73,67 +74,27 @@ 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 [
|
||||
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 [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 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
|
||||
userBadgeData.roles?.forEach(roleName => {
|
||||
const roleData = roles[roleName];
|
||||
// process role badges
|
||||
if (userBadgeData.roles) {
|
||||
userBadgeData.roles.forEach(roleName => {
|
||||
const roleData = rolesData[roleName];
|
||||
if (roleData) {
|
||||
allBadges.push({
|
||||
label: roleData.label,
|
||||
|
|
@ -141,18 +102,12 @@ 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 });
|
||||
});
|
||||
// process custom badges
|
||||
if (userBadgeData.custom) {
|
||||
allBadges.push(...userBadgeData.custom);
|
||||
}
|
||||
|
||||
badgesCache.set(userId, allBadges);
|
||||
|
||||
|
|
@ -167,14 +122,12 @@ 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);
|
||||
}
|
||||
};
|
||||
|
||||
return after("default", useBadgesModule, ([user], result) => {
|
||||
after("default", useBadgesModule, ([user], result) => {
|
||||
if (!user) return;
|
||||
|
||||
const userId = user.userId;
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
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>
|
||||
)
|
||||
|
|
@ -1,169 +0,0 @@
|
|||
// 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;
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
@ -42,19 +42,19 @@ function transformLinks(content: string, config: FixEmbedSettings): string {
|
|||
if (config.instagram) {
|
||||
result = result.replace(
|
||||
/https?:\/\/(?:www\.)?instagram\.com(\/[^\s]+)/gi,
|
||||
"https://kkinstagram.com$1",
|
||||
"https://uuinstagram.com$1",
|
||||
);
|
||||
}
|
||||
// TikTok: Replace domain, keep path
|
||||
if (config.tiktok) {
|
||||
result = result.replace(
|
||||
/https?:\/\/(?:www\.)?tiktok\.com(\/[^\s]+)/gi,
|
||||
"https://tiktokez.com$1",
|
||||
"https://tnktok.com$1",
|
||||
);
|
||||
// TikTok short links (vm.tiktok.com)
|
||||
result = result.replace(
|
||||
/https?:\/\/vm\.tiktok\.com\/([A-Za-z0-9]+)\/?/gi,
|
||||
"https://vm.tiktokez.com/$1",
|
||||
"https://vm.tnktok.com/$1",
|
||||
);
|
||||
}
|
||||
// Reddit: Replace domain, keep path
|
||||
|
|
|
|||
|
|
@ -35,11 +35,6 @@ 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")),
|
||||
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,145 +0,0 @@
|
|||
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");
|
||||
},
|
||||
});
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
// 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");
|
||||
},
|
||||
});
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
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>
|
||||
);
|
||||
};
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -19,6 +19,7 @@ import {
|
|||
TableSwitchRow,
|
||||
Stack,
|
||||
} from "@metro/common/components";
|
||||
import { semanticColors } from "@ui/color";
|
||||
import { ScrollView, View } from "react-native";
|
||||
|
||||
import ErrorComponentStackCard from "./ErrorComponentStackCard";
|
||||
|
|
@ -73,8 +74,8 @@ export default function ErrorBoundaryScreen(props: {
|
|||
<ScrollView fadingEdgeLength={64} contentContainerStyle={{ gap: 12 }}>
|
||||
<Text
|
||||
variant="heading-md/extrabold"
|
||||
color="text-default"
|
||||
style={{
|
||||
color: semanticColors.HEADER_PRIMARY,
|
||||
marginBottom: 8,
|
||||
textAlign: "center",
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ export { shiggycordIcon };
|
|||
|
||||
export default function initSettings() {
|
||||
registerSection({
|
||||
name: "GoonCord",
|
||||
name: "ShiggyCord",
|
||||
items: [
|
||||
{
|
||||
key: "SHIGGYCORD",
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ export default function About() {
|
|||
variant="text-md/medium"
|
||||
style={{ textAlign: "center", marginTop: 4 }}
|
||||
>
|
||||
💦Goon💦 your discord client!
|
||||
Shiggy your discord client!
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ export default function General() {
|
|||
>
|
||||
<TableRowGroup title="App Information">
|
||||
<TableRow
|
||||
label="GoonCord"
|
||||
label="ShiggyCord"
|
||||
icon={<TableRow.Icon source={{ uri: shiggycordIcon ?? "" }} />}
|
||||
trailing={<TableRow.TrailingText text={debugInfo.bunny.version} />}
|
||||
/>
|
||||
|
|
@ -144,7 +144,7 @@ export default function General() {
|
|||
subLabel={`${debugInfo.bunny.loader.name} loader`}
|
||||
icon={<TableRow.Icon source={findAssetId("DownloadIcon")} />}
|
||||
trailing={
|
||||
<TableRow.TrailingText text={debugInfo.bunny.loader.version ?? ""} />
|
||||
<TableRow.TrailingText text={debugInfo.bunny.loader.version} />
|
||||
}
|
||||
/>
|
||||
</TableRowGroup>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ async function initializeShiggyCord() {
|
|||
Object.freeze = Object.seal = Object;
|
||||
|
||||
await require("@metro/internals/caches").initMetroCache();
|
||||
require(".").default();
|
||||
await require(".").default();
|
||||
} catch (e) {
|
||||
const { ClientInfoManager } = require("@lib/api/native/modules");
|
||||
const stack = e instanceof Error ? e.stack : undefined;
|
||||
|
|
|
|||
|
|
@ -40,55 +40,19 @@ 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;
|
||||
tokenRef.Theme[ref.key.toUpperCase()] = ref.key;
|
||||
FormDivider.DIVIDER_COLORS[ref.key] = FormDivider.DIVIDER_COLORS[ref.current!.reference];
|
||||
|
||||
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 => {
|
||||
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
|
||||
}
|
||||
Object.keys(tokenRef.Shadow).forEach(k => tokenRef.Shadow[k][ref.key] = tokenRef.Shadow[k][ref.current!.reference]);
|
||||
Object.keys(tokenRef.SemanticColor).forEach(k => {
|
||||
tokenRef.SemanticColor[k][ref.key] = {
|
||||
...tokenRef.SemanticColor[k][ref.current!.reference]
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
if (update) {
|
||||
AppearanceManager.setShouldSyncAppearanceSettings(false);
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
AppearanceManager.updateTheme(internalDef != null ? ref.key : ref.lastSetDiscordTheme);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,13 +117,17 @@ 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue