From 60f3a6d693e112f6d45d913b12532399b686fc3c Mon Sep 17 00:00:00 2001 From: purnell569 <47968295+purnell569@users.noreply.github.com> Date: Fri, 11 Sep 2026 14:01:42 +0930 Subject: [PATCH] Repoint fork references from arif-banai to purnell569 Anything that describes or acts on *this* repository now points here. Attribution to the upstream authors is deliberately left untouched. Functional, would otherwise misbehave on this fork: - Docker workflows pushed to a ghcr namespace this account cannot write to. - scripts/run_jmusicbot.sh auto-updated from arif-banai's releases, so it would have replaced this jar with the upstream one. - pom.xml scm/issueManagement/ciManagement described the upstream repo. - Removed .github/FUNDING.yml, which put a Sponsor button on this repo that funded arif-banai. Cosmetic: - Badges repointed; dropped the CircleCI, CodeFactor and Discord badges, which reported on services this fork is not registered with. - License badge now targets main rather than master. - Fixed the README header image: it was a float-right that overlapped the note block, now centred above the title with alt text. - Refreshed the stale JMusicBot-0.6.2 jar name in the run examples. Left alone on purpose: copyright headers, pom.xml , the NOTICE and README credit tables, and the upstream commit provenance in docs/ARCHITECTURE.md. --- .github/FUNDING.yml | 12 ------ .github/ISSUE_TEMPLATE/bug-report.yml | 4 +- .github/ISSUE_TEMPLATE/config.yml | 4 +- .github/ISSUE_TEMPLATE/feature-request.yml | 4 +- .github/actions/docker-build/action.yml | 4 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/make-release.yml | 2 +- .github/workflows/publish-preview-image.yml | 2 +- Dockerfile | 2 +- README.md | 44 +++++++++++---------- docker-compose.example.yml | 2 +- docs/DEVELOPMENT_WORKFLOW.md | 8 ++-- pom.xml | 10 ++--- scripts/run_jmusicbot.sh | 4 +- 14 files changed, 47 insertions(+), 57 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 5e5b2d6..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,12 +0,0 @@ -# These are supported funding model platforms - -github: arif-banai -patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -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 -otechie: # Replace with a single Otechie username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index a038a87..2a6e6bc 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -51,9 +51,9 @@ body: options: - label: I have looked for information about this [within the documentation](https://jmusicbot.com/) required: true - - label: I have searched for similar issues [on the issues page](https://github.com/arif-banai/MusicBot/issues?q=is%3Aissue) + - label: I have searched for similar issues [on the issues page](https://github.com/purnell569/MusicBot/issues?q=is%3Aissue) required: true - - label: I am using an official release from [the releases page](https://github.com/arif-banai/MusicBot/releases) + - label: I am using an official release from [the releases page](https://github.com/purnell569/MusicBot/releases) required: true - type: input id: version diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 98ca952..b8747fc 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,8 @@ blank_issues_enabled: false contact_links: - name: Question - url: https://github.com/arif-banai/MusicBot/discussions/categories/general + url: https://github.com/purnell569/MusicBot/discussions/categories/general about: For general questions, please check the Discussions - name: Troubleshooting - url: https://github.com/arif-banai/MusicBot/discussions/categories/help + url: https://github.com/purnell569/MusicBot/discussions/categories/help about: For troubleshooting help, please check the Discussions diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index ff2d6b2..a77105d 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -44,9 +44,9 @@ body: options: - label: I have checked [the documentation](https://jmusicbot.com/) to make sure this feature doesn't already exist required: true - - label: I have searched for [similar feature requests](https://github.com/arif-banai/MusicBot/labels/enhancement) + - label: I have searched for [similar feature requests](https://github.com/purnell569/MusicBot/labels/enhancement) required: true - label: I have confirmed that my requests is **not** on the [list of things that will not be added](https://jmusicbot.com/things-that-wont-be-added) required: true - - label: "I am running the latest version of the bot: ![Release](https://img.shields.io/github/release/arif-banai/MusicBot.svg)" + - label: "I am running the latest version of the bot: ![Release](https://img.shields.io/github/release/purnell569/MusicBot.svg)" required: true diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 64d5651..30d78d1 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -16,9 +16,9 @@ inputs: required: false default: 'ghcr.io' image-name: - description: 'Image name (e.g., arif-banai/musicbot)' + description: 'Image name (e.g., purnell569/musicbot)' required: false - default: 'arif-banai/musicbot' + default: 'purnell569/musicbot' token: description: 'GitHub token for authentication' required: true diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 85678cb..6e50197 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -26,7 +26,7 @@ concurrency: env: REGISTRY: ghcr.io - IMAGE_NAME: arif-banai/musicbot + IMAGE_NAME: purnell569/musicbot jobs: publish: diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 0169815..7b657a9 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -150,4 +150,4 @@ jobs: ### Setup https://jmusicbot.com/setup https://jmusicbot.com/config - # Download: [JMusicBot-${{ github.event.inputs.version_number }}.jar](https://github.com/arif-banai/MusicBot/releases/download/v${{ github.event.inputs.version_number }}/JMusicBot-${{ github.event.inputs.version_number }}.jar) + # Download: [JMusicBot-${{ github.event.inputs.version_number }}.jar](https://github.com/purnell569/MusicBot/releases/download/v${{ github.event.inputs.version_number }}/JMusicBot-${{ github.event.inputs.version_number }}.jar) diff --git a/.github/workflows/publish-preview-image.yml b/.github/workflows/publish-preview-image.yml index 53c9cbc..9fc9c79 100644 --- a/.github/workflows/publish-preview-image.yml +++ b/.github/workflows/publish-preview-image.yml @@ -26,7 +26,7 @@ concurrency: env: REGISTRY: ghcr.io - IMAGE_NAME: arif-banai/musicbot + IMAGE_NAME: purnell569/musicbot jobs: publish-preview: diff --git a/Dockerfile b/Dockerfile index 76616ea..f17df3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ FROM bitnami/minideb:trixie LABEL org.opencontainers.image.title="JMusicBot" \ org.opencontainers.image.description="A cross-platform Discord music bot with a clean interface" \ org.opencontainers.image.url="https://jmusicbot.com" \ - org.opencontainers.image.source="https://github.com/arif-banai/MusicBot" \ + org.opencontainers.image.source="https://github.com/purnell569/MusicBot" \ org.opencontainers.image.vendor="JMusicBot" \ org.opencontainers.image.licenses="Apache-2.0" diff --git a/README.md b/README.md index d926640..9927e37 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ - +

+ JMusicBot logo +

# JMusicBot @@ -39,14 +41,11 @@ YouTube changed how it serves streams, which broke playback for everyone on the Measured on the tracks that were failing: **5/5 playing, stable across repeat runs** (previously 1/5). No OAuth or Google account required. -[![Downloads](https://img.shields.io/github/downloads/arif-banai/MusicBot/total.svg)](https://github.com/arif-banai/MusicBot/releases/latest) -[![Stars](https://img.shields.io/github/stars/arif-banai/MusicBot.svg)](https://github.com/arif-banai/MusicBot/stargazers) -[![Release](https://img.shields.io/github/release/arif-banai/MusicBot.svg)](https://github.com/arif-banai/MusicBot/releases/latest) -[![License](https://img.shields.io/github/license/arif-banai/MusicBot.svg)](https://github.com/arif-banai/MusicBot/blob/master/LICENSE) -[![Discord](https://discordapp.com/api/guilds/1453856673004392634/widget.png?v=1)](https://discord.gg/cyyUxNmmx6)
-[![CircleCI](https://dl.circleci.com/status-badge/img/gh/arif-banai/MusicBot/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/arif-banai/MusicBot/tree/master) -[![Build and Test](https://github.com/arif-banai/MusicBot/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/arif-banai/MusicBot/actions/workflows/build-and-test.yml) -[![CodeFactor](https://www.codefactor.io/repository/github/arif-banai/musicbot/badge)](https://www.codefactor.io/repository/github/arif-banai/musicbot) +[![Downloads](https://img.shields.io/github/downloads/purnell569/MusicBot/total.svg)](https://github.com/purnell569/MusicBot/releases/latest) +[![Stars](https://img.shields.io/github/stars/purnell569/MusicBot.svg)](https://github.com/purnell569/MusicBot/stargazers) +[![Release](https://img.shields.io/github/release/purnell569/MusicBot.svg)](https://github.com/purnell569/MusicBot/releases/latest) +[![License](https://img.shields.io/github/license/purnell569/MusicBot.svg)](https://github.com/purnell569/MusicBot/blob/main/LICENSE) +[![Build and Test](https://github.com/purnell569/MusicBot/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/purnell569/MusicBot/actions/workflows/build-and-test.yml) A cross-platform Discord music bot with a clean interface, and that is easy to set up and run yourself! @@ -108,12 +107,12 @@ When running JMusicBot directly (not in Docker), make sure to pass these JVM fla **Linux / macOS / Windows (CMD):** ```bash -java -Dfile.encoding=UTF-8 -Dnogui=true --enable-native-access=ALL-UNNAMED -jar JMusicBot-0.6.2-All.jar +java -Dfile.encoding=UTF-8 -Dnogui=true --enable-native-access=ALL-UNNAMED -jar JMusicBot-0.7.1-All.jar ``` **Windows (PowerShell):** PowerShell treats `-D` as its own parameter. Quote each JVM option so they are passed to `java` correctly: ```powershell -java "-Dfile.encoding=UTF-8" "-Dnogui=true" "--enable-native-access=ALL-UNNAMED" "-jar" ".\JMusicBot-0.6.2-All.jar" +java "-Dfile.encoding=UTF-8" "-Dnogui=true" "--enable-native-access=ALL-UNNAMED" "-jar" ".\JMusicBot-0.7.1-All.jar" ``` Alternatively, use the stop-parsing token so the rest of the line is passed literally: `java --% -Dfile.encoding=UTF-8 -Dnogui=true ...` @@ -155,7 +154,7 @@ If you already have a directory with your `config.txt`, `Playlists/` folder, and docker run --rm -it \ --name jmusicbot \ -v "$(pwd):/musicbot" \ - ghcr.io/arif-banai/musicbot:latest + ghcr.io/purnell569/musicbot:latest ``` This mounts your current directory as the musicbot volume, so the bot will use your existing configuration and playlists. @@ -169,7 +168,7 @@ This mounts your current directory as the musicbot volume, so the bot will use y docker run --rm -it \ --name jmusicbot \ -v "/path/to/musicbot:/musicbot" \ - ghcr.io/arif-banai/musicbot:latest + ghcr.io/purnell569/musicbot:latest ``` 2. **First Run:** @@ -192,7 +191,7 @@ Example `docker-compose.yml`: ```yaml services: jmusicbot: - image: ghcr.io/arif-banai/musicbot:latest + image: ghcr.io/purnell569/musicbot:latest container_name: jmusicbot volumes: - /path/to/musicbot:/musicbot @@ -206,13 +205,13 @@ Check the [Docker Compose Example](docker-compose.example.yml) for more details. - **Config Persistence:** The `/musicbot` volume **must** be mounted for your configuration to persist. The bot reads and writes `config.txt` from `/musicbot` (the container's working directory). - **First Run:** If `config.txt` doesn't exist, the bot will generate a default one automatically. You'll need to edit it with your bot token before the bot can start. - **Image Tags:** - - Use `ghcr.io/arif-banai/musicbot:latest` for the latest build from the master branch - - Use `ghcr.io/arif-banai/musicbot:0.6.1` (replace with actual version) to pin a specific release version + - Use `ghcr.io/purnell569/musicbot:latest` for the latest build from the main branch + - Use `ghcr.io/purnell569/musicbot:0.7.1` (replace with actual version) to pin a specific release version - **Recommendation:** For production, pin your image tag rather than using `latest` - **JAVA_OPTS:** The container uses ZGC and AlwaysPreTouch by default. Set `JAVA_OPTS` to add heap limits (e.g. `-Xms256m -Xmx512m`) or other flags. See [Performance Tuning](#performance-tuning) for details. -To view published images, visit: `https://github.com/arif-banai/MusicBot/pkgs/container/musicbot` +To view published images, visit: `https://github.com/purnell569/MusicBot/pkgs/container/musicbot` ## Performance Tuning @@ -323,13 +322,16 @@ This project follows a **trunk-based development** workflow. The `master` branch Branch names are automatically validated by CI to ensure consistency. For detailed information about the development workflow, branch naming rules, and best practices, see [DEVELOPMENT_WORKFLOW.md](docs/DEVELOPMENT_WORKFLOW.md). ## Questions/Suggestions/Bug Reports -**Please read the [Issues List](https://github.com/arif-banai/MusicBot/issues) before suggesting a feature**. +**Please read the [Issues List](https://github.com/purnell569/MusicBot/issues) before suggesting a feature.** -If you have a question, need troubleshooting help, or want to brainstorm a new feature, please start a [Discussion](https://github.com/arif-banai/MusicBot/discussions). +If you have a question, need troubleshooting help, or want to brainstorm a new feature, please start a +[Discussion](https://github.com/purnell569/MusicBot/discussions). -The Discord server is also available for questions and suggestions. [Click here to join](https://discord.gg/cyyUxNmmx6). +Note that issues with the bot itself are usually better raised upstream at +[arif-banai/MusicBot](https://github.com/arif-banai/MusicBot/issues) — this fork only changes YouTube playback. - If you'd like to suggest a feature or report a reproducible bug, please open an [Issue](https://github.com/arif-banai/MusicBot/issues) on this repository. If you like this bot, be sure to add a star to the libraries that make this possible: +If you'd like to suggest a feature or report a reproducible bug here, please open an +[Issue](https://github.com/purnell569/MusicBot/issues) on this repository. If you like this bot, be sure to add a star to the libraries that make this possible: - [**JDA**](https://github.com/DV8FromTheWorld/JDA) - [**lavaplayer**](https://github.com/lavalink-devs/lavaplayer) - [**youtube-source**](https://github.com/lavalink-devs/youtube-source) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 52d66c9..4f3c4e8 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -2,7 +2,7 @@ version: '3.8' services: jmusicbot: - image: ghcr.io/arif-banai/musicbot:latest # or ghcr.io/arif-banai/musicbot:0.6.1 for a specific version + image: ghcr.io/purnell569/musicbot:latest # or ghcr.io/purnell569/musicbot:0.7.1 for a specific version container_name: jmusicbot # The container runs as non-root user 'jmusicbot' (UID 10001) for security. # Ensure the mounted volume directory is readable/writable by UID 10001, diff --git a/docs/DEVELOPMENT_WORKFLOW.md b/docs/DEVELOPMENT_WORKFLOW.md index 0aae00e..a3121e8 100644 --- a/docs/DEVELOPMENT_WORKFLOW.md +++ b/docs/DEVELOPMENT_WORKFLOW.md @@ -137,9 +137,9 @@ The `docker-build.yml` workflow builds and publishes Docker images on: - Version tags (e.g., `v0.6.3`) ΓåÆ tags as `:0.6.3` **Image tags:** -- `master`: `ghcr.io/arif-banai/musicbot:latest` (+ version tag if applicable) -- Feature branch: `ghcr.io/arif-banai/musicbot:feature-new-player-ui` -- Version tag: `ghcr.io/arif-banai/musicbot:0.6.3` +- `master`: `ghcr.io/purnell569/musicbot:latest` (+ version tag if applicable) +- Feature branch: `ghcr.io/purnell569/musicbot:feature-new-player-ui` +- Version tag: `ghcr.io/purnell569/musicbot:0.6.3` ## Best Practices @@ -200,7 +200,7 @@ The `docker-build.yml` workflow builds and publishes Docker images on: - Attach JAR file from workflow artifacts 5. **Docker image is automatically built** from the tag - - Tagged as `ghcr.io/arif-banai/musicbot:0.6.3` + - Tagged as `ghcr.io/purnell569/musicbot:0.6.3` ### Release Branch (for stabilization) diff --git a/pom.xml b/pom.xml index 13c0bc3..a356b57 100644 --- a/pom.xml +++ b/pom.xml @@ -45,20 +45,20 @@
- scm:git:https://github.com/arif-banai/MusicBot.git - scm:git:git@github.com:arif-banai/MusicBot.git - https://github.com/arif-banai/MusicBot + scm:git:https://github.com/purnell569/MusicBot.git + scm:git:git@github.com:purnell569/MusicBot.git + https://github.com/purnell569/MusicBot HEAD GitHub Issues - https://github.com/arif-banai/MusicBot/issues + https://github.com/purnell569/MusicBot/issues GitHub Actions - https://github.com/arif-banai/MusicBot/actions + https://github.com/purnell569/MusicBot/actions diff --git a/scripts/run_jmusicbot.sh b/scripts/run_jmusicbot.sh index 49af457..0e00498 100644 --- a/scripts/run_jmusicbot.sh +++ b/scripts/run_jmusicbot.sh @@ -15,12 +15,12 @@ JAVA_OPTS="${JAVA_OPTS:---enable-native-access=ALL-UNNAMED}" download() { if [ $DOWNLOAD = true ]; then # First, check if the latest release is a pre-release - LATEST_RELEASE=$(curl -s https://api.github.com/repos/arif-banai/MusicBot/releases/latest) + LATEST_RELEASE=$(curl -s https://api.github.com/repos/purnell569/MusicBot/releases/latest) IS_PRERELEASE=$(echo "$LATEST_RELEASE" | grep -o '"prerelease":[^,}]*' | head -1 | grep -o 'true') if [ "$IS_PRERELEASE" = "true" ]; then # Latest is a pre-release, so get all releases and find the first non-prerelease - ALL_RELEASES=$(curl -s https://api.github.com/repos/arif-banai/MusicBot/releases?per_page=10) + ALL_RELEASES=$(curl -s https://api.github.com/repos/purnell569/MusicBot/releases?per_page=10) # Find the first release block that has "prerelease": false, then extract JAR URL from it # This handles the JSON structure where assets are nested URL=$(echo "$ALL_RELEASES" | awk '