From bc3abf5a6da7b715e744982b48519fd6ad98fbbe Mon Sep 17 00:00:00 2001 From: kmmiio99o <164557248+kmmiio99o@users.noreply.github.com> Date: Sat, 11 Oct 2025 02:26:41 +0200 Subject: [PATCH] Rename Kettu to ShiggyCord and update branding - Replace all references to "Kettu" with "ShiggyCord" in code, UI, and docs - Update icons and assets to use shiggy.png - Change repo URLs to GitHub ShiggyCord repository - Update build output to shiggycord.js - Remove Codeberg and legacy workflow/config files - Add new GitHub release workflow and semantic-release config - Update i18n strings and debug info to reflect ShiggyCord branding - Refactor settings, plugin, and theme pages for new branding and improved UX - Add FixEmbed and MessageFix core plugins - Refactor NoTrack plugin for improved telemetry blocking - Remove unused PluginBrowser page - Miscellaneous code style and formatting improvements --- .forgejo/FUNDING.yml | 18 - .forgejo/ISSUE_TEMPLATE/bug-report.yml | 161 ----- .forgejo/workflows/build.yaml | 61 -- .github/workflows/auto-release.yml | 51 ++ .releaserc.json | 49 ++ .vscode/settings.json | 18 - README.md | 16 +- package.json | 108 +-- scripts/build.mjs | 223 +++--- scripts/serve.mjs | 68 +- src/assets/icons/codeberg-logo_icon_white.png | Bin 1908 -> 0 bytes src/assets/icons/kettu.png | Bin 32122 -> 0 bytes src/assets/icons/shiggy.png | Bin 0 -> 1230 bytes src/core/commands/debug.ts | 56 +- src/core/i18n/default.json | 240 +++---- src/core/i18n/index.ts | 102 +-- src/core/plugins/fixembed/index.ts | 194 ++++++ src/core/plugins/index.ts | 22 +- src/core/plugins/messagefix/index.ts | 56 ++ src/core/plugins/notrack/index.ts | 252 ++++++- src/core/plugins/notrack/lib/console.ts | 16 - src/core/plugins/notrack/lib/miscellanous.ts | 33 - src/core/plugins/notrack/lib/network.ts | 12 - src/core/plugins/notrack/lib/sentry.ts | 26 - src/core/plugins/notrack/lib/utils.ts | 3 - src/core/plugins/quickinstall/forumPost.tsx | 179 +++-- src/core/plugins/quickinstall/index.ts | 34 +- src/core/plugins/quickinstall/url.tsx | 104 +-- src/core/ui/components/AddonCard.tsx | 276 ++++---- src/core/ui/components/AddonPage.tsx | 467 +++++++------ .../components/ErrorBoundaryScreen.tsx | 96 ++- src/core/ui/settings/index.ts | 120 ++-- .../ui/settings/pages/Developer/index.tsx | 414 +++++++----- src/core/ui/settings/pages/General/About.tsx | 228 ++++--- src/core/ui/settings/pages/General/index.tsx | 263 +++++--- .../ui/settings/pages/PluginBrowser/index.tsx | 499 -------------- .../pages/Plugins/components/PluginCard.tsx | 256 +++---- src/core/ui/settings/pages/Plugins/index.tsx | 633 +++++++++++++++--- .../ui/settings/pages/Plugins/models/bunny.ts | 14 +- .../settings/pages/Plugins/models/vendetta.ts | 57 +- .../Plugins/sheets/PluginInfoActionSheet.tsx | 330 ++++++--- .../pages/Plugins/sheets/TitleComponent.tsx | 115 ++-- .../pages/Plugins/usePluginCardStyles.ts | 34 +- .../ui/settings/pages/Themes/ThemeCard.tsx | 116 ++-- src/core/ui/settings/pages/Themes/index.tsx | 556 ++++++++++++--- .../Themes/sheets/ThemeInfoActionSheet.tsx | 206 ++++++ src/core/vendetta/api.tsx | 477 +++++++------ src/core/vendetta/plugins.ts | 322 +++++---- src/entry.ts | 257 +++---- src/index.ts | 62 +- src/lib/api/settings.ts | 53 +- src/lib/ui/settings/index.tsx | 32 +- src/lib/ui/settings/patches/tabs.tsx | 154 +++-- src/lib/utils/constants.ts | 12 +- src/lib/utils/logger.ts | 16 +- src/modules.d.ts | 2 +- 56 files changed, 4776 insertions(+), 3393 deletions(-) delete mode 100644 .forgejo/FUNDING.yml delete mode 100644 .forgejo/ISSUE_TEMPLATE/bug-report.yml delete mode 100644 .forgejo/workflows/build.yaml create mode 100644 .github/workflows/auto-release.yml create mode 100644 .releaserc.json delete mode 100644 .vscode/settings.json delete mode 100644 src/assets/icons/codeberg-logo_icon_white.png delete mode 100644 src/assets/icons/kettu.png create mode 100644 src/assets/icons/shiggy.png create mode 100644 src/core/plugins/fixembed/index.ts create mode 100644 src/core/plugins/messagefix/index.ts delete mode 100644 src/core/plugins/notrack/lib/console.ts delete mode 100644 src/core/plugins/notrack/lib/miscellanous.ts delete mode 100644 src/core/plugins/notrack/lib/network.ts delete mode 100644 src/core/plugins/notrack/lib/sentry.ts delete mode 100644 src/core/plugins/notrack/lib/utils.ts delete mode 100644 src/core/ui/settings/pages/PluginBrowser/index.tsx create mode 100644 src/core/ui/settings/pages/Themes/sheets/ThemeInfoActionSheet.tsx diff --git a/.forgejo/FUNDING.yml b/.forgejo/FUNDING.yml deleted file mode 100644 index 74a3258..0000000 --- a/.forgejo/FUNDING.yml +++ /dev/null @@ -1,18 +0,0 @@ - -# These are supported funding model platforms - - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: cocobo1 -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry -polar: # Replace with a single Polar username -buy_me_a_coffee: # Replace with a single Buy Me a Coffee username -thanks_dev: # Replace with a single thanks.dev username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] - diff --git a/.forgejo/ISSUE_TEMPLATE/bug-report.yml b/.forgejo/ISSUE_TEMPLATE/bug-report.yml deleted file mode 100644 index 987c6d6..0000000 --- a/.forgejo/ISSUE_TEMPLATE/bug-report.yml +++ /dev/null @@ -1,161 +0,0 @@ -name: ๐Ÿž Bug report -description: Report a bug or an issue. -title: 'bug: ' -labels: ['Bug report'] -body: - - type: markdown - attributes: - value: | - > [!IMPORTANT] - > ## Before you submit this issue... - > We might reject any issues that can't be solved within the repository, or reports that are too general. For example: - > - >
- > "Kettu crashes upon starting..." - > > There are lots of different things that could be causing this, but it's probably not related to this repository. - >
- >
- > "Kettu freezes on splash screen..." - > > The issue is too general and should be reported only when it occurs after an update to a specific Discord version or after a specific action or configuration has been made within Kettu. - >
- >
- > "Kettu refuses to install/stuck on downloading..." - > > This is an external issue (sideloading) that does not have a place in this repository. If it's a problem with Kettu Manager, report it to the appropriate repository. - >
- > - > If you think that your problem belongs to one of these, you should avoid submitting this report unless you are told to do so. - > - > Please report the problem or ask for help in the appropriate place. For example, if the problem occurs in Kettu Manager, report it in the Kettu Manager repository. - - - type: checkboxes - id: checklist - attributes: - label: Checklist - description: You should ensure the completion of the task before proceeding to check it off the checklist. Neglecting to do so may impede the efficiency of the issue resolution process. The developer has the right to delete the issue directly if you check the list blindly. - options: - - label: I am able to reproduce the bug with the latest version of Kettu and Discord. - required: true - - label: I've checked that there is no open or closed issue about this bug. - required: true - - label: The title of this issue accurately describes the bug. - required: true - - label: This is not a feature request or a general question. - required: true - - label: This bug can be reproduced consistently and is not caused by a plugin. - required: true - - label: I have read the notes above and ensured that my issue is clear and within this repository. - required: true - - - type: textarea - attributes: - label: Bug description - description: | - - Describe your bug in detail - - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...) - - Add images and videos if possible - validations: - required: true - - type: textarea - attributes: - label: Stack trace - description: If this bug causes a JS crash, please paste the stack trace here. - render: shell - - type: textarea - attributes: - label: Component stack trace - description: If this bug causes a JS crash, please paste the component stack trace here. - render: shell - - type: textarea - attributes: - label: Native crash trace - description: If this bug causes a native crash, please paste the crash trace here. On Android, this can be accessed by doing `logcat | grep AndroidRuntime`. - render: shell - - - type: input - id: discord-version - attributes: - label: Discord version - description: | - The version of Discord you are using. You can find this in the settings. You may leave both the version number and the build number. - placeholder: | - Example: - "253.2 (66074)" - validations: - required: true - - - type: input - id: version - attributes: - label: Version - description: | - The version of Kettu the issue is occuring on. You can find this in the settings. Kettu version is in formatted like the following: `v0.0.5` and NOT like this: `beaf689-main`. - placeholder: | - Example: - "v0.0.4" - - - type: input - id: loader-version - attributes: - label: Loader version - description: | - The version of the loader you are using. You can find this in the settings. - placeholder: | - Example: - "KettuXposed (v0.0.2)" - validations: - required: true - - - type: input - id: device - attributes: - label: Device - description: | - The device model you are using. - placeholder: | - Example: - "Samsung A35 5G" - validations: - required: true - - - type: input - id: os-version - attributes: - label: OS version - description: | - The version of the operating system you are using. - placeholder: | - Example: - "Android 12/Oneui 4" - validations: - required: true - - - type: textarea - attributes: - label: Debug information - description: | - Debug information is important for the developer to understand the environment in which the bug occurred. You can get this information by sending `/debug` in the chat. - placeholder: | - Example: - Kettu: v0.6.7 (KettuXposed v0.2.4) - Discord: 255.2 (255202) - React: 18.3.1 (RN 0.74.5-discord-11) - Hermes: for RN 0.74.5-discord-11 (bcv96) - System: Android 13 (SDK 33) - Device: M2101K7BG (secret) - - - type: textarea - attributes: - label: Additional context - description: Add additional context here. - - type: checkboxes - id: acknowledgements - attributes: - label: Acknowledgements - description: Your bug report will be closed if you don't follow the checklist below. - options: - - label: I have checked all open and closed bug reports and this is not a duplicate. - required: true - - label: I have chosen an appropriate title. - required: true - - label: All requested information has been provided properly. - required: true diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml deleted file mode 100644 index 907ca99..0000000 --- a/.forgejo/workflows/build.yaml +++ /dev/null @@ -1,61 +0,0 @@ -name: Node.js CI / CD (Bun + Forgejo) - -on: - push: - branches: [ "main" ] - -jobs: - buildAndRelease: - runs-on: codeberg-tiny - - steps: - - uses: actions/checkout@v3 - - - name: Install Bun - run: | - curl -fsSL https://bun.sh/install | bash - export BUN_INSTALL="$HOME/.bun" - export PATH="$BUN_INSTALL/bin:$PATH" - echo "$BUN_INSTALL/bin" >> $GITHUB_PATH - - - name: Install dependencies - run: | - export BUN_INSTALL="$HOME/.bun" - export PATH="$BUN_INSTALL/bin:$PATH" - bun install - - - name: Build project - run: | - export BUN_INSTALL="$HOME/.bun" - export PATH="$BUN_INSTALL/bin:$PATH" - bun run build --release-branch=${GITHUB_REF_NAME:-${CI_COMMIT_REF_NAME}} --build-minify - - - name: Push JS files to dist branch - run: | - git config --local user.email "actions@forgejo.local" - git config --local user.name "Forgejo Actions" - - mkdir -p temp_dist - find dist -name "*.js" -exec cp {} temp_dist/ \; - - git checkout --orphan dist-temp - git rm -rf --cached . - - cp -r temp_dist/* . - rm -rf temp_dist - - git add *.js - git commit -m "Update build $GITHUB_SHA" || exit 0 - git push -f origin HEAD:dist - - git checkout -f ${GITHUB_REF_NAME:-${CI_COMMIT_REF_NAME}} - - - name: Merge main into github - if: github.ref == 'refs/heads/main' - run: | - git config --local user.email "actions@forgejo.local" - git config --local user.name "Forgejo Actions" - git fetch origin - git checkout github || git checkout -b github - git merge origin/main --no-edit --allow-unrelated-histories - git push --force origin github \ No newline at end of file diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml new file mode 100644 index 0000000..411ef56 --- /dev/null +++ b/.github/workflows/auto-release.yml @@ -0,0 +1,51 @@ +name: Automatic Release + +on: + push: + branches: + - main + paths: + - "dist/shiggycord.js" + - "dist/shiggycord.min.js" + +jobs: + release: + name: Create Release + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Setup Bun + uses: oven-sh/setup-bun@v1 + with: + bun-version: latest + + - name: Install dependencies + run: bun install + + - name: Extract bunny version + id: bunny_version + run: | + version=$(grep 'const version:' src/modules.d.ts | head -n1 | sed 's/[^0-9.]//g') + echo "version=$version" >> $GITHUB_OUTPUT + + - name: Build (if needed) + run: bun run build + + - name: Create Release + uses: softprops/action-gh-release@v1 + with: + tag_name: v${{ steps.bunny_version.outputs.version }} + name: Release v${{ steps.bunny_version.outputs.version }} + files: | + dist/shiggycord.js + dist/shiggycord.min.js + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.releaserc.json b/.releaserc.json new file mode 100644 index 0000000..3709012 --- /dev/null +++ b/.releaserc.json @@ -0,0 +1,49 @@ +{ + "branches": ["main"], + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + [ + "@semantic-release/changelog", + { + "changelogFile": "CHANGELOG.md" + } + ], + [ + "@semantic-release/npm", + { + "npmPublish": false + } + ], + [ + "@semantic-release/github", + { + "assets": [ + { + "path": "dist/shiggycord.js", + "label": "ShiggyCord Bundle" + }, + { + "path": "dist/shiggycord.min.js", + "label": "ShiggyCord Bundle (minified)" + } + ] + } + ], + [ + "@semantic-release/git", + { + "assets": ["package.json", "CHANGELOG.md"], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + } + ], + [ + "@saithodev/semantic-release-backmerge", + { + "branches": ["dev"], + "backmergeStrategy": "merge", + "backmergeMessage": "chore(release): merge release ${nextRelease.version} into dev [skip ci]" + } + ] + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3f012b8..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" - }, - "[typescript]": { - "editor.defaultFormatter": "vscode.typescript-language-features" - }, - "[typescriptreact]": { - "editor.defaultFormatter": "vscode.typescript-language-features" - }, - "[json]": { - "editor.formatOnSave": false - }, - "javascript.format.semicolons": "insert", - "typescript.format.semicolons": "insert", - "typescript.preferences.quoteStyle": "double", - "javascript.preferences.quoteStyle": "double" -} \ No newline at end of file diff --git a/README.md b/README.md index 3110cf4..1f4b6c1 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ # ShiggyCord -An unofficial fork of Kettu, made just for fun +An unofficial fork of ShiggyCord, made just for fun Idea taken from Rosiecord ## Installing ### Android/iOS -- **Injecting bundle:** ``https://github.com/kmmiio99o/ShiggyCord/releases//kettu.js`` +- **Injecting bundle:** ``https://github.com/kmmiio99o/ShiggyCord/releases//shiggycord.js`` ## Building -1. Install a Kettu 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://codeberg.org/kmmiio99o/Shiggycord.git + git clone https://github.com/kmmiio99o/Shiggycord.git ``` 1. Install dependencies: ``` bun i ``` -1. Build Kettu'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/kettu.js`) in the new input box labelled `Kettu URL`. -1. Restart Discord. Upon reload, you should notice that your device will download Kettu'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`. `kettu.js` will be served on your local address under the port 4040. You will then insert `http://:4040/kettu.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://: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. diff --git a/package.json b/package.json index da1c39c..a345630 100644 --- a/package.json +++ b/package.json @@ -1,58 +1,58 @@ { - "name": "Kettu", - "private": true, - "author": { - "name": "cocobo1", - "url": "https://github.com/C0C0B01" - }, - "scripts": { - "build": "node scripts/build.mjs", - "serve": "node scripts/serve.mjs", - "serve:adb": "bun run serve --adb", - "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx" - }, - "license": "BSD-3-Clause", - "devDependencies": { - "@saithodev/semantic-release-backmerge": "^4.0.1", - "@semantic-release/changelog": "^6.0.3", - "@semantic-release/exec": "^6.0.3", - "@semantic-release/git": "^10.0.1", - "semantic-release": "^24.2.7", - "@swc/core": "^1.13.1", - "@swc/helpers": "^0.5.17", - "@types/node": "^20.19.9", - "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "@typescript-eslint/typescript-estree": "^7.18.0", - "chalk": "^5.4.1", - "esbuild": "^0.20.2", - "esbuild-plugin-globals": "^0.2.0", - "eslint": "^8.57.1", - "eslint-plugin-import-alias": "^1.2.0", - "eslint-plugin-react": "^7.37.5", - "eslint-plugin-simple-import-sort": "^12.1.1", - "eslint-plugin-unused-imports": "^3.2.0", - "typescript": "^5.8.3", - "yargs-parser": "^21.1.1" - }, - "dependencies": { - "@gullerya/object-observer": "^6.1.4", - "@shopify/react-native-skia": "^1.12.4", - "@tanstack/react-query": "^5.83.0", - "@types/chroma-js": "~2.4.5", - "@types/lodash": "~4.17.20", - "@types/react": "19.1.8", - "react-native": "0.78.0", - "es-toolkit": "^1.39.7", - "fuzzysort": "^3.1.0", - "intl-messageformat": "^10.7.16", - "moment": "2.22.2", - "react-native-reanimated": "^3.18.0", - "spitroast": "^1.4.4", - "type-fest": "^4.41.0" - }, + "name": "ShiggyCord", + "private": true, + "author": { + "name": "kmmiio99o", + "url": "https://github.com/kmmiio99o" + }, + "scripts": { + "build": "node scripts/build.mjs", + "serve": "node scripts/serve.mjs", + "serve:adb": "bun run serve --adb", + "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx" + }, + "license": "BSD-3-Clause", + "devDependencies": { + "@saithodev/semantic-release-backmerge": "^4.0.1", + "@semantic-release/changelog": "^6.0.3", + "@semantic-release/exec": "^6.0.3", + "@semantic-release/git": "^10.0.1", + "semantic-release": "^24.2.7", + "@swc/core": "^1.13.1", + "@swc/helpers": "^0.5.17", + "@types/node": "^20.19.9", + "@types/yargs-parser": "^21.0.3", + "@typescript-eslint/eslint-plugin": "^7.18.0", + "@typescript-eslint/parser": "^7.18.0", + "@typescript-eslint/typescript-estree": "^7.18.0", + "chalk": "^5.4.1", + "esbuild": "^0.20.2", + "esbuild-plugin-globals": "^0.2.0", + "eslint": "^8.57.1", + "eslint-plugin-import-alias": "^1.2.0", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-simple-import-sort": "^12.1.1", + "eslint-plugin-unused-imports": "^3.2.0", + "typescript": "^5.8.3", + "yargs-parser": "^21.1.1" + }, + "dependencies": { + "@gullerya/object-observer": "^6.1.4", + "@shopify/react-native-skia": "^1.12.4", + "@tanstack/react-query": "^5.83.0", + "@types/chroma-js": "~2.4.5", + "@types/lodash": "~4.17.20", + "@types/react": "19.1.8", + "react-native": "0.78.0", + "es-toolkit": "^1.39.7", + "fuzzysort": "^3.1.0", + "intl-messageformat": "^10.7.16", + "moment": "2.22.2", + "react-native-reanimated": "^3.18.0", + "spitroast": "^1.4.4", + "type-fest": "^4.41.0" + }, "trustedDependencies": [ "@swc/core" ] -} \ No newline at end of file +} diff --git a/scripts/build.mjs b/scripts/build.mjs index 75e3ffb..0e57964 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -13,119 +13,121 @@ import { printBuildSuccess } from "./util.mjs"; /** @type string[] */ const metroDeps = await (async () => { - const ast = await swc.parseFile(path.resolve("./shims/depsModule.ts")); - return ast.body.at(-1).expression.right.properties.map(p => p.key.value); + const ast = await swc.parseFile(path.resolve("./shims/depsModule.ts")); + return ast.body.at(-1).expression.right.properties.map((p) => p.key.value); })(); const args = yargs(process.argv.slice(2)); const { - "release-branch": releaseBranch, - "build-minify": buildMinify, - "dev": dev + "release-branch": releaseBranch, + "build-minify": buildMinify, + dev: dev, } = args; let context = null; /** @type {import("esbuild").BuildOptions} */ const config = { - entryPoints: ["src/entry.ts"], - bundle: true, - outfile: "dist/kettu.js", - format: "iife", - splitting: false, - external: [], - supported: { - // Hermes does not actually support const and let, even though it syntactically - // accepts it, but it's treated just like 'var' and causes issues - "const-and-let": false - }, - footer: { - js: "//# sourceURL=kettu" - }, - loader: { - ".png": "dataurl" - }, - define: { - window: "globalThis", - __DEV__: JSON.stringify(releaseBranch !== "main") - }, - inject: ["./shims/asyncIteratorSymbol.js", "./shims/promiseAllSettled.js"], - legalComments: "none", - alias: { - "!kettu-deps-shim!": "./shims/depsModule.ts", - "spitroast": "./node_modules/spitroast", - "react/jsx-runtime": "./shims/jsxRuntime" - }, - plugins: [ - globalPlugin({ - ...metroDeps.reduce((obj, key) => { - obj[key] = `require("!kettu-deps-shim!")[${JSON.stringify(key)}]`; - return obj; - }, {}) - }), - { - name: "swc", - setup(build) { - build.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, async args => { - const result = await swc.transformFile(args.path, { - jsc: { - externalHelpers: true, - transform: { - constModules: { - globals: { - "bunny-build-info": { - version: `"1.3.0"` - } - } - }, - react: { - runtime: "automatic" - } - }, - }, - // https://github.com/facebook/hermes/blob/3815fec63d1a6667ca3195160d6e12fee6a0d8d5/doc/Features.md - // https://github.com/facebook/hermes/issues/696#issuecomment-1396235791 - env: { - targets: "fully supports es6", - include: [ - "transform-block-scoping", - "transform-classes", - "transform-async-to-generator", - "transform-async-generator-functions" - ], - exclude: [ - "transform-parameters", - "transform-template-literals", - "transform-exponentiation-operator", - "transform-named-capturing-groups-regex", - "transform-nullish-coalescing-operator", - "transform-object-rest-spread", - "transform-optional-chaining", - "transform-logical-assignment-operators" - ] - }, - }); + entryPoints: ["src/entry.ts"], + bundle: true, + outfile: "dist/shiggycord.js", + format: "iife", + splitting: false, + external: [], + supported: { + // Hermes does not actually support const and let, even though it syntactically + // accepts it, but it's treated just like 'var' and causes issues + "const-and-let": false, + }, + footer: { + js: "//# sourceURL=shiggycord", + }, + loader: { + ".png": "dataurl", + }, + define: { + window: "globalThis", + __DEV__: JSON.stringify(releaseBranch !== "main"), + }, + inject: ["./shims/asyncIteratorSymbol.js", "./shims/promiseAllSettled.js"], + legalComments: "none", + alias: { + "!kettu-deps-shim!": "./shims/depsModule.ts", + spitroast: "./node_modules/spitroast", + "react/jsx-runtime": "./shims/jsxRuntime", + }, + plugins: [ + globalPlugin({ + ...metroDeps.reduce((obj, key) => { + obj[key] = `require("!kettu-deps-shim!")[${JSON.stringify(key)}]`; + return obj; + }, {}), + }), + { + name: "swc", + setup(build) { + build.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, async (args) => { + const result = await swc.transformFile(args.path, { + jsc: { + externalHelpers: true, + transform: { + constModules: { + globals: { + "bunny-build-info": { + version: `"1.0.0"`, + }, + }, + }, + react: { + runtime: "automatic", + }, + }, + }, + // https://github.com/facebook/hermes/blob/3815fec63d1a6667ca3195160d6e12fee6a0d8d5/doc/Features.md + // https://github.com/facebook/hermes/issues/696#issuecomment-1396235791 + env: { + targets: "fully supports es6", + include: [ + "transform-block-scoping", + "transform-classes", + "transform-async-to-generator", + "transform-async-generator-functions", + ], + exclude: [ + "transform-parameters", + "transform-template-literals", + "transform-exponentiation-operator", + "transform-named-capturing-groups-regex", + "transform-nullish-coalescing-operator", + "transform-object-rest-spread", + "transform-optional-chaining", + "transform-logical-assignment-operators", + ], + }, + }); - return { contents: result.code }; - }); - } - } - ] + return { contents: result.code }; + }); + }, + }, + ], }; export async function buildBundle(overrideConfig = {}) { - context = { - hash: releaseBranch ? execSync("git rev-parse --short HEAD").toString().trim() : crypto.randomBytes(8).toString("hex").slice(0, 7) - }; + context = { + hash: releaseBranch + ? execSync("git rev-parse --short HEAD").toString().trim() + : crypto.randomBytes(8).toString("hex").slice(0, 7), + }; - const initialStartTime = performance.now(); - await build({ ...config, ...overrideConfig }); + const initialStartTime = performance.now(); + await build({ ...config, ...overrideConfig }); - return { - config, - context, - timeTook: performance.now() - initialStartTime - }; + return { + config, + context, + timeTook: performance.now() - initialStartTime, + }; } const pathToThisFile = path.resolve(fileURLToPath(import.meta.url)); @@ -133,25 +135,16 @@ const pathPassedToNode = path.resolve(process.argv[1]); const isThisFileBeingRunViaCLI = pathToThisFile.includes(pathPassedToNode); if (isThisFileBeingRunViaCLI) { - const { timeTook } = await buildBundle(); + const { timeTook } = await buildBundle(); - printBuildSuccess( - context.hash, - releaseBranch, - timeTook - ); + printBuildSuccess(context.hash, releaseBranch, timeTook); - if (buildMinify) { - const { timeTook } = await buildBundle({ - minify: true, - outfile: config.outfile.replace(/\.js$/, ".min.js") - }); + if (buildMinify) { + const { timeTook } = await buildBundle({ + minify: true, + outfile: config.outfile.replace(/\.js$/, ".min.js"), + }); - printBuildSuccess( - context.hash, - releaseBranch, - timeTook, - true - ); - } + printBuildSuccess(context.hash, releaseBranch, timeTook, true); + } } diff --git a/scripts/serve.mjs b/scripts/serve.mjs index dfcba60..590c3e0 100644 --- a/scripts/serve.mjs +++ b/scripts/serve.mjs @@ -13,47 +13,43 @@ import { printBuildSuccess } from "./util.mjs"; const args = yargs(process.argv.slice(2)); export function serve(options) { - // @ts-ignore - const server = http.createServer(async (req, res) => { - const { pathname } = url.parse(req.url || "", true); - if (pathname?.endsWith(".js")) { - try { - const { config, context, timeTook } = await buildBundle(); + // @ts-ignore + const server = http.createServer(async (req, res) => { + const { pathname } = url.parse(req.url || "", true); + if (pathname?.endsWith(".js")) { + try { + const { config, context, timeTook } = await buildBundle(); - printBuildSuccess( - context.hash, - args.production, - timeTook - ); + printBuildSuccess(context.hash, args.production, timeTook); - res.writeHead(200, { "Content-Type": "application/javascript" }); - res.end(await readFile(config.outfile, "utf-8")); - } catch { - res.writeHead(500); - res.end(); - } - } else { - res.writeHead(404); - res.end(); - } - }, options); - - server.listen(args.port ?? 4040); - - console.info(chalk.bold.yellowBright("Serving Kettu on:")); - - const netInterfaces = os.networkInterfaces(); - for (const netinterfaces of Object.values(netInterfaces)) { - for (const details of netinterfaces || []) { - if (details.family !== "IPv4") continue; - const port = chalk.green(server.address()?.port.toString()); - console.info(` http://${details.address}:${port}/bundle.js`); - } + res.writeHead(200, { "Content-Type": "application/javascript" }); + res.end(await readFile(config.outfile, "utf-8")); + } catch { + res.writeHead(500); + res.end(); + } + } else { + res.writeHead(404); + res.end(); } + }, options); - return server; + server.listen(args.port ?? 4040); + + console.info(chalk.bold.yellowBright("Serving ShiggyCord on:")); + + const netInterfaces = os.networkInterfaces(); + for (const netinterfaces of Object.values(netInterfaces)) { + for (const details of netinterfaces || []) { + if (details.family !== "IPv4") continue; + const port = chalk.green(server.address()?.port.toString()); + console.info(` http://${details.address}:${port}/shiggycord.js`); + } + } + + return server; } const server = serve(); -console.log("\nPress Q key or Ctrl+C to exit."); \ No newline at end of file +console.log("\nPress Q key or Ctrl+C to exit."); diff --git a/src/assets/icons/codeberg-logo_icon_white.png b/src/assets/icons/codeberg-logo_icon_white.png deleted file mode 100644 index 873d3c79881a3dc7b54c058350aee5f549e3e9eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1908 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 { +export default () => + { name: "debug", description: Strings.COMMAND_DEBUG_DESC, options: [ - { - name: "ephemeral", - type: ApplicationCommandOptionType.BOOLEAN, - description: Strings.COMMAND_DEBUG_OPT_EPHEMERALLY, - } + { + name: "ephemeral", + type: ApplicationCommandOptionType.BOOLEAN, + description: Strings.COMMAND_DEBUG_OPT_EPHEMERALLY, + }, ], execute([ephemeral], ctx) { - const info = getDebugInfo(); - const content = [ - "**Kettu Debug Info**", - `> Kettu: ${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})`, - `> System: ${info.os.name} ${info.os.version} ${info.os.sdk ? `(SDK ${info.os.sdk})` : ""}`.trimEnd(), - `> Device: ${info.device.model} (${info.device.codename})`, - ].join("\n"); + const info = getDebugInfo(); + const content = [ + "**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})`, + `> System: ${info.os.name} ${info.os.version} ${info.os.sdk ? `(SDK ${info.os.sdk})` : ""}`.trimEnd(), + `> Device: ${info.device.model}`, + ].join("\n"); - 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}); - } - } -}; + 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, + }); + } + }, + }; diff --git a/src/core/i18n/default.json b/src/core/i18n/default.json index afd4443..f13e3b1 100644 --- a/src/core/i18n/default.json +++ b/src/core/i18n/default.json @@ -1,121 +1,121 @@ { - "ABOUT": "About", - "ACTIONS": "Actions", - "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}?", - "ASSET_BROWSER": "Asset Browser", - "BRAND": "Brand", - "PUPU": "Kettu", - "PUPU_URL": "Kettu URL", - "BROWSER": "Browser", - "BYTECODE": "Bytecode", - "CANCEL": "Cancel", - "CLEAR": "Clear", - "CLEAR_BUNDLE": "Clear JS Bundle", - "CLEAR_BUNDLE_DESC": "Clear the cached bundle. This will force a re-download of the bundle next app launch.", - "CLEAR_DATA": "Clear data", - "CLEAR_DATA_FAILED": "Failed to clear data for {name}", - "CLEAR_DATA_SUCCESSFUL": "Cleared data for {name}", - "CODEBERG": "Codeberg", - "CODENAME": "Codename", - "COMMAND_DEBUG_DESC": "Send Kettu 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.", - "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", - "CONNECT_TO_REACT_DEVTOOLS": "Connect to React DevTools", - "CONTINUE": "Continue", - "COPIED_TO_CLIPBOARD": "Copied to clipboard", - "COPY_URL": "Copy URL", - "DEBUG": "Debug", - "DEBUGGER_URL": "Debugger URL", - "DELETE": "Delete", - "DESC_EXTRACT_FONTS_FROM_THEME": "Looks out for \"fonts\" field in your currently applied theme and install it.", - "DEVELOPER": "Developer", - "DEVELOPER_SETTINGS": "Developer Settings", - "DISABLE_THEME": "Disable Theme", - "DISABLE_UPDATES": "Disable Updates", - "DISCORD_SERVER": "Discord Server", - "DONE": "Done", - "ENABLE_EVAL_COMMAND": "Enable /eval command", - "ENABLE_EVAL_COMMAND_DESC": "Evaluate JavaScript directly from a command. Be cautious when using this command as it may pose a security risk. Make sure to know what you are doing.", - "ENABLE_UPDATES": "Enable Updates", - "ERROR_BOUNDARY_TOOLS_LABEL": "ErrorBoundary Tools", - "EXTRACT": "Extract", - "FONT_NAME": "Font Name", - "FONTS": "Fonts", - "GENERAL": "General", - "GITHUB": "GitHub", - "HOLD_UP": "Hold Up", - "INFO": "Info", - "INSTALL": "Install", - "INSTALL_ADDON": "Install an add-on", - "INSTALL_FONT": "Install a font", - "INSTALL_PLUGIN": "Install a plugin", - "INSTALL_REACT_DEVTOOLS": "Install React DevTools", - "INSTALL_THEME": "Install a theme", - "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 Kettu from a custom endpoint.", - "LOAD_REACT_DEVTOOLS": "Load React DevTools", - "LOADER": "Loader", - "MACHINE_ID": "Machine ID", - "MANUFACTURER": "Manufacturer", - "MESSAGE": "Message", - "MISCELLANEOUS": "Miscellaneous", - "MODAL_RELOAD_REQUIRED": "Reload app?", - "MODAL_RELOAD_REQUIRED_DESC": "A reload is required to see the changes. Do you want to reload now?", - "MODAL_THEME_REFETCHED": "Theme refetched", - "MODAL_THEME_REFETCHED_DESC": "A reload is required to see the changes. Do you want to reload now?", - "MODAL_UNPROXIED_PLUGIN_DESC": "The plugin you are trying to install has not been proxied/verified by staff. Are you sure you want to continue?", - "MODAL_UNPROXIED_PLUGIN_HEADER": "Unproxied Plugin", - "MODEL": "Model", - "OPEN_IN_BROWSER": "Open in Browser", - "OPERATING_SYSTEM": "Operating System", - "OVERFLOW_PLUGIN_SETTINGS": "Plugin Settings", - "PLATFORM": "Platform", - "PLUGIN_REFETCH_FAILED": "Failed to refetch plugin", - "PLUGIN_REFETCH_SUCCESSFUL": "Successfully refetched plugin", - "PLUGINS": "Plugins", - "REFETCH": "Refetch", - "RELOAD": "Reload", - "RELOAD_DISCORD": "Reload 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", - "RELOAD_IN_SAFE_MODE_DESC": "Tap to reload Discord without loading addons", - "REMOVE": "Remove", - "RESTART_REQUIRED_TO_TAKE_EFFECT": "Restart is required to take effect", - "RETRY": "Retry", - "RETRY_RENDER": "Retry Render", - "SAFE_MODE": "Safe Mode", - "SAFE_MODE_NOTICE_FONTS": "You are in safe mode, meaning fonts have been temporarily disabled. {enabled, select, true {If a font appears to be causing the issue, you can press below to disable it persistently.} other {}}", - "SAFE_MODE_NOTICE_PLUGINS": "You are in safe mode, so plugins cannot be loaded. Disable any misbehaving plugins, then return to Normal Mode from the General settings page.", - "SAFE_MODE_NOTICE_THEMES": "You are in safe mode, meaning themes have been temporarily disabled. {enabled, select, true {If a theme appears to be causing the issue, you can press below to disable it persistently.} other {}}", - "SEARCH": "Search", - "SEPARATOR": ", ", - "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS": "Activate Discord Experiments", - "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS_DESC": "Warning: Messing with this feature may lead to account termination. I heavily discourage using this and am not responsible for anything that happens if you use it", - "STACK_TRACE": "Stack Trace", - "SUCCESSFULLY_INSTALLED": "Successfully installed", - "THEME_EXTRACTOR_DESC": "This pack overrides the following: {fonts}", - "THEME_REFETCH_FAILED": "Failed to refetch theme", - "THEME_REFETCH_SUCCESSFUL": "Successfully refetched theme", - "THEMES": "Themes", - "THEMES_RELOAD_FOR_CHANGES": "Reload the app to fully apply changes", - "TOASTS_INSTALLED_PLUGIN": "Installed plugin", - "TOASTS_PLUGIN_UPDATE": "{update, select, true {Enabled} other {Disabled}} updates for {name}", - "UH_OH": "Uh Oh", - "UNINSTALL": "Uninstall", - "UNINSTALL_TITLE": "Uninstall {title}", - "URL_PLACEHOLDER": "https://codeberg.org/cocobo1/Kettu", - "VERSION": "Version", - "VERSIONS": "Versions" -} \ No newline at end of file + "ABOUT": "About", + "ACTIONS": "Actions", + "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}?", + "ASSET_BROWSER": "Asset Browser", + "BRAND": "Brand", + "PUPU": "ShiggyCord", + "PUPU_URL": "ShiggyCord URL", + "BROWSER": "Browser", + "BYTECODE": "Bytecode", + "CANCEL": "Cancel", + "CLEAR": "Clear", + "CLEAR_BUNDLE": "Clear JS Bundle", + "CLEAR_BUNDLE_DESC": "Clear the cached bundle. This will force a re-download of the bundle next app launch.", + "CLEAR_DATA": "Clear data", + "CLEAR_DATA_FAILED": "Failed to clear data for {name}", + "CLEAR_DATA_SUCCESSFUL": "Cleared data for {name}", + "CODEBERG": "Codeberg", + "CODENAME": "Codename", + "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)", + "COMMAND_EVAL_OPT_CODE": "The code to evaluate.", + "COMMAND_PLUGINS_DESC": "Send list of installed plugins.", + "COMMAND_PLUGINS_OPT_EPHEMERALLY": "Send plugins list ephemerally.", + "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", + "CONNECT_TO_REACT_DEVTOOLS": "Connect to React DevTools", + "CONTINUE": "Continue", + "COPIED_TO_CLIPBOARD": "Copied to clipboard", + "COPY_URL": "Copy URL", + "DEBUG": "Debug", + "DEBUGGER_URL": "Debugger URL", + "DELETE": "Delete", + "DESC_EXTRACT_FONTS_FROM_THEME": "Looks out for \"fonts\" field in your currently applied theme and install it.", + "DEVELOPER": "Developer", + "DEVELOPER_SETTINGS": "Developer Settings", + "DISABLE_THEME": "Disable Theme", + "DISABLE_UPDATES": "Disable Updates", + "DISCORD_SERVER": "Discord Server", + "DONE": "Done", + "ENABLE_EVAL_COMMAND": "Enable /eval command", + "ENABLE_EVAL_COMMAND_DESC": "Evaluate JavaScript directly from a command. Be cautious when using this command as it may pose a security risk. Make sure to know what you are doing.", + "ENABLE_UPDATES": "Enable Updates", + "ERROR_BOUNDARY_TOOLS_LABEL": "ErrorBoundary Tools", + "EXTRACT": "Extract", + "FONT_NAME": "Font Name", + "FONTS": "Fonts", + "GENERAL": "General", + "GITHUB": "GitHub", + "HOLD_UP": "Hold Up", + "INFO": "Info", + "INSTALL": "Install", + "INSTALL_ADDON": "Install an add-on", + "INSTALL_FONT": "Install a font", + "INSTALL_PLUGIN": "Install a plugin", + "INSTALL_REACT_DEVTOOLS": "Install React DevTools", + "INSTALL_THEME": "Install a theme", + "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_REACT_DEVTOOLS": "Load React DevTools", + "LOADER": "Loader", + "MACHINE_ID": "Machine ID", + "MANUFACTURER": "Manufacturer", + "MESSAGE": "Message", + "MISCELLANEOUS": "Miscellaneous", + "MODAL_RELOAD_REQUIRED": "Reload app?", + "MODAL_RELOAD_REQUIRED_DESC": "A reload is required to see the changes. Do you want to reload now?", + "MODAL_THEME_REFETCHED": "Theme refetched", + "MODAL_THEME_REFETCHED_DESC": "A reload is required to see the changes. Do you want to reload now?", + "MODAL_UNPROXIED_PLUGIN_DESC": "The plugin you are trying to install has not been proxied/verified by staff. Are you sure you want to continue?", + "MODAL_UNPROXIED_PLUGIN_HEADER": "Unproxied Plugin", + "MODEL": "Model", + "OPEN_IN_BROWSER": "Open in Browser", + "OPERATING_SYSTEM": "Operating System", + "OVERFLOW_PLUGIN_SETTINGS": "Plugin Settings", + "PLATFORM": "Platform", + "PLUGIN_REFETCH_FAILED": "Failed to refetch plugin", + "PLUGIN_REFETCH_SUCCESSFUL": "Successfully refetched plugin", + "PLUGINS": "Plugins", + "REFETCH": "Refetch", + "RELOAD": "Reload", + "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", + "RELOAD_IN_SAFE_MODE_DESC": "Tap to reload Discord without loading addons", + "REMOVE": "Remove", + "RESTART_REQUIRED_TO_TAKE_EFFECT": "Restart is required to take effect", + "RETRY": "Retry", + "RETRY_RENDER": "Retry Render", + "SAFE_MODE": "Safe Mode", + "SAFE_MODE_NOTICE_FONTS": "You are in safe mode, meaning fonts have been temporarily disabled. {enabled, select, true {If a font appears to be causing the issue, you can press below to disable it persistently.} other {}}", + "SAFE_MODE_NOTICE_PLUGINS": "You are in safe mode, so plugins cannot be loaded. Disable any misbehaving plugins, then return to Normal Mode from the General settings page.", + "SAFE_MODE_NOTICE_THEMES": "You are in safe mode, meaning themes have been temporarily disabled. {enabled, select, true {If a theme appears to be causing the issue, you can press below to disable it persistently.} other {}}", + "SEARCH": "Search", + "SEPARATOR": ", ", + "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS": "Activate Discord Experiments", + "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS_DESC": "Warning: Messing with this feature may lead to account termination. I heavily discourage using this and am not responsible for anything that happens if you use it", + "STACK_TRACE": "Stack Trace", + "SUCCESSFULLY_INSTALLED": "Successfully installed", + "THEME_EXTRACTOR_DESC": "This pack overrides the following: {fonts}", + "THEME_REFETCH_FAILED": "Failed to refetch theme", + "THEME_REFETCH_SUCCESSFUL": "Successfully refetched theme", + "THEMES": "Themes", + "THEMES_RELOAD_FOR_CHANGES": "Reload the app to fully apply changes", + "TOASTS_INSTALLED_PLUGIN": "Installed plugin", + "TOASTS_PLUGIN_UPDATE": "{update, select, true {Enabled} other {Disabled}} updates for {name}", + "UH_OH": "Uh Oh", + "UNINSTALL": "Uninstall", + "UNINSTALL_TITLE": "Uninstall {title}", + "URL_PLACEHOLDER": "https://github.com/kmmiio99o/ShiggyCord", + "VERSION": "Version", + "VERSIONS": "Versions" +} diff --git a/src/core/i18n/index.ts b/src/core/i18n/index.ts index efeea3b..910a0ea 100644 --- a/src/core/i18n/index.ts +++ b/src/core/i18n/index.ts @@ -4,7 +4,9 @@ import { PrimitiveType } from "intl-messageformat"; import langDefault from "./default.json"; -const IntlMessageFormat = findByNameLazy("MessageFormat") as typeof import("intl-messageformat").default; +const IntlMessageFormat = findByNameLazy( + "MessageFormat", +) as typeof import("intl-messageformat").default; type I18nKey = keyof typeof langDefault; @@ -14,55 +16,73 @@ let _lastSetLocale: string | null = null; const _loadedLocale = new Set(); const _loadedStrings = {} as Record; -export const Strings = new Proxy({}, { +export const Strings = new Proxy( + {}, + { get: (_t, prop: keyof typeof langDefault) => { - if (_currentLocale && _loadedStrings[_currentLocale]?.[prop]) { - return _loadedStrings[_currentLocale]?.[prop]; - } - return langDefault[prop]; - } -}) as Record; + if (_currentLocale && _loadedStrings[_currentLocale]?.[prop]) { + return _loadedStrings[_currentLocale]?.[prop]; + } + return langDefault[prop]; + }, + }, +) as Record; export function initFetchI18nStrings() { - const cb = ({ locale }: { locale: string; }) => { - const languageMap = { - "es-ES": "es", - "es-419": "es_419", - "zh-TW": "zh-Hant", - "zh-CN": "zh-Hans", - "pt-PT": "pt", - "pt-BR": "pt_BR", - "sv-SE": "sv" - } as Record; + const cb = ({ locale }: { locale: string }) => { + const languageMap = { + "es-ES": "es", + "es-419": "es_419", + "zh-TW": "zh-Hant", + "zh-CN": "zh-Hans", + "pt-PT": "pt", + "pt-BR": "pt_BR", + "sv-SE": "sv", + } as Record; - const resolvedLocale = _lastSetLocale = languageMap[locale] ?? locale; + const resolvedLocale = (_lastSetLocale = languageMap[locale] ?? locale); - if (resolvedLocale.startsWith("en-")) { - _currentLocale = null; - return; - } + if (resolvedLocale.startsWith("en-")) { + _currentLocale = null; + return; + } - if (!_loadedLocale.has(resolvedLocale)) { - _loadedLocale.add(resolvedLocale); + if (!_loadedLocale.has(resolvedLocale)) { + _loadedLocale.add(resolvedLocale); - fetch(`https://raw.githubusercontent.com/C0C0B01/i18n/main/resources/${resolvedLocale}/kettu.json`) - .then(r => r.json()) - .then(strings => _loadedStrings[resolvedLocale] = strings) - .then(() => resolvedLocale === _lastSetLocale && (_currentLocale = resolvedLocale)) - .catch(e => console.error(`An error occured while fetching strings for ${resolvedLocale}: ${e}`)); - } else { - _currentLocale = resolvedLocale; - } - }; + fetch( + `https://raw.githubusercontent.com/C0C0B01/i18n/main/resources/${resolvedLocale}/shiggycord.json`, + ) + .then((r) => r.json()) + .then((strings) => (_loadedStrings[resolvedLocale] = strings)) + .then( + () => + resolvedLocale === _lastSetLocale && + (_currentLocale = resolvedLocale), + ) + .catch((e) => + console.error( + `An error occured while fetching strings for ${resolvedLocale}: ${e}`, + ), + ); + } else { + _currentLocale = resolvedLocale; + } + }; - FluxDispatcher.subscribe("I18N_LOAD_SUCCESS", cb); - return () => FluxDispatcher.unsubscribe("I18N_LOAD_SUCCESS", cb); + FluxDispatcher.subscribe("I18N_LOAD_SUCCESS", cb); + return () => FluxDispatcher.unsubscribe("I18N_LOAD_SUCCESS", cb); } -type FormatStringRet = T extends PrimitiveType ? string : string | T | (string | T)[]; +type FormatStringRet = T extends PrimitiveType + ? string + : string | T | (string | T)[]; -export function formatString(key: I18nKey, val: Record): FormatStringRet { - const str = Strings[key]; - // @ts-ignore - return new IntlMessageFormat(str).format(val); +export function formatString( + key: I18nKey, + val: Record, +): FormatStringRet { + const str = Strings[key]; + // @ts-ignore + return new IntlMessageFormat(str).format(val); } diff --git a/src/core/plugins/fixembed/index.ts b/src/core/plugins/fixembed/index.ts new file mode 100644 index 0000000..eb5b50a --- /dev/null +++ b/src/core/plugins/fixembed/index.ts @@ -0,0 +1,194 @@ +import { defineCorePlugin } from ".."; +import { findByProps } from "@metro"; +import { after } from "@lib/api/patcher"; +import { logger } from "@lib/utils/logger"; +import { settings } from "@lib/api/settings"; +import { React } from "@metro/common"; + +const { FormSection, FormRow, FormSwitch, FormText } = findByProps( + "FormSection", + "FormRow", + "FormSwitch", + "FormText", +); +const { ScrollView } = require("react-native"); + +type FixEmbedSettings = { + enabled: boolean; + twitter: boolean; + instagram: boolean; + tiktok: boolean; + reddit: boolean; +}; + +declare module "@lib/api/settings" { + interface Settings { + fixembed?: FixEmbedSettings; + } +} + +const MessageActions = findByProps("sendMessage"); +let unpatch: (() => void) | null = null; + +function transformLinks(content: string, config: FixEmbedSettings): string { + let result = content; + // Twitter/X: Replace domain, keep path + if (config.twitter) { + result = result.replace( + /https?:\/\/(?:www\.)?(twitter\.com|x\.com)(\/[^\s]+)/gi, + "https://fxtwitter.com$2", + ); + } + // Instagram: Replace domain, keep path + if (config.instagram) { + result = result.replace( + /https?:\/\/(?:www\.)?instagram\.com(\/[^\s]+)/gi, + "https://ddinstagram.com$1", + ); + } + // TikTok: Replace domain, keep path + if (config.tiktok) { + result = result.replace( + /https?:\/\/(?:www\.)?tiktok\.com(\/[^\s]+)/gi, + "https://tnktok.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", + ); + } + // Reddit: Replace domain, keep path + if (config.reddit) { + result = result.replace( + /https?:\/\/(?:www\.)?reddit\.com(\/[^\s]+)/gi, + "https://rxddit.com$1", + ); + } + return result; +} + +export default defineCorePlugin({ + manifest: { + id: "bunny.fixembed", + version: "1.0.0", + type: "plugin", + spec: 3, + main: "", + display: { + name: "FixEmbed", + description: + "Improves social media embeds by using privacy-friendly alternative frontends.", + authors: [{ name: "ShiggyCord Team" }], + }, + }, + + SettingsComponent() { + const { useState, useEffect } = React; + const [config, setConfig] = useState({ + enabled: settings.fixembed?.enabled ?? true, + twitter: settings.fixembed?.twitter ?? true, + instagram: settings.fixembed?.instagram ?? true, + tiktok: settings.fixembed?.tiktok ?? true, + reddit: settings.fixembed?.reddit ?? true, + }); + + useEffect(() => { + settings.fixembed = config; + }, [config]); + + const updateConfig = (key: keyof FixEmbedSettings, value: boolean) => { + setConfig((prev) => ({ ...prev, [key]: value })); + }; + + return React.createElement(ScrollView, { style: { flex: 1 } }, [ + React.createElement( + FormSection, + { title: "General Settings" }, + React.createElement(FormRow, { + label: "Enable FixEmbed", + subLabel: "Master switch for all link conversions", + trailing: React.createElement(FormSwitch, { + value: config.enabled, + onValueChange: (v: boolean) => updateConfig("enabled", v), + }), + }), + ), + React.createElement(FormSection, { title: "Platforms" }, [ + React.createElement(FormRow, { + label: "Twitter/X", + trailing: React.createElement(FormSwitch, { + value: config.twitter, + disabled: !config.enabled, + onValueChange: (v: boolean) => updateConfig("twitter", v), + }), + }), + React.createElement(FormRow, { + label: "Instagram", + trailing: React.createElement(FormSwitch, { + value: config.instagram, + disabled: !config.enabled, + onValueChange: (v: boolean) => updateConfig("instagram", v), + }), + }), + React.createElement(FormRow, { + label: "TikTok", + trailing: React.createElement(FormSwitch, { + value: config.tiktok, + disabled: !config.enabled, + onValueChange: (v: boolean) => updateConfig("tiktok", v), + }), + }), + React.createElement(FormRow, { + label: "Reddit", + trailing: React.createElement(FormSwitch, { + value: config.reddit, + disabled: !config.enabled, + onValueChange: (v: boolean) => updateConfig("reddit", v), + }), + }), + ]), + React.createElement( + FormSection, + { title: "About" }, + React.createElement( + FormText, + { style: { padding: 12 } }, + "This plugin automatically converts social media links to privacy-friendly alternative frontends for better embeds.", + ), + ), + ]); + }, + + start() { + logger.log("FixEmbed: Starting plugin"); + settings.fixembed = settings.fixembed || { + enabled: true, + twitter: true, + instagram: true, + tiktok: true, + reddit: true, + }; + + if (!unpatch) { + unpatch = after("sendMessage", MessageActions, (args) => { + const config = settings.fixembed!; + if (!config.enabled) return; + if (args[1]?.content) { + args[1].content = transformLinks(args[1].content, config); + args[1].nonce = args[1].nonce || Math.random().toString(36).slice(2); + } + }); + } + logger.log("FixEmbed: Patched outgoing messages"); + }, + + stop() { + logger.log("FixEmbed: Stopping plugin"); + if (unpatch) { + unpatch(); + unpatch = null; + } + logger.log("FixEmbed: Unpatched outgoing messages"); + }, +}); diff --git a/src/core/plugins/index.ts b/src/core/plugins/index.ts index 7b423f7..6657185 100644 --- a/src/core/plugins/index.ts +++ b/src/core/plugins/index.ts @@ -1,22 +1,26 @@ import { PluginInstanceInternal } from "@lib/addons/plugins/types"; interface CorePlugin { - default: PluginInstanceInternal; - preenabled: boolean; + default: PluginInstanceInternal; + preenabled: boolean; } // Called from @lib/plugins export const getCorePlugins = (): Record => ({ - "bunny.quickinstall": require("./quickinstall"), - "bunny.badges": require("./badges"), - "vendetta.notrack": require("./notrack") + "bunny.quickinstall": { ...require("./quickinstall"), preenabled: true }, + "bunny.badges": require("./badges"), + "bunny.notrack": { ...require("./notrack"), preenabled: true }, + "bunny.messagefix": { ...require("./messagefix") }, + "bunny.fixembed": { ...require("./fixembed"), preenabled: true }, }); /** * @internal */ -export function defineCorePlugin(instance: PluginInstanceInternal): PluginInstanceInternal { - // @ts-expect-error - instance[Symbol.for("bunny.core.plugin")] = true; - return instance; +export function defineCorePlugin( + instance: PluginInstanceInternal, +): PluginInstanceInternal { + // @ts-expect-error + instance[Symbol.for("bunny.core.plugin")] = true; + return instance; } diff --git a/src/core/plugins/messagefix/index.ts b/src/core/plugins/messagefix/index.ts new file mode 100644 index 0000000..146bf2b --- /dev/null +++ b/src/core/plugins/messagefix/index.ts @@ -0,0 +1,56 @@ +import { defineCorePlugin } from ".."; +import { findByProps } from "@metro"; +import { logger } from "@lib/utils/logger"; + +// Find the MessageActions module +const MessageActions = findByProps("sendMessage"); +let originalSendMessage: Function; + +export default defineCorePlugin({ + manifest: { + id: "bunny.messagefix", + version: "1.0.0", + type: "plugin", + spec: 3, + main: "", + display: { + name: "MessageFix", + description: "Ensures messages include the required nonce parameter", + authors: [{ name: "ShiggyCord Team" }], + }, + }, + + start() { + // Save original function + originalSendMessage = MessageActions.sendMessage; + + // Replace with our implementation + MessageActions.sendMessage = function ( + channelId, + message, + replyRef, + options, + ) { + // Ensure options exists and has a nonce + options = options || {}; + options.nonce = options.nonce || Date.now().toString(); + + // Call original with fixed parameters + return originalSendMessage.call( + this, + channelId, + message, + replyRef, + options, + ); + }; + + logger.log("MessageFix: Enabled - adding nonce to all messages"); + }, + + stop() { + // Restore original function + if (originalSendMessage) MessageActions.sendMessage = originalSendMessage; + logger.log("MessageFix: Disabled"); + }, +}); diff --git a/src/core/plugins/notrack/index.ts b/src/core/plugins/notrack/index.ts index 58865de..8459303 100644 --- a/src/core/plugins/notrack/index.ts +++ b/src/core/plugins/notrack/index.ts @@ -1,36 +1,230 @@ -import network from "./lib/network"; -import console from "./lib/console"; -import miscellanous from "./lib/miscellanous"; -import sentry from "./lib/sentry"; import { defineCorePlugin } from ".."; +import { findByProps } from "@metro"; +import { instead } from "@lib/api/patcher"; import { logger } from "@lib/utils/logger"; -const patches = [ - network(), - console(), - miscellanous(), - // Sentry causes issues - // sentry(), -]; +// Type for functions that need to be cleaned up when plugin is disabled +type PatchCleanupFn = () => void; + +// Store all active patches for cleanup +let patches: PatchCleanupFn[] = []; + +// AnalyticsUtils and other tracking utilities +const AnalyticsUtils = findByProps("AnalyticsActionHandlers"); +const SuperPropUtils = findByProps("encodeProperties", "track"); +const VoiceStateUtils = findByProps("getVoiceStateMetadata"); +const CrashReportUtils = findByProps("submitLiveCrashReport"); +const MetricsUtils = findByProps("_metrics"); + +// Sentry interface definition to avoid TypeScript errors +interface SentryClient { + getOptions: () => { enabled: boolean }; + close: () => void; + open: () => void; +} + +interface SentryScope { + clear: () => void; +} + +interface SentryHub { + getClient: () => SentryClient | undefined; + getStackTop: () => { scope: SentryScope }; + getScope: () => SentryScope; + addBreadcrumb?: (breadcrumb: unknown) => void; +} + +interface GlobalSentry { + hub?: SentryHub; +} + +// Get Sentry objects with proper type checking +const sentryGlobal = (globalThis as unknown as { __SENTRY__?: GlobalSentry }) + .__SENTRY__; +const sentryHub = sentryGlobal?.hub; +const sentryClient = sentryHub?.getClient(); + +// Sentry related objects with type safety +const Sentry = { + initializer: findByProps("initSentry"), + main: sentryHub, + client: sentryClient, +}; + +// Utility function to create no-operation patches +const noop = (prop: string, parent: Record): PatchCleanupFn => { + try { + return instead(prop, parent, () => undefined); + } catch (e) { + return () => false; + } +}; + +// Network tracking prevention +function patchNetwork(): PatchCleanupFn { + // Analytics and tracking endpoints to block + const analyticsTest = + /client-analytics\.braintreegateway\.com|discord\.com\/api\/v9\/(science|track)|app\.adjust\..*|.*\.ingest\.sentry\.io/; + + try { + const unpatch = instead( + "send", + XMLHttpRequest.prototype, + function ( + this: XMLHttpRequest & { __sentry_xhr__?: { url: string } }, + args: unknown[], + orig: Function, + ) { + if ( + this.__sentry_xhr__?.url && + analyticsTest.test(this.__sentry_xhr__.url) + ) { + return undefined; + } + return orig.apply(this, args); + }, + ); + return unpatch; + } catch (e) { + return () => false; + } +} + +// Console patching to remove Sentry wrappers +function patchConsole(): PatchCleanupFn { + type ConsoleFunction = Function & { __sentry_original__?: Function }; + type ConsoleFunctions = Record; + + const sentrified: ConsoleFunctions = {}; + + try { + // We need to use Object.keys because TypeScript doesn't allow indexing Console with strings + (Object.keys(console) as Array).forEach((key) => { + const consoleFunc = (console as unknown as ConsoleFunctions)[key]; + if (consoleFunc) { + sentrified[key] = consoleFunc; + const originalFunc = consoleFunc.__sentry_original__; + (console as unknown as ConsoleFunctions)[key] = + originalFunc ?? consoleFunc; + } + }); + } catch (e) { + logger.log("Failed to de-sentrify console functions!", e); + } + + return () => { + Object.keys(sentrified).forEach((key) => { + if (sentrified[key]) { + (console as unknown as ConsoleFunctions)[key] = sentrified[key]; + } + }); + }; +} + +// Miscellaneous tracking functions +function patchMiscellaneous(): PatchCleanupFn { + const miscPatches = [ + // Global analytics utilities + AnalyticsUtils?.AnalyticsActionHandlers && + noop("handleTrack", AnalyticsUtils.AnalyticsActionHandlers), + AnalyticsUtils?.AnalyticsActionHandlers && + noop("handleFingerprint", AnalyticsUtils.AnalyticsActionHandlers), + + // Super properties tracking + SuperPropUtils && noop("track", SuperPropUtils), + + // Voice state metadata tracking + VoiceStateUtils && noop("trackWithMetadata", VoiceStateUtils), + + // Crash reporter + CrashReportUtils && noop("submitLiveCrashReport", CrashReportUtils), + + // Metrics + MetricsUtils?._metrics && noop("push", MetricsUtils._metrics), + ].filter(Boolean) as PatchCleanupFn[]; + + return () => miscPatches.forEach((p) => p()); +} + +// Sentry error reporting prevention +function patchSentry(): PatchCleanupFn { + const sentryPatches: PatchCleanupFn[] = []; + + // Add patches if Sentry components exist + if (Sentry.initializer) { + sentryPatches.push(noop("initSentry", Sentry.initializer)); + } + + if (Sentry.main && Sentry.main.addBreadcrumb) { + sentryPatches.push(noop("addBreadcrumb", Sentry.main)); + } + + // Disable Sentry client + if (Sentry.client) { + try { + Sentry.client.getOptions().enabled = false; + Sentry.client.close(); + + if (Sentry.main) { + if (Sentry.main.getStackTop) { + Sentry.main.getStackTop().scope.clear(); + } + + if (Sentry.main.getScope) { + Sentry.main.getScope().clear(); + } + } + } catch (e) { + // Silent fail + } + } + + return () => { + try { + sentryPatches.forEach((p) => p()); + + // Re-enable Sentry client on cleanup + if (Sentry.client) { + Sentry.client.getOptions().enabled = true; + Sentry.client.open(); + } + } catch (e) { + // Silent fail + } + }; +} export default defineCorePlugin({ - manifest: { - id: "vendetta.notrack", - version: "1.0.0", - type: "plugin", - spec: 3, - main: "", - display: { - name: "NoTrack", - description: "Disables Discord's telemetry", - authors: [{ name: "maisymoe" }] - } + manifest: { + id: "bunny.notrack", + version: "1.0.0", + type: "plugin", + spec: 3, + main: "", + display: { + name: "NoTrack", + description: "Disables Discord's telemetry", + authors: [{ name: "maisymoe" }], }, - start() { - network(), - console(), - miscellanous(), - sentry() - } -}); + }, + start() { + // Apply all patches + patches = [ + patchNetwork(), + patchConsole(), + patchMiscellaneous(), + patchSentry(), + ].filter(Boolean); + + logger.log("NoTrack: Enabled - all telemetry tracking disabled"); + }, + + stop() { + // Call all cleanup functions + patches.forEach((p) => p?.()); + patches = []; + + logger.log("NoTrack: Disabled - telemetry tracking restored"); + }, +}); diff --git a/src/core/plugins/notrack/lib/console.ts b/src/core/plugins/notrack/lib/console.ts deleted file mode 100644 index 7a69471..0000000 --- a/src/core/plugins/notrack/lib/console.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { logger } from "@lib/utils/logger"; - -export default () => { - const sentrified = {}; - - try { - Object.keys(console).forEach((x) => { - sentrified[x] = console[x]; - console[x] = console[x].__sentry_original__ ?? console[x]; - }); - } catch(e) { - logger.log("Failed to de-sentrify console functions!", e); - }; - - return () => Object.keys(console).forEach((x) => console[x] = sentrified[x]); -} diff --git a/src/core/plugins/notrack/lib/miscellanous.ts b/src/core/plugins/notrack/lib/miscellanous.ts deleted file mode 100644 index b6a6093..0000000 --- a/src/core/plugins/notrack/lib/miscellanous.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { findByProps } from "@metro"; -import { noop } from "./utils"; - -// Stuff in here is non-specific tracking scattered around the app - -const AnalyticsUtils = findByProps("AnalyticsActionHandlers"); -const SuperPropUtils = findByProps("encodeProperties", "track"); -const VoiceStateUtils = findByProps("getVoiceStateMetadata"); -const CrashReportUtils = findByProps("submitLiveCrashReport"); -const MetricsUtils = findByProps("_metrics"); - -export default () => { - const patches = [ - // Global analytics utilities - ...(["handleTrack", "handleFingerprint"].map((i) => noop(i, AnalyticsUtils.AnalyticsActionHandlers))), - // TODO: This is a getter - look into patching it - // noop("analyticsTrackingStoreMaker", AnalyticsUtils), - - // Super properties tracking - noop("track", SuperPropUtils), - - // Voice state metadata tracking - noop("trackWithMetadata", VoiceStateUtils), - - // Crash reporter - noop("submitLiveCrashReport", CrashReportUtils), - - // Whatever "metrics" implies - noop("push", MetricsUtils._metrics), - ]; - - return () => patches.forEach((p) => p()); -} diff --git a/src/core/plugins/notrack/lib/network.ts b/src/core/plugins/notrack/lib/network.ts deleted file mode 100644 index 68f762e..0000000 --- a/src/core/plugins/notrack/lib/network.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { instead } from "@lib/api/patcher"; - -export default () => { - // https://github.com/yellowsink/shelter-plugins/blob/3a62d1557b704f4617f72882edba826218eb8c6e/plugins/antitrack/index.js#L10-L25 - const analyticsTest = /client-analytics\.braintreegateway\.com|discord\.com\/api\/v9\/(science|track)|app\.adjust\..*|.*\.ingest\.sentry\.io/; - - return instead( - "send", - XMLHttpRequest.prototype, - function (args, orig) { if (!analyticsTest.test(this.__sentry_xhr__?.url)) return orig.apply(this, args) }, - ); -} diff --git a/src/core/plugins/notrack/lib/sentry.ts b/src/core/plugins/notrack/lib/sentry.ts deleted file mode 100644 index 5b01b7e..0000000 --- a/src/core/plugins/notrack/lib/sentry.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { findByProps } from "@metro"; -import { noop } from "./utils"; - -const Sentry = { - initializer: findByProps("initSentry"), - main: globalThis.__SENTRY__?.hub, - client: globalThis.__SENTRY__?.hub?.getClient(), -}; - -export default () => { - const patches = [ - noop("initSentry", Sentry.initializer), - noop("addBreadcrumb", Sentry.main), - ]; - - Sentry.client.getOptions().enabled = false; - Sentry.client.close(); - Sentry.main.getStackTop().scope.clear(); - Sentry.main.getScope().clear(); - - return () => { - patches.forEach((p) => p()); - Sentry.client.getOptions().enabled = true; - Sentry.client.open(); - }; -} diff --git a/src/core/plugins/notrack/lib/utils.ts b/src/core/plugins/notrack/lib/utils.ts deleted file mode 100644 index 55f871f..0000000 --- a/src/core/plugins/notrack/lib/utils.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { instead } from "@lib/api/patcher"; - -export const noop = (prop: string, parent: any) => instead(prop, parent, () => {}); diff --git a/src/core/plugins/quickinstall/forumPost.tsx b/src/core/plugins/quickinstall/forumPost.tsx index 25665ad..ad6fb7e 100644 --- a/src/core/plugins/quickinstall/forumPost.tsx +++ b/src/core/plugins/quickinstall/forumPost.tsx @@ -5,7 +5,13 @@ import { installTheme, removeTheme, themes } from "@lib/addons/themes"; import { findAssetId } from "@lib/api/assets"; import { isThemeSupported } from "@lib/api/native/loader"; import { after } from "@lib/api/patcher"; -import { HTTP_REGEX_MULTI, VD_DISCORD_SERVER_ID, VD_PLUGINS_CHANNEL_ID, VD_PROXY_PREFIX, VD_THEMES_CHANNEL_ID } from "@lib/utils/constants"; +import { + HTTP_REGEX_MULTI, + VD_DISCORD_SERVER_ID, + VD_PLUGINS_CHANNEL_ID, + VD_PROXY_PREFIX, + VD_THEMES_CHANNEL_ID, +} from "@lib/utils/constants"; import { lazyDestructure } from "@lib/utils/lazy"; import { Button } from "@metro/common/components"; import { findByProps, findByPropsLazy } from "@metro/wrappers"; @@ -16,74 +22,91 @@ type PostType = "Plugin" | "Theme"; // const ForumPostLongPressActionSheet = findByNameProxy("ForumPostLongPressActionSheet", false); // const { ActionSheetRow } = findByPropsProxy("ActionSheetRow"); -const { useFirstForumPostMessage } = lazyDestructure(() => findByProps("useFirstForumPostMessage")); +const { useFirstForumPostMessage } = lazyDestructure(() => + findByProps("useFirstForumPostMessage"), +); const forumReactions = findByPropsLazy("MostCommonForumPostReaction"); const postMap = { - Plugin: { - storage: VdPluginManager.plugins, - urlsFilter: (url: string) => url.startsWith(VD_PROXY_PREFIX), - installOrRemove: (url: string) => { - const isInstalled = postMap.Plugin.storage[url]; - return isInstalled ? VdPluginManager.removePlugin(url) : VdPluginManager.installPlugin(url); - } + Plugin: { + storage: VdPluginManager.plugins, + urlsFilter: (url: string) => url.startsWith(VD_PROXY_PREFIX), + installOrRemove: (url: string) => { + const isInstalled = postMap.Plugin.storage[url]; + return isInstalled + ? VdPluginManager.removePlugin(url) + : VdPluginManager.installPlugin(url); }, - Theme: { - storage: themes, - urlsFilter: (url: string) => url.endsWith(".json"), - installOrRemove: (url: string) => { - const isInstalled = postMap.Theme.storage[url]; - return isInstalled ? removeTheme(url) : installTheme(url); - }, - } + }, + Theme: { + storage: themes, + urlsFilter: (url: string) => url.endsWith(".json"), + installOrRemove: (url: string) => { + const isInstalled = postMap.Theme.storage[url]; + return isInstalled ? removeTheme(url) : installTheme(url); + }, + }, }; -function useExtractThreadContent(thread: any, _firstMessage = null, actionSheet = false): ([PostType, string]) | void { - if (thread.guild_id !== VD_DISCORD_SERVER_ID) return; +function useExtractThreadContent( + thread: any, + _firstMessage = null, + actionSheet = false, +): [PostType, string] | void { + if (thread.guild_id !== VD_DISCORD_SERVER_ID) return; - // Determine what type of addon this is. - let postType: PostType; - if (thread.parent_id === VD_PLUGINS_CHANNEL_ID) { - postType = "Plugin"; - } else if (thread.parent_id === VD_THEMES_CHANNEL_ID && isThemeSupported()) { - postType = "Theme"; - } else return; + // Determine what type of addon this is. + let postType: PostType; + if (thread.parent_id === VD_PLUGINS_CHANNEL_ID) { + postType = "Plugin"; + } else if (thread.parent_id === VD_THEMES_CHANNEL_ID && isThemeSupported()) { + postType = "Theme"; + } else return; - const { firstMessage } = actionSheet ? useFirstForumPostMessage(thread) : { firstMessage: _firstMessage }; + const { firstMessage } = actionSheet + ? useFirstForumPostMessage(thread) + : { firstMessage: _firstMessage }; - const urls = firstMessage?.content?.match(HTTP_REGEX_MULTI)?.filter(postMap[postType].urlsFilter); - if (!urls || !urls[0]) return; + const urls = firstMessage?.content + ?.match(HTTP_REGEX_MULTI) + ?.filter(postMap[postType].urlsFilter); + if (!urls || !urls[0]) return; - // Sync with lib/managers/plugins - if (postType === "Plugin" && !urls[0].endsWith("/")) urls[0] += "/"; + // Sync with lib/managers/plugins + if (postType === "Plugin" && !urls[0].endsWith("/")) urls[0] += "/"; - return [postType, urls[0]]; + return [postType, urls[0]]; } -function useInstaller(thread: any, firstMessage = null, actionSheet = false): [true] | [false, PostType, boolean, boolean, () => Promise] { - const [postType, url] = useExtractThreadContent(thread, firstMessage, actionSheet) ?? []; +function useInstaller( + thread: any, + firstMessage = null, + actionSheet = false, +): [true] | [false, PostType, boolean, boolean, () => Promise] { + const [postType, url] = + useExtractThreadContent(thread, firstMessage, actionSheet) ?? []; - useProxy(VdPluginManager.plugins); - useProxy(themes); + useProxy(VdPluginManager.plugins); + useProxy(themes); - const [isInstalling, setIsInstalling] = React.useState(false); + const [isInstalling, setIsInstalling] = React.useState(false); - if (!postType || !url) return [true]; + if (!postType || !url) return [true]; - const isInstalled = Boolean(postMap[postType].storage[url]); + const isInstalled = Boolean(postMap[postType].storage[url]); - const installOrRemove = async () => { - setIsInstalling(true); - try { - await postMap[postType].installOrRemove(url); - } catch (e: any) { - showToast(e.message, findAssetId("Small")); - } finally { - setIsInstalling(false); - } - }; + const installOrRemove = async () => { + setIsInstalling(true); + try { + await postMap[postType].installOrRemove(url); + } catch (e: any) { + showToast(e.message, findAssetId("Small")); + } finally { + setIsInstalling(false); + } + }; - return [false, postType, isInstalled, isInstalling, installOrRemove]; + return [false, postType, isInstalled, isInstalling, installOrRemove]; } // // apparently broken??? @@ -104,33 +127,43 @@ function useInstaller(thread: any, firstMessage = null, actionSheet = false): [t // ); // }); -const installButtonPatch = () => after("MostCommonForumPostReaction", forumReactions, ([{ thread, firstMessage }], res) => { - const [shouldReturn, _, installed, loading, installOrRemove] = useInstaller(thread, firstMessage, true); - if (shouldReturn) return; +const installButtonPatch = () => + after( + "MostCommonForumPostReaction", + forumReactions, + ([{ thread, firstMessage }], res) => { + const [shouldReturn, _, installed, loading, installOrRemove] = + useInstaller(thread, firstMessage, true); + if (shouldReturn) return; - return <> - {res} - + return ( + <> + {res} +