diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 3f72c6e..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -github: [pylixonly] diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index cb92112..48402f8 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -11,21 +11,21 @@ body: > We might reject any issues that can't be solved within the repository, or reports that are too general. For example: > >
- > "Bunny crashes upon starting..." + > "Pupu crashes upon starting..." > > There are lots of different things that could be causing this, but it's probably not related to this repository. >
>
- > "Bunny 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 Bunny. + > "Pupu 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 Pupu. >
>
- > "Bunny 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 Bunny Manager, report it to the appropriate repository. + > "Pupu 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 Pupu 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 BunnyManager, report it in the BunnyManager repository. If an error occurs when trying to sideload the prepatched IPA, reach out support for the sideloader you're using. + > Please report the problem or ask for help in the appropriate place. For example, if the problem occurs in PupuManager, report it in the PupuManager repository. - type: checkboxes id: checklist @@ -33,7 +33,7 @@ body: 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 Bunny and Discord. + - label: I am able to reproduce the bug with the latest version of Pupu and Discord. required: true - label: I've checked that there is no open or closed issue about this bug. required: true @@ -97,16 +97,6 @@ body: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. render: shell - - type: dropdown - id: platform - attributes: - label: What platform did you produce this issue on? - options: - - Android - - iOS - validations: - required: true - - type: input id: discord-version attributes: @@ -124,10 +114,10 @@ body: attributes: label: Version description: | - The version of Bunny the issue is occuring on. You can find this in the settings. Bunny version is in formatted like the following: `beaf689-main` and NOT like this: `0.2.3`. + The version of Pupu the issue is occuring on. You can find this in the settings. Pupu version is in formatted like the following: `v0.0.5` and NOT like this: `beaf689-main`. placeholder: | Example: - "beaf689-main" + "v0.0.4" - type: input id: loader-version @@ -137,7 +127,7 @@ body: The version of the loader you are using. You can find this in the settings. placeholder: | Example: - "BunnyTweak (0.3.2)" + "PupuXposed (v0.0.2)" validations: required: true @@ -149,7 +139,7 @@ body: The device model you are using. placeholder: | Example: - "iPhone 13 Pro Max" + "Samsung A35 5G" validations: required: true @@ -161,7 +151,7 @@ body: The version of the operating system you are using. placeholder: | Example: - "iOS 15.0.1" + "Android 12/Oneui 4" validations: required: true @@ -173,7 +163,7 @@ body: 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: - Bunny: beaf689-main (BunnyXposed 0.2.4) + Pupu: v0.6.7 (PupuXposed 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) diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index ff169a7..4865fa6 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -1,5 +1,5 @@ name: Feature request -description: Suggest an idea for Bunny +description: Suggest an idea for Pupu title: "[feature]: " labels: [enhancement] body: @@ -22,7 +22,7 @@ body: id: feature-description attributes: label: Feature description - description: What feature you want Bunny to have? Provide detailed description about what it should look like or where it should be added. + description: What feature you want Pupu to have? Provide detailed description about what it should look like or where it should be added. validations: required: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e66bfc..fab5cfe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout builds uses: actions/checkout@v4 with: - repository: "bunny-mod/builds" + repository: "pupu/builds" path: "builds" token: ${{ secrets.BUILDS_TOKEN }} ref: ${{ github.ref_name }} @@ -49,5 +49,5 @@ jobs: - name: Purge CDN cache run: | - curl https://purge.jsdelivr.net/gh/pyoncord/bunny-build-infos@${{ github.ref_name }}/bunny.js + curl https://purge.jsdelivr.net/gh/C0C0B01/pupu-build-infos@${{ github.ref_name }}/pupu.js diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml deleted file mode 100644 index 247e0a5..0000000 --- a/.github/workflows/crowdin.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Sync with I18n repository - -on: - push: - branches: - - 'main' - paths: - - 'src/core/i18n/default.json' - workflow_dispatch: - -jobs: - sync: - name: Synchronize strings - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 - with: - repository: "pyoncord/i18n" - path: "main" - token: ${{ secrets.PYLIX_TOKEN }} - - - name: Push - run: | - cp src/core/i18n/default.json $GITHUB_WORKSPACE/main/base/bunny.json - cd $GITHUB_WORKSPACE/main - git config --local user.email "actions@github.com" - git config --local user.name "GitHub Actions" - git add . - git commit -m "Strings update from Bunny" || exit 0 - git push diff --git a/README.md b/README.md index cb17d23..d7b2f46 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ A mod for Discord on Android pnpm 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/bunny.js`) in the new input box labelled `Bunny URL`. +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/pupu.js`) in the new input box labelled `Pupu URL`. 1. Restart Discord. Upon reload, you should notice that your device will download Pupu'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 `pnpm serve`. `bunny.js` will be served on your local address under the port 4040. You will then insert `http://:4040/bunny.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 `pnpm serve`. `pupu.js` will be served on your local address under the port 4040. You will then insert `http://:4040/pupu.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 3e36b4a..f279975 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "bunny", + "name": "pupu", "private": true, "author": { - "name": "Pyoncord Team", - "url": "https://github.com/pyoncord" + "name": "cocobo1", + "url": "https://github.com/C0C0B01" }, "scripts": { "build": "node scripts/build.mjs", diff --git a/scripts/build.mjs b/scripts/build.mjs index f85c88c..ad847d0 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -29,7 +29,7 @@ let context = null; const config = { entryPoints: ["src/entry.ts"], bundle: true, - outfile: "dist/bunny.js", + outfile: "dist/pupu.js", format: "iife", splitting: false, external: [], @@ -39,7 +39,7 @@ const config = { "const-and-let": false }, footer: { - js: "//# sourceURL=bunny" + js: "//# sourceURL=pupu" }, loader: { ".png": "dataurl" @@ -50,14 +50,14 @@ const config = { inject: ["./shims/asyncIteratorSymbol.js", "./shims/promiseAllSettled.js"], legalComments: "none", alias: { - "!bunny-deps-shim!": "./shims/depsModule.ts", + "!pupu-deps-shim!": "./shims/depsModule.ts", "spitroast": "./node_modules/spitroast", "react/jsx-runtime": "./shims/jsxRuntime" }, plugins: [ globalPlugin({ ...metroDeps.reduce((obj, key) => { - obj[key] = `require("!bunny-deps-shim!")[${JSON.stringify(key)}]`; + obj[key] = `require("!pupu-deps-shim!")[${JSON.stringify(key)}]`; return obj; }, {}) }), @@ -71,7 +71,7 @@ const config = { transform: { constModules: { globals: { - "bunny-build-info": { + "pupu-build-info": { version: `"${context.hash}-${releaseBranch ?? "local"}"` } } diff --git a/scripts/serve.mjs b/scripts/serve.mjs index 05febd3..e3f1970 100644 --- a/scripts/serve.mjs +++ b/scripts/serve.mjs @@ -41,7 +41,7 @@ export function serve(options) { server.listen(args.port ?? 4040); - console.info(chalk.bold.yellowBright("Serving Bunny bundle, available on:")); + console.info(chalk.bold.yellowBright("Serving Pupu bundle, available on:")); const netInterfaces = os.networkInterfaces(); for (const netinterfaces of Object.values(netInterfaces)) { diff --git a/src/assets/icons/pyoncord.png b/src/assets/icons/pupu.png similarity index 100% rename from src/assets/icons/pyoncord.png rename to src/assets/icons/pupu.png diff --git a/src/core/commands/debug.ts b/src/core/commands/debug.ts index fcbd166..70ce1ab 100644 --- a/src/core/commands/debug.ts +++ b/src/core/commands/debug.ts @@ -16,7 +16,7 @@ export default () => { execute([ephemeral], ctx) { const info = getDebugInfo(); const content = [ - "**Bunny Debug Info**", + "**Pupu Debug Info**", `> Bunny: ${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})`,