From c3b015f00f489670383b13252a6f1685f26a2994 Mon Sep 17 00:00:00 2001 From: Youwes09 Date: Sun, 26 Apr 2026 21:22:08 -0500 Subject: [PATCH] Chore: Change from Youwes09 to moku-project --- .github/workflows/build-macos.yml | 4 ++-- .github/workflows/build-windows.yml | 15 ++++++------ PKGBUILD | 24 +++++++++---------- README.md | 18 +++++++------- Todo | 8 +++---- flake.nix | 6 ++--- ...oku.yml => io.github.moku_project.Moku.yml | 14 +++++------ ...op => io.github.moku_project.Moku.desktop} | 2 +- ... io.github.moku_project.Moku.metainfo.xml} | 18 +++++++------- src-tauri/src/lib.rs | 6 ++--- src-tauri/tauri.conf.json | 2 +- src-tauri/tauri.windows.conf.json | 2 +- .../settings/sections/AboutSettings.svelte | 2 +- src/store/discord.ts | 2 +- 14 files changed, 62 insertions(+), 61 deletions(-) rename io.github.Youwes09.Moku.yml => io.github.moku_project.Moku.yml (93%) rename packaging/{io.github.Youwes09.Moku.desktop => io.github.moku_project.Moku.desktop} (85%) rename packaging/{io.github.Youwes09.Moku.metainfo.xml => io.github.moku_project.Moku.metainfo.xml} (69%) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 1fa1e9e..af6d830 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -167,7 +167,7 @@ jobs: run: | # Wait for the Windows workflow to have created the draft release for i in $(seq 1 12); do - RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/Youwes09/Moku/releases" | jq -r '.[] | select(.tag_name == "v'"$VERSION"'") | .id' | head -1) + RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/moku-project/Moku/releases" | jq -r '.[] | select(.tag_name == "v'"$VERSION"'") | .id' | head -1) if [ -n "$RELEASE_ID" ]; then break; fi echo "Waiting for release to exist... attempt $i" sleep 15 @@ -184,7 +184,7 @@ jobs: local file="$1" local name="$2" echo "Uploading $name..." - curl -s -X POST -H "Authorization: Bearer $GITHUB_TOKEN" -H "Content-Type: application/octet-stream" --data-binary @"$file" "https://uploads.github.com/repos/Youwes09/Moku/releases/$RELEASE_ID/assets?name=$name" + curl -s -X POST -H "Authorization: Bearer $GITHUB_TOKEN" -H "Content-Type: application/octet-stream" --data-binary @"$file" "https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$name" } ARM64_DMG=$(find src-tauri/target/aarch64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 5cf6734..e7ffa9e 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: version: - description: "Version to build (e.g. 0.4.0)" + description: "Version to build (e.g. 0.9.0)" required: true permissions: @@ -134,12 +134,15 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/Youwes09/Moku/releases" | jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}" and .draft == true) | .id') + RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \ + "https://api.github.com/repos/moku-project/Moku/releases" \ + | jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}" and .draft == true) | .id') if [ -n "$RELEASE_ID" ]; then echo "Deleting existing draft release $RELEASE_ID" - curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/Youwes09/Moku/releases/$RELEASE_ID" - # Also delete the tag so tauri-action can recreate it - curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/Youwes09/Moku/git/refs/tags/v${{ github.event.inputs.version }}" + curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \ + "https://api.github.com/repos/moku-project/Moku/releases/$RELEASE_ID" + curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \ + "https://api.github.com/repos/moku-project/Moku/git/refs/tags/v${{ github.event.inputs.version }}" echo "Deleted draft release and tag" else echo "No existing draft release found" @@ -149,8 +152,6 @@ jobs: uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} - TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }} with: tagName: v${{ github.event.inputs.version }} releaseName: Moku v${{ github.event.inputs.version }} diff --git a/PKGBUILD b/PKGBUILD index f702df7..0d103b2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,9 @@ pkgname=moku -pkgver=0.5.0 +pkgver=0.9.0 pkgrel=1 pkgdesc="Native Linux manga reader frontend for Suwayomi-Server" arch=('x86_64') -url="https://github.com/Youwes09/Moku" +url="https://github.com/moku-project/Moku" license=('Apache 2.0') depends=( 'webkit2gtk-4.1' @@ -18,11 +18,11 @@ makedepends=( 'pnpm' ) source=( - "$pkgname-$pkgver.tar.gz::https://github.com/Youwes09/Moku/archive/refs/tags/v$pkgver.tar.gz" + "$pkgname-$pkgver.tar.gz::https://github.com/moku-project/Moku/archive/refs/tags/v$pkgver.tar.gz" "suwayomi-server.jar::https://github.com/Suwayomi/Suwayomi-Server/releases/download/v2.1.1867/suwayomi-server-v2.1.1867.jar" "jdk.tar.gz::https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz" ) -sha256sums=('2475d4bb4c7e8527384f7fcf9b0ace1c8a6354416f3af31398b844e35953fb73' +sha256sums=('8e04e82773764a6d3ab2080c7564ff3851433d7de96a8c8991c75c4bcb1ad968' '51e307c2581e4e1a002991ab3e3a77503c8b074c42695987a984a7382d0ac5af' 'f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d') @@ -99,16 +99,16 @@ exec /usr/lib/moku/jre/bin/java \ -jar /usr/lib/moku/tachidesk/Suwayomi-Server.jar EOF - install -Dm644 packaging/io.github.Youwes09.Moku.app.desktop \ - "$pkgdir/usr/share/applications/io.github.Youwes09.Moku.app.desktop" + install -Dm644 packaging/io.github.moku_project.Moku.desktop \ + "$pkgdir/usr/share/applications/io.github.moku_project.Moku.desktop" install -Dm644 src-tauri/icons/32x32.png \ - "$pkgdir/usr/share/icons/hicolor/32x32/apps/io.github.Youwes09.Moku.app.png" + "$pkgdir/usr/share/icons/hicolor/32x32/apps/io.github.moku_project.Moku.png" install -Dm644 src-tauri/icons/128x128.png \ - "$pkgdir/usr/share/icons/hicolor/128x128/apps/io.github.Youwes09.Moku.app.png" + "$pkgdir/usr/share/icons/hicolor/128x128/apps/io.github.moku_project.Moku.png" install -Dm644 src-tauri/icons/128x128@2x.png \ - "$pkgdir/usr/share/icons/hicolor/256x256/apps/io.github.Youwes09.Moku.app.png" - install -Dm644 packaging/io.github.Youwes09.Moku.app.metainfo.xml \ - "$pkgdir/usr/share/metainfo/io.github.Youwes09.Moku.metainfo.xml" + "$pkgdir/usr/share/icons/hicolor/256x256/apps/io.github.moku_project.Moku.png" + install -Dm644 packaging/io.github.moku_project.Moku.metainfo.xml \ + "$pkgdir/usr/share/metainfo/io.github.moku_project.Moku.metainfo.xml" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} +} \ No newline at end of file diff --git a/README.md b/README.md index 575db7b..41c7e3c 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@
-[![Release](https://www.shieldcn.dev/github/release/moku-app/Moku.svg?variant=outline&size=default)](https://github.com/moku-app/Moku/releases/latest) -[![Last Commit](https://www.shieldcn.dev/github/last-commit/moku-app/Moku.svg?variant=outline&size=default)](https://github.com/moku-app/Moku/commits/main) -[![Stars](https://www.shieldcn.dev/github/stars/moku-app/Moku.svg?variant=outline&size=default)](https://github.com/moku-app/Moku) +[![Release](https://www.shieldcn.dev/github/release/moku-project/Moku.svg?variant=outline&size=default)](https://github.com/moku-project/Moku/releases/latest) +[![Last Commit](https://www.shieldcn.dev/github/last-commit/moku-project/Moku.svg?variant=outline&size=default)](https://github.com/moku-project/Moku/commits/main) +[![Stars](https://www.shieldcn.dev/github/stars/moku-project/Moku.svg?variant=outline&size=default)](https://github.com/moku-project/Moku) [![Discord](https://www.shieldcn.dev/discord/members/x97hj8zR72.svg?variant=outline&size=default)](https://discord.gg/x97hj8zR72)
@@ -75,7 +75,7 @@ winget install Moku.Moku > Thanks to [@frozenKelp](https://github.com/frozenKelp) for setting up and maintaining the winget package through v0.9.0. -Or download the `.exe` installer from the [releases page](https://github.com/moku-app/Moku/releases/latest). Suwayomi-Server and a JRE are bundled. +Or download the `.exe` installer from the [releases page](https://github.com/moku-project/Moku/releases/latest). Suwayomi-Server and a JRE are bundled. ### Linux (Flatpak, recommended) @@ -85,7 +85,7 @@ Suwayomi-Server and a bundled JRE are included — no separate install needed. flatpak install io.github.moku_app.Moku ``` -Or download the latest `moku.flatpak` from the [releases page](https://github.com/moku-app/Moku/releases/latest) and install manually: +Or download the latest `moku.flatpak` from the [releases page](https://github.com/moku-project/Moku/releases/latest) and install manually: ```bash flatpak install moku.flatpak @@ -94,18 +94,18 @@ flatpak install moku.flatpak ### Nix ```bash -nix run github:moku-app/Moku +nix run github:moku-project/Moku ``` Add to your flake: ```nix -inputs.moku.url = "github:moku-app/Moku"; +inputs.moku.url = "github:moku-project/Moku"; ``` ### macOS -Download the `.dmg` from the [releases page](https://github.com/moku-app/Moku/releases/latest). +Download the `.dmg` from the [releases page](https://github.com/moku-project/Moku/releases/latest). > **Note:** Builds are ad-hoc signed. On first launch you may need to run: > ```bash @@ -127,7 +127,7 @@ You can point Moku at any Suwayomi instance — local or remote — via **Settin **Prerequisites:** [Rust](https://rustup.rs), [Node.js](https://nodejs.org), [pnpm](https://pnpm.io), and [Tauri v2 prerequisites](https://tauri.app/start/prerequisites/). ```bash -git clone https://github.com/moku-app/Moku +git clone https://github.com/moku-project/Moku cd Moku pnpm install pnpm tauri:dev diff --git a/Todo b/Todo index 7f24f54..b7a79b3 100644 --- a/Todo +++ b/Todo @@ -25,14 +25,14 @@ In-Progress: - Working on 3D Display Cards - Add Flathub Support (Pending Video) - - QOL Animations & Revamps - - Tracking Revamp - - Completely Revamp Tracking - - Fix Tracking Login - Pasting OAuth URL is not User-Friendly, Look for Alternatives +- Tracking + - Fix SeriesDetail Tracking Window (Maybe Link to TrackingPanel) + +- Hide Completed from Library Settting Notes from last time: diff --git a/flake.nix b/flake.nix index 51508e9..74c6f23 100644 --- a/flake.nix +++ b/flake.nix @@ -177,7 +177,7 @@ EOF [[ $# -lt 1 ]] && { echo "Usage: nix run .#flatpak -- "; exit 1; } VERSION="$1" REPO="$(git rev-parse --show-toplevel)" - MANIFEST="$REPO/io.github.Youwes09.Moku.yml" + MANIFEST="$REPO/io.github.moku_project.Moku.yml" echo "── Bumping versions ──" sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" \ @@ -226,7 +226,7 @@ EOF --force-clean \ "$REPO/build-dir" \ "$MANIFEST" - flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" io.github.Youwes09.Moku + flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" io.github.moku_project.Moku rm -rf "$REPO/build-dir" "$REPO/repo" echo "moku.flatpak created" @@ -249,7 +249,7 @@ EOF PKGBUILD="$REPO/PKGBUILD" [[ -f "$PKGBUILD" ]] || { echo "PKGBUILD not found"; exit 1; } - TARBALL_URL="https://github.com/Youwes09/Moku/archive/refs/tags/v$VERSION.tar.gz" + TARBALL_URL="https://github.com/moku-project/Moku/archive/refs/tags/v$VERSION.tar.gz" echo "Fetching tarball sha256..." TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}') diff --git a/io.github.Youwes09.Moku.yml b/io.github.moku_project.Moku.yml similarity index 93% rename from io.github.Youwes09.Moku.yml rename to io.github.moku_project.Moku.yml index 82c9bbb..885fac8 100644 --- a/io.github.Youwes09.Moku.yml +++ b/io.github.moku_project.Moku.yml @@ -1,4 +1,4 @@ -app-id: io.github.Youwes09.Moku +app-id: io.github.moku_project.Moku runtime: org.gnome.Platform runtime-version: '48' sdk: org.gnome.Sdk @@ -171,14 +171,14 @@ modules: - tar -xzf frontend-dist.tar.gz - . /usr/lib/sdk/rust-stable/enable.sh && PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig cargo build --release --manifest-path src-tauri/Cargo.toml - install -Dm755 src-tauri/target/release/moku /app/bin/moku - - install -Dm644 packaging/io.github.Youwes09.Moku.desktop /app/share/applications/io.github.Youwes09.Moku.desktop - - install -Dm644 src-tauri/icons/32x32.png /app/share/icons/hicolor/32x32/apps/io.github.Youwes09.Moku.png - - install -Dm644 src-tauri/icons/128x128.png /app/share/icons/hicolor/128x128/apps/io.github.Youwes09.Moku.png - - install -Dm644 src-tauri/icons/128x128@2x.png /app/share/icons/hicolor/256x256/apps/io.github.Youwes09.Moku.png - - install -Dm644 packaging/io.github.Youwes09.Moku.metainfo.xml /app/share/metainfo/io.github.Youwes09.Moku.metainfo.xml + - install -Dm644 packaging/io.github.moku_project.Moku.desktop /app/share/applications/io.github.moku_project.Moku.desktop + - install -Dm644 src-tauri/icons/32x32.png /app/share/icons/hicolor/32x32/apps/io.github.moku_project.Moku.png + - install -Dm644 src-tauri/icons/128x128.png /app/share/icons/hicolor/128x128/apps/io.github.moku_project.Moku.png + - install -Dm644 src-tauri/icons/128x128@2x.png /app/share/icons/hicolor/256x256/apps/io.github.moku_project.Moku.png + - install -Dm644 packaging/io.github.moku_project.Moku.metainfo.xml /app/share/metainfo/io.github.moku_project.Moku.metainfo.xml sources: - type: git - url: https://github.com/Youwes09/Moku.git + url: https://github.com/moku-project/Moku.git tag: v0.9.0 commit: 514910667b0d6e375569a48fb7cef11411d30fbd - type: file diff --git a/packaging/io.github.Youwes09.Moku.desktop b/packaging/io.github.moku_project.Moku.desktop similarity index 85% rename from packaging/io.github.Youwes09.Moku.desktop rename to packaging/io.github.moku_project.Moku.desktop index 5bfd4ff..ef2afe1 100644 --- a/packaging/io.github.Youwes09.Moku.desktop +++ b/packaging/io.github.moku_project.Moku.desktop @@ -2,7 +2,7 @@ Name=Moku Comment=Manga reader powered by Suwayomi Exec=moku -Icon=io.github.Youwes09.Moku +Icon=io.github.moku_project.Moku Terminal=false Type=Application Categories=Graphics;Viewer; diff --git a/packaging/io.github.Youwes09.Moku.metainfo.xml b/packaging/io.github.moku_project.Moku.metainfo.xml similarity index 69% rename from packaging/io.github.Youwes09.Moku.metainfo.xml rename to packaging/io.github.moku_project.Moku.metainfo.xml index 709ee6c..86744a1 100644 --- a/packaging/io.github.Youwes09.Moku.metainfo.xml +++ b/packaging/io.github.moku_project.Moku.metainfo.xml @@ -1,6 +1,6 @@ - io.github.Youwes09.Moku + io.github.moku_project.Moku MIT MIT @@ -19,30 +19,30 @@

- io.github.Youwes09.Moku.desktop + io.github.moku_project.Moku.desktop - https://github.com/Youwes09/Moku - https://github.com/Youwes09/Moku/issues + https://github.com/moku-project/Moku + https://github.com/moku-project/Moku/issues - https://raw.githubusercontent.com/Youwes09/Moku/main/docs/screenshots/Moku-Home.png + https://raw.githubusercontent.com/moku-project/Moku/main/docs/screenshots/Moku-Home.png Home screen showing your manga library - https://raw.githubusercontent.com/Youwes09/Moku/main/docs/screenshots/Moku-Reader.png + https://raw.githubusercontent.com/moku-project/Moku/main/docs/screenshots/Moku-Reader.png Built-in manga reader - https://raw.githubusercontent.com/Youwes09/Moku/main/docs/screenshots/Moku-Discover.png + https://raw.githubusercontent.com/moku-project/Moku/main/docs/screenshots/Moku-Discover.png Discover new manga across hundreds of sources - https://raw.githubusercontent.com/Youwes09/Moku/main/docs/screenshots/Moku-Downloads.png + https://raw.githubusercontent.com/moku-project/Moku/main/docs/screenshots/Moku-Downloads.png Download manager - https://raw.githubusercontent.com/Youwes09/Moku/main/docs/screenshots/Moku-Settings.png + https://raw.githubusercontent.com/moku-project/Moku/main/docs/screenshots/Moku-Settings.png Settings diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c4bc7a9..59470f3 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -269,7 +269,7 @@ fn suwayomi_data_dir() -> PathBuf { { dirs::data_dir() .unwrap_or_else(|| dirs::home_dir().unwrap_or_else(|| PathBuf::from("~"))) - .join("io.github.Youwes09.Moku.app/tachidesk") + .join("io.github.moku_project.Moku.app/tachidesk") } #[cfg(not(any(target_os = "windows", target_os = "macos")))] { @@ -589,7 +589,7 @@ async fn list_releases() -> Result, String> { .map_err(|e| e.to_string())?; let resp = client - .get("https://api.github.com/repos/Youwes09/Moku/releases?per_page=30") + .get("https://api.github.com/repos/moku-project/Moku/releases?per_page=30") .send() .await .map_err(|e| e.to_string())?; @@ -635,7 +635,7 @@ async fn download_and_install_update(app: tauri::AppHandle, tag: String) -> Resu .build() .map_err(|e| e.to_string())?; - let url = format!("https://api.github.com/repos/Youwes09/Moku/releases/tags/{}", tag); + let url = format!("https://api.github.com/repos/moku-project/Moku/releases/tags/{}", tag); let resp = client.get(&url).send().await.map_err(|e| e.to_string())?; if !resp.status().is_success() { return Err(format!("GitHub API returned {} for tag {}", resp.status(), tag)); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 9871877..c7ee0de 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -2,7 +2,7 @@ "$schema": "https://schema.tauri.app/config/2", "productName": "Moku", "version": "0.9.0", - "identifier": "io.github.Youwes09.Moku.app", + "identifier": "io.github.moku_project.Moku.app", "build": { "frontendDist": "../dist", "beforeBuildCommand": "pnpm build" diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 1e5150b..fce4099 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -10,7 +10,7 @@ "updater": { "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDM2NEQzNDdFRjlDNUVEN0MKUldSODdjWDVmalJOTml1b0xzMDU3ZE1sNWJLZUhqUDN5cmJUdkdpeFlEVGNoQVN3UjhCc3AxV3QK", "endpoints": [ - "https://github.com/Youwes09/Moku/releases/latest/download/latest.json" + "https://github.com/moku-project/Moku/releases/latest/download/latest.json" ], "windows": { "installMode": "passive" diff --git a/src/features/settings/sections/AboutSettings.svelte b/src/features/settings/sections/AboutSettings.svelte index f80dcd0..8a48733 100644 --- a/src/features/settings/sections/AboutSettings.svelte +++ b/src/features/settings/sections/AboutSettings.svelte @@ -221,7 +221,7 @@

Links

- GitHub → + GitHub → Discord →
diff --git a/src/store/discord.ts b/src/store/discord.ts index 5584898..1e92b1c 100644 --- a/src/store/discord.ts +++ b/src/store/discord.ts @@ -5,7 +5,7 @@ import type { Manga, Chapter } from "@types"; const APP_ID = "1487894643613106298"; const FALLBACK_IMAGE = "moku_logo"; const BUTTONS = [ - { label: "GitHub", url: "https://github.com/Youwes09/Moku" }, + { label: "GitHub", url: "https://github.com/moku-project/Moku" }, { label: "Discord", url: "https://discord.gg/Jq3pwuNqPp" }, ];