Merge branch 'upstream-master' into user_accounts

# Conflicts:
#	gradle/libs.versions.toml
#	server/build.gradle.kts
#	server/src/main/kotlin/suwayomi/tachidesk/global/controller/GlobalMetaController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/global/impl/GlobalMeta.kt
#	server/src/main/kotlin/suwayomi/tachidesk/global/impl/util/Jwt.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/TrackDataLoader.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/BackupMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UserMutation.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/BackupQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/InfoQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SettingsQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/UpdateQuery.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLContextFactory.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/DownloadSubscription.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/InfoSubscription.kt
#	server/src/main/kotlin/suwayomi/tachidesk/graphql/subscriptions/UpdateSubscription.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/BackupController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/CategoryController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/MangaController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/SourceController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/TrackController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/controller/UpdateController.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Source.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/Track.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/DeletableTracker.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/Tracker.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/anilist/Anilist.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/anilist/AnilistInterceptor.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/bangumi/Bangumi.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/kitsu/Kitsu.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/kitsu/KitsuInterceptor.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/mangaupdates/MangaUpdates.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/myanimelist/MyAnimeList.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/myanimelist/MyAnimeListInterceptor.kt
#	server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/TrackRecordTable.kt
#	server/src/main/kotlin/suwayomi/tachidesk/opds/controller/OpdsV1Controller.kt
#	server/src/main/kotlin/suwayomi/tachidesk/opds/impl/Opds.kt
#	server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
#	server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
#	server/src/main/kotlin/suwayomi/tachidesk/server/user/UserType.kt
#	server/src/main/resources/server-reference.conf

Author: Syer10

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -42,7 +42,7 @@ body:
       label: Suwayomi-Server version
       description: You can find your Suwayomi-Server version in **More → About**.
       placeholder: |
-        Example: "v2.0.1727"
+        Example: "v2.1.1867"
     validations:
       required: true
 

.github/workflows/build_pull_request.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v4
 
   build:
     name: Build pull request
@@ -26,14 +26,14 @@ jobs:
 
     steps:
       - name: Checkout pull request
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: master
           fetch-depth: 0
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'

.github/workflows/build_push.yml

@@ -15,25 +15,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v4
 
   build:
     name: Build Jar
     needs: check_wrapper
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: master
           path: master
           fetch-depth: 0
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'
@@ -94,7 +94,7 @@ jobs:
 
     steps:
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'
@@ -112,90 +112,103 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - debian-all
-          - linux-assets
-          - linux-x64
-          - macOS-x64
-          - macOS-arm64
-          - windows-x64
-
-    name: Make ${{ matrix.os }} release
-    needs: [build,jlink]
+        include:
+          - name: debian-all
+            jre: linux-x64
+          - name: appimage
+            jre: linux-x64
+          - name: linux-assets
+            jre: linux-assets
+          - name: linux-x64
+            jre: linux-x64
+          - name: macOS-x64
+            jre: macOS-x64
+          - name: macOS-arm64
+            jre: macOS-arm64
+          - name: windows-x64
+            jre: windows-x64
+        name: [debian-all, appimage, linux-assets, linux-x64, macOS-x64, macOS-arm64, windows-x64]
+
+    name: Make ${{ matrix.name }} release
+    needs: [build, jlink]
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v4
-        if: matrix.os != 'linux-assets' && matrix.os != 'debian-all'
+        uses: actions/download-artifact@v5
+        if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
-          name: ${{ matrix.os }}-jre
+          name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: scripts
 
-      - name: Make ${{ matrix.os }} release
+      - name: Make ${{ matrix.name }} release
         run: |
           mkdir upload
           tar -xvpf scripts.tar.gz
-          scripts/bundler.sh -o upload/ ${{ matrix.os }}
+          scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
-      - name: Upload ${{ matrix.os }} release
+      - name: Upload ${{ matrix.name }} release
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}
+          name: ${{ matrix.name }}
           path: upload/*
           if-no-files-found: error
 
   release:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
+        with:
+          name: appimage
+          path: release
+      - uses: actions/download-artifact@v5
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: windows-x64
           path: release
 
       - name: Checkout Preview branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: "Suwayomi/Suwayomi-Server-preview"
           ref: main

.github/workflows/publish.yml

@@ -16,25 +16,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v4
 
   build:
     name: Build Jar
     needs: check_wrapper
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ${{ github.ref }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.ref }}
           path: master
           fetch-depth: 0
 
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'
@@ -96,7 +96,7 @@ jobs:
 
     steps:
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'temurin'
@@ -114,52 +114,61 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - debian-all
-          - linux-assets
-          - linux-x64
-          - macOS-x64
-          - macOS-arm64
-          - windows-x64
-
-    name: Make ${{ matrix.os }} release
+        include:
+          - name: debian-all
+            jre: linux-x64
+          - name: appimage
+            jre: linux-x64
+          - name: linux-assets
+            jre: linux-assets
+          - name: linux-x64
+            jre: linux-x64
+          - name: macOS-x64
+            jre: macOS-x64
+          - name: macOS-arm64
+            jre: macOS-arm64
+          - name: windows-x64
+            jre: windows-x64
+        name: [debian-all, appimage, linux-assets, linux-x64, macOS-x64, macOS-arm64, windows-x64]
+
+    name: Make ${{ matrix.name }} release
     needs: [build, jlink]
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v4
-        if: matrix.os != 'linux-assets' && matrix.os != 'debian-all'
+        uses: actions/download-artifact@v5
+        if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
-          name: ${{ matrix.os }}-jre
+          name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: scripts
 
-      - name: Make ${{ matrix.os }} release
+      - name: Make ${{ matrix.name }} release
         run: |
           mkdir upload/
           tar -xvpf scripts.tar.gz
-          scripts/bundler.sh -o upload/ ${{ matrix.os }}
+          scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
-      - name: Upload ${{ matrix.os }} files
+      - name: Upload ${{ matrix.name }} files
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}
+          name: ${{ matrix.name }}
           path: upload/*
           if-no-files-found: error
 
@@ -168,31 +177,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
+        with:
+          name: appimage
+          path: release
+      - uses: actions/download-artifact@v5
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: windows-x64
           path: release

.github/workflows/winget.yml

@@ -1,15 +1,19 @@
 name: Publish to WinGet
 on:
-  workflow_run:
-    workflows: ["CI Publish"]
-    types:
-      - completed
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version
+        required: false
+
 jobs:
   publish:
     runs-on: windows-latest # action can only be run on windows
     steps:
       - uses: vedantmgoyal2009/winget-releaser@v2
         with:
-          identifier: Suwayomi.Tachidesk-Server
+          identifier: Suwayomi.Suwayomi-Server
           installers-regex: '.*x64.msi$'
           token: ${{ secrets.WINGET_PUBLISH_PAT }}
+          version: ${{ inputs.version || github.ref_name }}
+          release-tag: ${{ inputs.version || github.ref_name  }}