From 940a018dd93ed7be47fb2b24bec46118799b9863 Mon Sep 17 00:00:00 2001 From: cocobo1 Date: Mon, 5 May 2025 23:22:42 +0100 Subject: [PATCH 1/8] Full revemge plugin support --- dist/pupu.js | 12 ++++++++---- scripts/build.mjs | 2 +- src/core/ui/settings/index.ts | 6 ++++++ src/core/ui/settings/pages/PluginBrowser/index.tsx | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dist/pupu.js b/dist/pupu.js index 0463184..ee5972a 100644 --- a/dist/pupu.js +++ b/dist/pupu.js @@ -4649,7 +4649,7 @@ init_logger(); init_toasts(); import_react_native5 = __toESM(require_react_native()); - versionHash = "v0.0.3"; + versionHash = "v0.1.0"; } }); @@ -13353,7 +13353,7 @@ var repo = pluginRepositories[props.url]; var isOfficial = props.url === OFFICIAL_PLUGINS_REPO_URL; return /* @__PURE__ */ jsx(TableRow, { - label: isOfficial ? "Pupu's Repository" : repo.$meta?.name ?? "Unknown", + label: isOfficial ? "Bunny's Repository" : repo.$meta?.name ?? "Unknown", subLabel: props.url, trailing: /* @__PURE__ */ jsxs(Stack, { direction: "horizontal", @@ -15223,7 +15223,7 @@ uri: pupu_default }, render: () => Promise.resolve().then(() => (init_General(), General_exports)), - useTrailing: () => `(${"v0.0.3"})` + useTrailing: () => `(${"v0.1.0"})` }, { key: "BUNNY_PLUGINS", @@ -15262,6 +15262,10 @@ name: "Bunny", items: [] }); + registerSection({ + name: "Revenge", + items: [] + }); } var init_settings3 = __esm({ "src/core/ui/settings/index.ts"() { @@ -15724,7 +15728,7 @@ alert([ "Failed to load Pupu!\n", `Build Number: ${ClientInfoManager.Build}`, - `Pupu: ${"v0.0.3"}`, + `Pupu: ${"v0.1.0"}`, stack || e?.toString?.() ].join("\n")); } diff --git a/scripts/build.mjs b/scripts/build.mjs index ef14eb2..446877e 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -72,7 +72,7 @@ const config = { constModules: { globals: { "bunny-build-info": { - version: `"v0.0.3"` + version: `"v0.1.0"` } } }, diff --git a/src/core/ui/settings/index.ts b/src/core/ui/settings/index.ts index 1db75e5..54c4bc9 100644 --- a/src/core/ui/settings/index.ts +++ b/src/core/ui/settings/index.ts @@ -62,4 +62,10 @@ export default function initSettings() { name: "Bunny", items: [] }); + + // Compat with Revenge Plugins that use configs in settings + registerSection({ + name: "Revenge", + items: [] + }); } \ No newline at end of file diff --git a/src/core/ui/settings/pages/PluginBrowser/index.tsx b/src/core/ui/settings/pages/PluginBrowser/index.tsx index 1f396c6..51f40ae 100644 --- a/src/core/ui/settings/pages/PluginBrowser/index.tsx +++ b/src/core/ui/settings/pages/PluginBrowser/index.tsx @@ -203,7 +203,7 @@ function RepositoryRow(props: { url: string; }) { return ( From 3a9ed9e18a1ead21da62335c847106b5c9077bcd Mon Sep 17 00:00:00 2001 From: cocobo1 Date: Mon, 5 May 2025 23:53:08 +0100 Subject: [PATCH 2/8] removed useless ios stuff --- dist/pupu.js | 3 +-- src/core/ui/settings/pages/General/About.tsx | 2 +- src/metro/common/components.ts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dist/pupu.js b/dist/pupu.js index ee5972a..2b69d06 100644 --- a/dist/pupu.js +++ b/dist/pupu.js @@ -6036,8 +6036,7 @@ }, { label: import_react_native15.Platform.select({ - android: Strings.CODENAME, - ios: Strings.MACHINE_ID + android: Strings.CODENAME }), version: debugInfo.device.codename, icon: "TagIcon" diff --git a/src/core/ui/settings/pages/General/About.tsx b/src/core/ui/settings/pages/General/About.tsx index 5bc71b0..68f07ca 100644 --- a/src/core/ui/settings/pages/General/About.tsx +++ b/src/core/ui/settings/pages/General/About.tsx @@ -71,7 +71,7 @@ export default function About() { icon: "MobilePhoneIcon" }, { - label: Platform.select({ android: Strings.CODENAME, ios: Strings.MACHINE_ID })!, + label: Platform.select({ android: Strings.CODENAME })!, version: debugInfo.device.codename, icon: "TagIcon" } diff --git a/src/metro/common/components.ts b/src/metro/common/components.ts index 954648c..491e67f 100644 --- a/src/metro/common/components.ts +++ b/src/metro/common/components.ts @@ -21,7 +21,7 @@ export const HelpMessage = findByNameLazy("HelpMessage"); // React Native's included SafeAreaView only adds padding on iOS. // The project doesnt build without it so it kinda has to sit here -export const { SafeAreaView, SafeAreaProvider, useSafeAreaInsets } = lazyDestructure(() => findByProps("useSafeAreaInsets")); +//export const { SafeAreaView, SafeAreaProvider, useSafeAreaInsets } = lazyDestructure(() => findByProps("useSafeAreaInsets")); // ActionSheet export const ActionSheetRow = findProp("ActionSheetRow"); From dd39ac082b10a87856e1337aab5a36ff490afe29 Mon Sep 17 00:00:00 2001 From: cocobo1 <122374431+C0C0B01@users.noreply.github.com> Date: Tue, 6 May 2025 18:49:40 +0300 Subject: [PATCH 3/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7b2f46..08c3d9f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pupu +# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Pupu Discord)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) A mod for Discord on Android ## Installing From 58d0863e91e0d65a8835a4655136ff663fd41d72 Mon Sep 17 00:00:00 2001 From: cocobo1 <122374431+C0C0B01@users.noreply.github.com> Date: Tue, 6 May 2025 18:51:27 +0300 Subject: [PATCH 4/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08c3d9f..06c9f73 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Pupu Discord)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) +# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Pyoncord)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) A mod for Discord on Android ## Installing From 471505222f70565808bd2884ad65c289c784c43e Mon Sep 17 00:00:00 2001 From: cocobo1 <122374431+C0C0B01@users.noreply.github.com> Date: Tue, 6 May 2025 18:51:42 +0300 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 06c9f73..d1c7d99 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Pyoncord)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) +# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Pupu)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) A mod for Discord on Android ## Installing From df86370c7eed651c20c4dae6f69e148531317102 Mon Sep 17 00:00:00 2001 From: cocobo1 <122374431+C0C0B01@users.noreply.github.com> Date: Tue, 6 May 2025 18:51:58 +0300 Subject: [PATCH 6/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1c7d99..4f55bca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Pupu)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) +# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Discord)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) A mod for Discord on Android ## Installing From 2f313d706cd3ca38aa0b16ee9bcee7b58002f783 Mon Sep 17 00:00:00 2001 From: cocobo1 <122374431+C0C0B01@users.noreply.github.com> Date: Tue, 6 May 2025 18:52:48 +0300 Subject: [PATCH 7/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f55bca..ad146d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Discord)]([https://discord.gg/XjYgWXHb9Q](https://discord.gg/6cN7wKa8gp)) +# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Discord)](https://discord.gg/6cN7wKa8gp)) A mod for Discord on Android ## Installing From 3b4c7aabbe3234a72937be20af3ade6679ccf433 Mon Sep 17 00:00:00 2001 From: cocobo1 <122374431+C0C0B01@users.noreply.github.com> Date: Tue, 6 May 2025 18:52:57 +0300 Subject: [PATCH 8/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad146d1..bdbdf2d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Discord)](https://discord.gg/6cN7wKa8gp)) +# Pupu [![Discord](https://img.shields.io/discord/1196075698301968455?style=social&logo=discord&label=Discord)](https://discord.gg/6cN7wKa8gp) A mod for Discord on Android ## Installing