Remove asDataFetcherResult

* Update javalin to v7

* Update Javalin usage to v7 and Jackson 3

* Import fix

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Syer10 <syer10@users.noreply.github.com>

.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.1.1867"
+        Example: "v2.2.2100"
     validations:
       required: true
 

.github/pull_request_template.md

@@ -0,0 +1,6 @@
+<!--
+Pull Request Checklist:
+- Mention what the pull request does and the reasons behind the changes
+- Mention all issues the pull request is closing
+- Make sure to update the CHANGELOG accordingly if necessary based on the LAST stable release
+-->

.github/workflows/build_push.yml

@@ -54,14 +54,14 @@ jobs:
         run: ./gradlew :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: icon
           path: master/server/src/main/resources/icon
@@ -71,7 +71,7 @@ jobs:
         run: tar -cvzf scripts.tar.gz -C master/ scripts/
 
       - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: scripts
           path: scripts.tar.gz
@@ -103,7 +103,7 @@ jobs:
         run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs,jdk.accessibility --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
 
       - name: Upload JRE package
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.name }}-jre
           path: suwa
@@ -134,26 +134,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
           name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: scripts
 
@@ -164,7 +164,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
       - name: Upload ${{ matrix.name }} release
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.name }}
           path: upload/*
@@ -174,35 +174,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: appimage
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: windows-x64
           path: release
@@ -240,7 +240,7 @@ jobs:
           git push origin $TAG
 
       - name: Upload Preview Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
           repository: "Suwayomi/Suwayomi-Server-preview"

.github/workflows/publish.yml

@@ -56,14 +56,14 @@ jobs:
         run: ./gradlew :server:downloadWebUI :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: icon
           path: master/server/src/main/resources/icon
@@ -73,7 +73,7 @@ jobs:
         run: tar -cvzf scripts.tar.gz -C master/ scripts/
 
       - name: Upload scripts.tar.gz
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: scripts
           path: scripts.tar.gz
@@ -105,7 +105,7 @@ jobs:
         run: jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.scripting,java.se,java.security.jgss,java.security.sasl,java.sql,java.transaction.xa,java.xml,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.net,jdk.unsupported,jdk.unsupported.desktop,jdk.zipfs,jdk.accessibility --output suwa --strip-debug --no-man-pages --no-header-files --compress=2
 
       - name: Upload JDK package
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.name }}-jre
           path: suwa
@@ -136,26 +136,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
           name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: scripts
 
@@ -166,7 +166,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
       - name: Upload ${{ matrix.name }} files
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.name }}
           path: upload/*
@@ -177,35 +177,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: appimage
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: windows-x64
           path: release
@@ -214,7 +214,7 @@ jobs:
         run: cd release && sha256sum * > Checksums.sha256
 
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           token: ${{ secrets.DEPLOY_RELEASE_TOKEN }}
           draft: true

AndroidCompat/src/main/java/android/graphics/Bitmap.java

@@ -345,6 +345,57 @@ public final class Bitmap {
         return image.getRGB(x, y);
     }
 
+    /**
+     * <p>Write the specified {@link Color} into the bitmap (assuming it is
+     * mutable) at the x,y coordinate. The color must be a
+     * non-premultiplied ARGB value in the {@link ColorSpace.Named#SRGB sRGB}
+     * color space.</p>
+     *
+     * @param x     The x coordinate of the pixel to replace (0...width-1)
+     * @param y     The y coordinate of the pixel to replace (0...height-1)
+     * @param color The ARGB color to write into the bitmap
+     *
+     * @throws IllegalStateException if the bitmap is not mutable
+     * @throws IllegalArgumentException if x, y are outside of the bitmap's
+     *         bounds.
+     */
+    public void setPixel(int x, int y, @ColorInt int color) {
+        checkPixelAccess(x, y);
+        image.setRGB(x, y, color);
+    }
+
+    /**
+     * <p>Replace pixels in the bitmap with the colors in the array. Each element
+     * in the array is a packed int representing a non-premultiplied ARGB
+     * {@link Color} in the {@link ColorSpace.Named#SRGB sRGB} color space.</p>
+     *
+     * @param pixels   The colors to write to the bitmap
+     * @param offset   The index of the first color to read from pixels[]
+     * @param stride   The number of colors in pixels[] to skip between rows.
+     *                 Normally this value will be the same as the width of
+     *                 the bitmap, but it can be larger (or negative).
+     * @param x        The x coordinate of the first pixel to write to in
+     *                 the bitmap.
+     * @param y        The y coordinate of the first pixel to write to in
+     *                 the bitmap.
+     * @param width    The number of colors to copy from pixels[] per row
+     * @param height   The number of rows to write to the bitmap
+     *
+     * @throws IllegalStateException if the bitmap is not mutable
+     * @throws IllegalArgumentException if x, y, width, height are outside of
+     *         the bitmap's bounds.
+     * @throws ArrayIndexOutOfBoundsException if the pixels array is too small
+     *         to receive the specified number of pixels.
+     */
+    public void setPixels(@NonNull @ColorInt int[] pixels, int offset, int stride,
+            int x, int y, int width, int height) {
+        if (width == 0 || height == 0) {
+            return; // nothing to do
+        }
+        checkPixelsAccess(x, y, width, height, offset, stride, pixels);
+        image.setRGB(x, y, width, height, pixels, offset, stride);
+    }
+
     public void eraseColor(int c) {
         java.awt.Color color = Color.valueOf(c).toJavaColor();
         Graphics2D graphics = image.createGraphics();

AndroidCompat/src/main/java/android/widget/EditText.java

@@ -7,14 +7,26 @@ package android.widget;
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-public class EditText {
-    public EditText(android.content.Context context) { throw new RuntimeException("Stub!"); }
+public class EditText extends TextView {
+    public EditText(android.content.Context context) {
+        super(context);
+        throw new RuntimeException("Stub!");
+    }
 
-    public EditText(android.content.Context context, android.util.AttributeSet attrs) { throw new RuntimeException("Stub!"); }
+    public EditText(android.content.Context context, android.util.AttributeSet attrs) {
+        super(context);
+        throw new RuntimeException("Stub!");
+    }
 
-    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) { throw new RuntimeException("Stub!"); }
+    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr) {
+        super(context);
+        throw new RuntimeException("Stub!");
+    }
 
-    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) { throw new RuntimeException("Stub!"); }
+    public EditText(android.content.Context context, android.util.AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context);
+        throw new RuntimeException("Stub!");
+    }
 
     public boolean getFreezesText() { throw new RuntimeException("Stub!"); }
 

README.md

@@ -7,9 +7,8 @@
 - [What is Suwayomi?](#what-is-suwayomi)
   - [Features](#features)
 - [Suwayomi client projects](#suwayomi-client-projects)
-  - [Actively Developed Clients](#actively-developed-clients)
-  - [Inactive Clients (functional but outdated)](#inactive-clients-functional-but-outdated)
-  - [Abandoned Clients (functionality unknown)](#abandoned-clients-functionality-unknown)
+  - [Integrated clients](#integrated-clients)
+  - [Other clients](#other-clients-potentially-inactive-or-abondend)
 - [Downloading and Running the app](#downloading-and-running-the-app)
   - [Using Operating System Specific Bundles](#using-operating-system-specific-bundles)
     - [Windows](#windows)
@@ -69,18 +68,20 @@ You can use Mihon (Tachiyomi) to access your Suwayomi-Server. For more info look
 **You need a client/user interface app as a front-end for Suwayomi-Server, if you [Directly Download Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/releases/latest) you'll get a bundled version of [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI) with it.**
 
 Here's a list of known clients/user interfaces for Suwayomi-Server (checkout the respective GitHub repository for their features):
-##### Actively Developed Clients
-- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI): The web front-end that Suwayomi-Server ships with by default.
-- [Suwayomi-VUI](https://github.com/Suwayomi/Suwayomi-VUI): A Suwayomi-Server preview focused web frontend built with svelte
-- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): A Web front-end for Suwayomi-Server built with Vaadin.
-- [Moku](https://github.com/Youwes09/Moku): A fast, minimal Tauri + Svelte desktop client with clean and minimal UI.
-##### Inactive Clients (functional but outdated)
-- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): The native desktop front-end for Suwayomi-Server.
-- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): A Flutter front-end for Desktop(Linux, windows, etc.), Web and Android with a User Interface inspired by Mihon (Tachiyomi).
-#####  Abandoned Clients (functionality unknown)
-- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): A C++/Qt front-end for mobile devices(Android/linux), feature support is basic.
-- [Tachidesk-GTK](https://github.com/mahor1221/Tachidesk-GTK): A native Rust/GTK desktop client.
-- [Equinox](https://github.com/Suwayomi/Equinox): A web user interface made with Vue.js.
+
+##### Integrated clients
+
+These clients are built-in options, and the server can keep them automatically up-to-date.
+
+- [Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI): Web app, PWA
+- [Suwayomi-VUI](https://github.com/Suwayomi/Suwayomi-VUI): Web app, PWA
+
+##### Other clients (potentially inactive or abandoned)
+- [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): Desktop app (windows, linux, mac); UI in the browser, manages its own suwayomi server instance
+- [Moku](https://github.com/Youwes09/Moku): Desktop app (windows, linux, mac), can manage its own suwayomi server instance
+- [Tachidesk-JUI](https://github.com/Suwayomi/Tachidesk-JUI): Desktop app (windows, linux, mac); can manage its own suwayomi server instance
+- [Tachidesk-Sorayomi](https://github.com/Suwayomi/Tachidesk-Sorayomi): Web app; Desktop app (windows, linux, mac); Android app; requires access to a running server
+- [Tachidesk-qtui](https://github.com/Suwayomi/Tachidesk-qtui): Android app; iOS app Desktop app (linux); requires access to a running server
 
 # Downloading and Running the app
 ## Using Operating System Specific Bundles

build.gradle.kts

@@ -53,7 +53,7 @@ subprojects {
             }
             compilerOptions {
                 jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-                freeCompilerArgs.add("-Xcontext-receivers")
+                freeCompilerArgs.add("-Xcontext-parameters")
             }
         }
     }

buildSrc/src/main/kotlin/Constants.kt

@@ -10,9 +10,9 @@ import java.io.BufferedReader
 const val MainClass = "suwayomi.tachidesk.MainKt"
 
 // should be bumped with each stable release
-val getTachideskVersion = { "v2.1.${getCommitCount()}" }
+val getTachideskVersion = { "v2.2.${getCommitCount()}" }
 
-val webUIRevisionTag = "r2643"
+val webUIRevisionTag = "r3136"
 
 private val getCommitCount = {
     runCatching {

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
-kotlin = "2.3.10"
-coroutines = "1.10.2"
-serialization = "1.10.0"
+kotlin = "2.3.21"
+coroutines = "1.11.0"
+serialization = "1.11.0"
 jvmTarget = "21"
 okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
-javalin = "6.7.0"
-jte = "3.2.3"
-jackson = "2.18.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+javalin = "7.2.0"
+jte = "3.2.4"
+jackson = "3.1.2" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
 exposed = "0.61.0"
-dex2jar = "2.4.34"
-polyglot = "24.2.2"
+dex2jar = "2.4.36"
+polyglot = "25.0.3"
 settings = "1.3.0"
-twelvemonkeys = "3.13.0"
-graphqlkotlin = "8.8.1"
+twelvemonkeys = "3.13.1"
+graphqlkotlin = "10.0.0-alpha.3"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
-koin = "4.1.1"
-moko = "0.26.0"
+koin = "4.2.1"
+moko = "0.26.4"
 
 [libraries]
 # Kotlin
@@ -39,22 +39,22 @@ serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-jvm", v
 # Logging
 slf4japi = "org.slf4j:slf4j-api:2.0.17"
 logback = "ch.qos.logback:logback-classic:1.5.32"
-kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.01"
+kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.02"
 
 # OkHttp
 okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
 okhttp-brotli = { module = "com.squareup.okhttp3:okhttp-brotli", version.ref = "okhttp" }
-okio = "com.squareup.okio:okio:3.16.4"
+okio = "com.squareup.okio:okio:3.17.0"
 
 # Javalin api
 javalin-core = { module = "io.javalin:javalin", version.ref = "javalin" }
 javalin-openapi = { module = "io.javalin:javalin-openapi", version.ref = "javalin" }
-javalin-rendering = { module = "io.javalin:javalin-rendering", version.ref = "javalin" }
-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
-jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
+javalin-rendering = { module = "io.javalin:javalin-rendering-jte", version.ref = "javalin" }
+jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
+jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.20"
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }
 
@@ -68,7 +68,7 @@ exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "e
 exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
 exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
 exposed-javatime = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
-postgres = "org.postgresql:postgresql:42.7.10"
+postgres = "org.postgresql:postgresql:42.7.11"
 h2 = "com.h2database:h2:1.4.200" # current database driver, can't update to h2 v2 without sql migration
 hikaricp = "com.zaxxer:HikariCP:7.0.2"
 
@@ -86,10 +86,10 @@ systemtray-desktop = "com.dorkbox:Desktop:1.1" # version locked by SystemTray
 # dependencies of Tachiyomi extensions
 injekt = "com.github.null2264:injekt-koin:ee267b2e27"
 rxjava = "io.reactivex:rxjava:1.3.8"
-jsoup = "org.jsoup:jsoup:1.22.1"
+jsoup = "org.jsoup:jsoup:1.22.2"
 
 # Config
-config = "com.typesafe:config:1.4.5"
+config = "com.typesafe:config:1.4.8"
 config4k = "io.github.config4k:config4k:0.7.0"
 
 # Sort
@@ -105,7 +105,7 @@ dex2jar-tools = { module = "de.femtopedia.dex2jar:dex-tools", version.ref = "dex
 
 # APK
 apk-parser = "net.dongliu:apk-parser:2.6.10"
-apksig = "com.android.tools.build:apksig:9.0.1"
+apksig = "com.android.tools.build:apksig:9.2.1"
 
 # Xml
 xmlpull = "xmlpull:xmlpull:1.1.3.4a"
@@ -115,13 +115,13 @@ appdirs = "ca.gosyer:kotlin-multiplatform-appdirs:2.0.0"
 cache4k = "io.github.reactivecircus.cache4k:cache4k:0.14.0"
 zip4j = "net.lingala.zip4j:zip4j:2.11.6"
 commonscompress = "org.apache.commons:commons-compress:1.28.0"
-junrar = "com.github.junrar:junrar:7.5.7"
+junrar = "com.github.junrar:junrar:7.5.10"
 
 # AES/CBC/PKCS7Padding Cypher provider
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.83"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
 
 # AndroidX annotations
-android-annotations = "androidx.annotation:annotation:1.9.1"
+android-annotations = "androidx.annotation:annotation:1.10.0"
 
 # Substitute for duktape-android
 polyglot-core = { module = "org.graalvm.polyglot:polyglot", version.ref = "polyglot" }
@@ -132,7 +132,7 @@ settings-core = { module = "com.russhwolf:multiplatform-settings-jvm", version.r
 settings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization-jvm", version.ref = "settings" }
 
 # ICU4J
-icu4j = "com.ibm.icu:icu4j:78.2"
+icu4j = "com.ibm.icu:icu4j:78.3"
 
 # Image Decoding implementation provider
 twelvemonkeys-common-lang = { module = "com.twelvemonkeys.common:common-lang", version.ref = "twelvemonkeys" }
@@ -158,7 +158,7 @@ cronUtils = "com.cronutils:cron-utils:9.2.1"
 kcef = "dev.datlag:kcef:2024.04.20.4"
 
 # User
-jwt = "com.auth0:java-jwt:4.5.1"
+jwt = "com.auth0:java-jwt:4.5.2"
 
 # lint - used for renovate to update ktlint version
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
@@ -173,16 +173,16 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin"}
 
 # Linter
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.0.1"}
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.2.0"}
 
 # Build config
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.7"}
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.9"}
 
 # Download
 download = { id = "de.undercouch.download", version = "5.7.0"}
 
 # ShadowJar
-shadowjar = { id = "com.gradleup.shadow", version = "8.3.9"}
+shadowjar = { id = "com.gradleup.shadow", version = "8.3.10"}
 
 # Moko
 moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
@@ -73,21 +73,10 @@ goto fail
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt

@@ -71,7 +71,7 @@ fun createAppModule(app: Application): Module {
             }
         }
 
-        single {
+        single<ProtoBuf> {
             ProtoBuf
         }
     }

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -140,17 +140,16 @@ fun OkHttpClient.newCachelessCallWithProgress(
     return progressClient.newCall(request)
 }
 
-context(Json)
+context(_: Json)
 inline fun <reified T> Response.parseAs(): T = decodeFromJsonResponse(serializer(), this)
 
-@OptIn(ExperimentalSerializationApi::class)
-context(Json)
+context(json: Json)
 fun <T> decodeFromJsonResponse(
     deserializer: DeserializationStrategy<T>,
     response: Response,
 ): T =
     response.body.source().use {
-        decodeFromBufferedSource(deserializer, it)
+        json.decodeFromBufferedSource(deserializer, it)
     }
 
 class HttpException(

server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt

@@ -6,7 +6,7 @@ import io.javalin.websocket.WsMessageContext
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
-import org.eclipse.jetty.websocket.api.CloseStatus
+import org.eclipse.jetty.websocket.core.CloseStatus
 import suwayomi.tachidesk.manga.impl.update.Websocket
 
 object WebView : Websocket<String>() {

server/src/main/kotlin/suwayomi/tachidesk/graphql/AsDataFetcherResult.kt

@@ -1,27 +0,0 @@
-package suwayomi.tachidesk.graphql
-
-import com.expediagroup.graphql.server.extensions.toGraphQLError
-import graphql.execution.DataFetcherResult
-import io.github.oshai.kotlinlogging.KotlinLogging
-
-val logger = KotlinLogging.logger { }
-
-inline fun <T> asDataFetcherResult(block: () -> T): DataFetcherResult<T?> {
-    val result =
-        runCatching {
-            block()
-        }
-
-    if (result.isFailure) {
-        logger.error(result.exceptionOrNull()) { "asDataFetcherResult: failed due to" }
-        return DataFetcherResult
-            .newResult<T?>()
-            .error(result.exceptionOrNull()?.toGraphQLError())
-            .build()
-    }
-
-    return DataFetcherResult
-        .newResult<T?>()
-        .data(result.getOrNull())
-        .build()
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/cache/CustomCacheMap.kt

@@ -3,12 +3,8 @@ package suwayomi.tachidesk.graphql.cache
 import org.dataloader.CacheMap
 import java.util.concurrent.CompletableFuture
 
-class CustomCacheMap<K, V> : CacheMap<K, V> {
-    private val cache: MutableMap<K, CompletableFuture<V>>
-
-    init {
-        cache = HashMap()
-    }
+class CustomCacheMap<K : Any, V : Any> : CacheMap<K, V> {
+    private val cache: MutableMap<K, CompletableFuture<V>> = HashMap()
 
     override fun containsKey(key: K): Boolean = cache.containsKey(key)
 
@@ -18,12 +14,12 @@ class CustomCacheMap<K, V> : CacheMap<K, V> {
 
     override fun getAll(): Collection<CompletableFuture<V>> = cache.values
 
-    override fun set(
+    override fun putIfAbsentAtomically(
         key: K,
         value: CompletableFuture<V>,
-    ): CacheMap<K, V> {
+    ): CompletableFuture<V> {
         cache[key] = value
-        return this
+        return value
     }
 
     override fun delete(key: K): CacheMap<K, V> {
@@ -35,4 +31,6 @@ class CustomCacheMap<K, V> : CacheMap<K, V> {
         cache.clear()
         return this
     }
+
+    override fun size(): Int = cache.size
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt

@@ -24,11 +24,11 @@ import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class ChapterDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class ChapterDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "ChapterDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -48,7 +48,7 @@ class ChaptersForMangaDataLoader : KotlinDataLoader<Int, ChapterNodeList> {
     override val dataLoaderName = "ChaptersForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterNodeList> =
-        DataLoaderFactory.newDataLoader<Int, ChapterNodeList> { ids ->
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -68,7 +68,7 @@ class DownloadedChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
     override val dataLoaderName = "DownloadedChapterCountForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -90,7 +90,7 @@ class UnreadChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
     override val dataLoaderName = "UnreadChapterCountForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -112,7 +112,7 @@ class BookmarkedChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
     override val dataLoaderName = "BookmarkedChapterCountForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -157,11 +157,11 @@ class HasDuplicateChaptersForMangaDataLoader : KotlinDataLoader<Int, Boolean> {
         }
 }
 
-class LastReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class LastReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "LastReadChapterForMangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -177,11 +177,11 @@ class LastReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
         }
 }
 
-class LatestReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class LatestReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "LatestReadChapterForMangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -197,11 +197,11 @@ class LatestReadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?>
         }
 }
 
-class LatestFetchedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class LatestFetchedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "LatestFetchedChapterForMangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -217,11 +217,11 @@ class LatestFetchedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType
         }
 }
 
-class LatestUploadedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class LatestUploadedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "LatestUploadedChapterForMangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -237,11 +237,11 @@ class LatestUploadedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterTyp
         }
 }
 
-class FirstUnreadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class FirstUnreadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "FirstUnreadChapterForMangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -257,11 +257,11 @@ class FirstUnreadChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?>
         }
 }
 
-class HighestNumberedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType?> {
+class HighestNumberedChapterForMangaDataLoader : KotlinDataLoader<Int, ChapterType> {
     override val dataLoaderName = "HighestNumberedChapterForMangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType> =
+        DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt

@@ -20,10 +20,10 @@ import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType?> {
+class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType> {
     override val dataLoaderName = "ExtensionDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionType?> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionType> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
@@ -40,10 +40,10 @@ class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType?> {
         }
 }
 
-class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType?> {
+class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType> {
     override val dataLoaderName = "ExtensionForSourceDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, ExtensionType?> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, ExtensionType> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt

@@ -25,10 +25,10 @@ import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class MangaDataLoader : KotlinDataLoader<Int, MangaType?> {
+class MangaDataLoader : KotlinDataLoader<Int, MangaType> {
     override val dataLoaderName = "MangaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, MangaType?> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, MangaType> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
@@ -122,6 +122,6 @@ class MangaForIdsDataLoader : KotlinDataLoader<List<Int>, MangaNodeList> {
                     }
                 }
             },
-            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()),
+            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()).build(),
         )
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt

@@ -20,11 +20,11 @@ import suwayomi.tachidesk.manga.model.table.MangaMetaTable
 import suwayomi.tachidesk.manga.model.table.SourceMetaTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class GlobalMetaDataLoader : KotlinDataLoader<String, GlobalMetaType?> {
+class GlobalMetaDataLoader : KotlinDataLoader<String, GlobalMetaType> {
     override val dataLoaderName = "GlobalMetaDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, GlobalMetaType?> =
-        DataLoaderFactory.newDataLoader<String, GlobalMetaType?> { ids ->
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, GlobalMetaType> =
+        DataLoaderFactory.newDataLoader<String, GlobalMetaType> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)

server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt

@@ -22,10 +22,10 @@ import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class SourceDataLoader : KotlinDataLoader<Long, SourceType?> {
+class SourceDataLoader : KotlinDataLoader<Long, SourceType> {
     override val dataLoaderName = "SourceDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, SourceType?> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, SourceType> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/BackupMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.execution.DataFetcherResult
@@ -15,7 +17,6 @@ import org.jetbrains.exposed.sql.or
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.CategoryType
@@ -42,13 +43,12 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun setCategoryMeta(input: SetCategoryMetaInput): DataFetcherResult<SetCategoryMetaPayload?> =
-        asDataFetcherResult {
+    fun setCategoryMeta(input: SetCategoryMetaInput): SetCategoryMetaPayload? {
         val (clientMutationId, meta) = input
 
         Category.modifyMeta(meta.categoryId, meta.key, meta.value)
 
-            SetCategoryMetaPayload(clientMutationId, meta)
+        return SetCategoryMetaPayload(clientMutationId, meta)
     }
 
     data class DeleteCategoryMetaInput(
@@ -64,8 +64,7 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DataFetcherResult<DeleteCategoryMetaPayload?> =
-        asDataFetcherResult {
+    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DeleteCategoryMetaPayload? {
         val (clientMutationId, categoryId, key) = input
 
         val (meta, category) =
@@ -90,7 +89,7 @@ class CategoryMutation {
                 } to category
             }
 
-            DeleteCategoryMetaPayload(clientMutationId, meta, category)
+        return DeleteCategoryMetaPayload(clientMutationId, meta, category)
     }
 
     data class SetCategoryMetasItem(
@@ -110,8 +109,7 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun setCategoryMetas(input: SetCategoryMetasInput): DataFetcherResult<SetCategoryMetasPayload?> =
-        asDataFetcherResult {
+    fun setCategoryMetas(input: SetCategoryMetasInput): SetCategoryMetasPayload? {
         val (clientMutationId, items) = input
 
         val metaByCategoryId =
@@ -145,7 +143,7 @@ class CategoryMutation {
                 updatedMetas to categories
             }
 
-            SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
+        return SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
     }
 
     data class DeleteCategoryMetasItem(
@@ -166,8 +164,7 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DataFetcherResult<DeleteCategoryMetasPayload?> =
-        asDataFetcherResult {
+    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DeleteCategoryMetasPayload? {
         val (clientMutationId, items) = input
 
         items.forEach { item ->
@@ -222,7 +219,7 @@ class CategoryMutation {
                     .distinctBy { it.id }
             }
 
-            DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
+        return DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
     }
 
     data class UpdateCategoryPatch(
@@ -291,8 +288,7 @@ class CategoryMutation {
     }
 
     @RequireAuth
-    fun updateCategory(input: UpdateCategoryInput): DataFetcherResult<UpdateCategoryPayload?> =
-        asDataFetcherResult {
+    fun updateCategory(input: UpdateCategoryInput): UpdateCategoryPayload? {
         val (clientMutationId, id, patch) = input
 
         updateCategories(listOf(id), patch)
@@ -302,15 +298,14 @@ class CategoryMutation {
                 CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
             }
 
-            UpdateCategoryPayload(
+        return UpdateCategoryPayload(
             clientMutationId = clientMutationId,
             category = category,
         )
     }
 
     @RequireAuth
-    fun updateCategories(input: UpdateCategoriesInput): DataFetcherResult<UpdateCategoriesPayload?> =
-        asDataFetcherResult {
+    fun updateCategories(input: UpdateCategoriesInput): UpdateCategoriesPayload? {
         val (clientMutationId, ids, patch) = input
 
         updateCategories(ids, patch)
@@ -320,7 +315,7 @@ class CategoryMutation {
                 CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
             }
 
-            UpdateCategoriesPayload(
+        return UpdateCategoriesPayload(
             clientMutationId = clientMutationId,
             categories = categories,
         )
@@ -338,8 +333,7 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun updateCategoryOrder(input: UpdateCategoryOrderInput): DataFetcherResult<UpdateCategoryOrderPayload?> =
-        asDataFetcherResult {
+    fun updateCategoryOrder(input: UpdateCategoryOrderInput): UpdateCategoryOrderPayload? {
         val (clientMutationId, categoryId, position) = input
         require(position > 0) {
             "'order' must not be <= 0"
@@ -376,7 +370,7 @@ class CategoryMutation {
                 CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
             }
 
-            UpdateCategoryOrderPayload(
+        return UpdateCategoryOrderPayload(
             clientMutationId = clientMutationId,
             categories = categories,
         )
@@ -397,8 +391,7 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun createCategory(input: CreateCategoryInput): DataFetcherResult<CreateCategoryPayload?> =
-        asDataFetcherResult {
+    fun createCategory(input: CreateCategoryInput): CreateCategoryPayload? {
         val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
         transaction {
             require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
@@ -442,7 +435,7 @@ class CategoryMutation {
                 CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
             }
 
-            CreateCategoryPayload(clientMutationId, category)
+        return CreateCategoryPayload(clientMutationId, category)
     }
 
     data class DeleteCategoryInput(
@@ -457,11 +450,10 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategory(input: DeleteCategoryInput): DataFetcherResult<DeleteCategoryPayload?> {
-        return asDataFetcherResult {
+    fun deleteCategory(input: DeleteCategoryInput): DeleteCategoryPayload? {
         val (clientMutationId, categoryId) = input
         if (categoryId == 0) { // Don't delete default category
-                return@asDataFetcherResult DeleteCategoryPayload(
+            return DeleteCategoryPayload(
                 clientMutationId,
                 null,
                 emptyList(),
@@ -496,8 +488,7 @@ class CategoryMutation {
                 } to mangas
             }
 
-            DeleteCategoryPayload(clientMutationId, category, mangas)
-        }
+        return DeleteCategoryPayload(clientMutationId, category, mangas)
     }
 
     data class UpdateMangaCategoriesPatch(
@@ -547,8 +538,7 @@ class CategoryMutation {
     }
 
     @RequireAuth
-    fun updateMangaCategories(input: UpdateMangaCategoriesInput): DataFetcherResult<UpdateMangaCategoriesPayload?> =
-        asDataFetcherResult {
+    fun updateMangaCategories(input: UpdateMangaCategoriesInput): UpdateMangaCategoriesPayload? {
         val (clientMutationId, id, patch) = input
 
         updateMangas(listOf(id), patch)
@@ -558,15 +548,14 @@ class CategoryMutation {
                 MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
             }
 
-            UpdateMangaCategoriesPayload(
+        return UpdateMangaCategoriesPayload(
             clientMutationId = clientMutationId,
             manga = manga,
         )
     }
 
     @RequireAuth
-    fun updateMangasCategories(input: UpdateMangasCategoriesInput): DataFetcherResult<UpdateMangasCategoriesPayload?> =
-        asDataFetcherResult {
+    fun updateMangasCategories(input: UpdateMangasCategoriesInput): UpdateMangasCategoriesPayload? {
         val (clientMutationId, ids, patch) = input
 
         updateMangas(ids, patch)
@@ -576,7 +565,7 @@ class CategoryMutation {
                 MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
             }
 
-            UpdateMangasCategoriesPayload(
+        return UpdateMangasCategoriesPayload(
             clientMutationId = clientMutationId,
             mangas = mangas,
         )

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt

@@ -1,6 +1,7 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
-import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jetbrains.exposed.dao.id.EntityID
@@ -16,7 +17,6 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
 import suwayomi.tachidesk.graphql.types.ChapterType
@@ -120,8 +120,7 @@ class ChapterMutation {
     }
 
     @RequireAuth
-    fun updateChapter(input: UpdateChapterInput): DataFetcherResult<UpdateChapterPayload?> =
-        asDataFetcherResult {
+    fun updateChapter(input: UpdateChapterInput): UpdateChapterPayload? {
         val (clientMutationId, id, patch) = input
 
         updateChapters(listOf(id), patch)
@@ -131,15 +130,14 @@ class ChapterMutation {
                 ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
             }
 
-            UpdateChapterPayload(
+        return UpdateChapterPayload(
             clientMutationId = clientMutationId,
             chapter = chapter,
         )
     }
 
     @RequireAuth
-    fun updateChapters(input: UpdateChaptersInput): DataFetcherResult<UpdateChaptersPayload?> =
-        asDataFetcherResult {
+    fun updateChapters(input: UpdateChaptersInput): UpdateChaptersPayload? {
         val (clientMutationId, ids, patch) = input
 
         updateChapters(ids, patch)
@@ -149,7 +147,7 @@ class ChapterMutation {
                 ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
             }
 
-            UpdateChaptersPayload(
+        return UpdateChaptersPayload(
             clientMutationId = clientMutationId,
             chapters = chapters,
         )
@@ -166,11 +164,10 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<DataFetcherResult<FetchChaptersPayload?>> {
+    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<FetchChaptersPayload?> {
         val (clientMutationId, mangaId) = input
 
         return future {
-            asDataFetcherResult {
             Chapter.fetchChapterList(mangaId)
 
             val chapters =
@@ -188,7 +185,6 @@ class ChapterMutation {
             )
         }
     }
-    }
 
     data class SetChapterMetaInput(
         val clientMutationId: String? = null,
@@ -201,13 +197,12 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun setChapterMeta(input: SetChapterMetaInput): DataFetcherResult<SetChapterMetaPayload?> =
-        asDataFetcherResult {
+    fun setChapterMeta(input: SetChapterMetaInput): SetChapterMetaPayload? {
         val (clientMutationId, meta) = input
 
         Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
 
-            SetChapterMetaPayload(clientMutationId, meta)
+        return SetChapterMetaPayload(clientMutationId, meta)
     }
 
     data class DeleteChapterMetaInput(
@@ -223,8 +218,7 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun deleteChapterMeta(input: DeleteChapterMetaInput): DataFetcherResult<DeleteChapterMetaPayload?> =
-        asDataFetcherResult {
+    fun deleteChapterMeta(input: DeleteChapterMetaInput): DeleteChapterMetaPayload? {
         val (clientMutationId, chapterId, key) = input
 
         val (meta, chapter) =
@@ -249,7 +243,7 @@ class ChapterMutation {
                 } to chapter
             }
 
-            DeleteChapterMetaPayload(clientMutationId, meta, chapter)
+        return DeleteChapterMetaPayload(clientMutationId, meta, chapter)
     }
 
     data class SetChapterMetasItem(
@@ -269,8 +263,7 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun setChapterMetas(input: SetChapterMetasInput): DataFetcherResult<SetChapterMetasPayload?> =
-        asDataFetcherResult {
+    fun setChapterMetas(input: SetChapterMetasInput): SetChapterMetasPayload? {
         val (clientMutationId, items) = input
 
         val metaByChapterId =
@@ -304,7 +297,7 @@ class ChapterMutation {
                 updatedMetas to chapters
             }
 
-            SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
+        return SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
     }
 
     data class DeleteChapterMetasItem(
@@ -325,8 +318,7 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun deleteChapterMetas(input: DeleteChapterMetasInput): DataFetcherResult<DeleteChapterMetasPayload?> =
-        asDataFetcherResult {
+    fun deleteChapterMetas(input: DeleteChapterMetasInput): DeleteChapterMetasPayload? {
         val (clientMutationId, items) = input
 
         items.forEach { item ->
@@ -381,7 +373,7 @@ class ChapterMutation {
                     .distinctBy { it.id }
             }
 
-            DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
+        return DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
     }
 
     data class FetchChapterPagesInput(
@@ -405,12 +397,11 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun fetchChapterPages(input: FetchChapterPagesInput): CompletableFuture<DataFetcherResult<FetchChapterPagesPayload?>> {
+    fun fetchChapterPages(input: FetchChapterPagesInput): CompletableFuture<FetchChapterPagesPayload?> {
         val (clientMutationId, chapterId) = input
         val paramsMap = input.toParams()
 
         return future {
-            asDataFetcherResult {
             var chapter = getChapterDownloadReadyById(chapterId)
             val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
             var syncConflictInfo: SyncConflictInfoType? = null
@@ -467,5 +458,4 @@ class ChapterMutation {
             )
         }
     }
-    }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.execution.DataFetcherResult
@@ -5,7 +7,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.DownloadStatus
@@ -30,13 +31,12 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DataFetcherResult<DeleteDownloadedChaptersPayload?> {
+    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DeleteDownloadedChaptersPayload? {
         val (clientMutationId, chapters) = input
 
-        return asDataFetcherResult {
         Chapter.deleteChapters(chapters)
 
-            DeleteDownloadedChaptersPayload(
+        return DeleteDownloadedChaptersPayload(
             clientMutationId = clientMutationId,
             chapters =
                 transaction {
@@ -47,7 +47,6 @@ class DownloadMutation {
                 },
         )
     }
-    }
 
     data class DeleteDownloadedChapterInput(
         val clientMutationId: String? = null,
@@ -60,13 +59,12 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DataFetcherResult<DeleteDownloadedChapterPayload?> {
+    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DeleteDownloadedChapterPayload? {
         val (clientMutationId, chapter) = input
 
-        return asDataFetcherResult {
         Chapter.deleteChapters(listOf(chapter))
 
-            DeleteDownloadedChapterPayload(
+        return DeleteDownloadedChapterPayload(
             clientMutationId = clientMutationId,
             chapters =
                 transaction {
@@ -74,7 +72,6 @@ class DownloadMutation {
                 },
         )
     }
-    }
 
     data class EnqueueChapterDownloadsInput(
         val clientMutationId: String? = null,
@@ -87,13 +84,10 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun enqueueChapterDownloads(
-        input: EnqueueChapterDownloadsInput,
-    ): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadsPayload?>> {
+    fun enqueueChapterDownloads(input: EnqueueChapterDownloadsInput): CompletableFuture<EnqueueChapterDownloadsPayload?> {
         val (clientMutationId, chapters) = input
 
         return future {
-            asDataFetcherResult {
             DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))
 
             EnqueueChapterDownloadsPayload(
@@ -110,7 +104,6 @@ class DownloadMutation {
             )
         }
     }
-    }
 
     data class EnqueueChapterDownloadInput(
         val clientMutationId: String? = null,
@@ -123,11 +116,10 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadPayload?>> {
+    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<EnqueueChapterDownloadPayload?> {
         val (clientMutationId, chapter) = input
 
         return future {
-            asDataFetcherResult {
             DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))
 
             EnqueueChapterDownloadPayload(
@@ -143,7 +135,6 @@ class DownloadMutation {
             )
         }
     }
-    }
 
     data class DequeueChapterDownloadsInput(
         val clientMutationId: String? = null,
@@ -156,13 +147,10 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun dequeueChapterDownloads(
-        input: DequeueChapterDownloadsInput,
-    ): CompletableFuture<DataFetcherResult<DequeueChapterDownloadsPayload?>> {
+    fun dequeueChapterDownloads(input: DequeueChapterDownloadsInput): CompletableFuture<DequeueChapterDownloadsPayload?> {
         val (clientMutationId, chapters) = input
 
         return future {
-            asDataFetcherResult {
             DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))
 
             DequeueChapterDownloadsPayload(
@@ -181,7 +169,6 @@ class DownloadMutation {
             )
         }
     }
-    }
 
     data class DequeueChapterDownloadInput(
         val clientMutationId: String? = null,
@@ -194,11 +181,10 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DataFetcherResult<DequeueChapterDownloadPayload?>> {
+    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DequeueChapterDownloadPayload?> {
         val (clientMutationId, chapter) = input
 
         return future {
-            asDataFetcherResult {
             DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))
 
             DequeueChapterDownloadPayload(
@@ -217,7 +203,6 @@ class DownloadMutation {
             )
         }
     }
-    }
 
     data class StartDownloaderInput(
         val clientMutationId: String? = null,
@@ -229,9 +214,8 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun startDownloader(input: StartDownloaderInput): CompletableFuture<DataFetcherResult<StartDownloaderPayload?>> =
+    fun startDownloader(input: StartDownloaderInput): CompletableFuture<StartDownloaderPayload?> =
         future {
-            asDataFetcherResult {
             DownloadManager.start()
 
             StartDownloaderPayload(
@@ -246,7 +230,6 @@ class DownloadMutation {
                     },
             )
         }
-        }
 
     data class StopDownloaderInput(
         val clientMutationId: String? = null,
@@ -258,9 +241,8 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<DataFetcherResult<StopDownloaderPayload?>> =
+    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<StopDownloaderPayload?> =
         future {
-            asDataFetcherResult {
             DownloadManager.stop()
 
             StopDownloaderPayload(
@@ -275,7 +257,6 @@ class DownloadMutation {
                     },
             )
         }
-        }
 
     data class ClearDownloaderInput(
         val clientMutationId: String? = null,
@@ -287,9 +268,8 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<DataFetcherResult<ClearDownloaderPayload?>> =
+    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<ClearDownloaderPayload?> =
         future {
-            asDataFetcherResult {
             DownloadManager.clear()
 
             ClearDownloaderPayload(
@@ -304,7 +284,6 @@ class DownloadMutation {
                     },
             )
         }
-        }
 
     data class ReorderChapterDownloadInput(
         val clientMutationId: String? = null,
@@ -318,11 +297,10 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<DataFetcherResult<ReorderChapterDownloadPayload?>> {
+    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<ReorderChapterDownloadPayload?> {
         val (clientMutationId, chapter, to) = input
 
         return future {
-            asDataFetcherResult {
             DownloadManager.reorder(chapter, to)
 
             ReorderChapterDownloadPayload(
@@ -338,5 +316,4 @@ class DownloadMutation {
             )
         }
     }
-    }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import eu.kanade.tachiyomi.source.local.LocalSource
@@ -5,7 +7,6 @@ import graphql.execution.DataFetcherResult
 import io.javalin.http.UploadedFile
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension
@@ -75,11 +76,10 @@ class ExtensionMutation {
     }
 
     @RequireAuth
-    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<DataFetcherResult<UpdateExtensionPayload?>> {
+    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<UpdateExtensionPayload?> {
         val (clientMutationId, id, patch) = input
 
         return future {
-            asDataFetcherResult {
             updateExtensions(listOf(id), patch)
 
             val extension =
@@ -97,14 +97,12 @@ class ExtensionMutation {
             )
         }
     }
-    }
 
     @RequireAuth
-    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<DataFetcherResult<UpdateExtensionsPayload?>> {
+    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<UpdateExtensionsPayload?> {
         val (clientMutationId, ids, patch) = input
 
         return future {
-            asDataFetcherResult {
             updateExtensions(ids, patch)
 
             val extensions =
@@ -121,7 +119,6 @@ class ExtensionMutation {
             )
         }
     }
-    }
 
     data class FetchExtensionsInput(
         val clientMutationId: String? = null,
@@ -133,11 +130,10 @@ class ExtensionMutation {
     )
 
     @RequireAuth
-    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<DataFetcherResult<FetchExtensionsPayload?>> {
+    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<FetchExtensionsPayload?> {
         val (clientMutationId) = input
 
         return future {
-            asDataFetcherResult {
             ExtensionsList.fetchExtensions()
 
             val extensions =
@@ -154,7 +150,6 @@ class ExtensionMutation {
             )
         }
     }
-    }
 
     data class InstallExternalExtensionInput(
         val clientMutationId: String? = null,
@@ -167,13 +162,10 @@ class ExtensionMutation {
     )
 
     @RequireAuth
-    fun installExternalExtension(
-        input: InstallExternalExtensionInput,
-    ): CompletableFuture<DataFetcherResult<InstallExternalExtensionPayload?>> {
+    fun installExternalExtension(input: InstallExternalExtensionInput): CompletableFuture<InstallExternalExtensionPayload?> {
         val (clientMutationId, extensionFile) = input
 
         return future {
-            asDataFetcherResult {
             Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())
 
             val dbExtension =
@@ -185,5 +177,4 @@ class ExtensionMutation {
             )
         }
     }
-    }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ImageMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import suwayomi.tachidesk.graphql.directives.RequireAuth

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt

@@ -1,9 +1,10 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.UpdateState.DOWNLOADING
 import suwayomi.tachidesk.graphql.types.UpdateState.ERROR
@@ -26,9 +27,8 @@ class InfoMutation {
     )
 
     @RequireAuth
-    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<DataFetcherResult<WebUIUpdatePayload?>> {
+    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<WebUIUpdatePayload?> {
         return future {
-            asDataFetcherResult {
             withTimeout(30.seconds) {
                 if (WebInterfaceManager.status.value.state === DOWNLOADING) {
                     return@withTimeout WebUIUpdatePayload(input.clientMutationId, WebInterfaceManager.status.value)
@@ -59,12 +59,10 @@ class InfoMutation {
             }
         }
     }
-    }
 
     @RequireAuth
-    fun resetWebUIUpdateStatus(): CompletableFuture<DataFetcherResult<WebUIUpdateStatus?>> =
+    fun resetWebUIUpdateStatus(): CompletableFuture<WebUIUpdateStatus?> =
         future {
-            asDataFetcherResult {
             withTimeout(30.seconds) {
                 val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
                 if (!isUpdateFinished) {
@@ -76,5 +74,4 @@ class InfoMutation {
                 WebInterfaceManager.status.first { it.state == IDLE }
             }
         }
-        }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/KoreaderSyncMutation.kt

@@ -1,10 +1,11 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.KoSyncConnectPayload
@@ -62,9 +63,8 @@ class KoreaderSyncMutation {
     )
 
     @RequireAuth
-    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<DataFetcherResult<PushKoSyncProgressPayload?>> =
+    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<PushKoSyncProgressPayload?> =
         future {
-            asDataFetcherResult {
             KoreaderSyncService.pushProgress(input.chapterId)
 
             val chapter =
@@ -82,7 +82,6 @@ class KoreaderSyncMutation {
                 chapter = chapter,
             )
         }
-        }
 
     data class PullKoSyncProgressInput(
         val clientMutationId: String? = null,
@@ -96,9 +95,8 @@ class KoreaderSyncMutation {
     )
 
     @RequireAuth
-    fun pullKoSyncProgress(input: PullKoSyncProgressInput): CompletableFuture<DataFetcherResult<PullKoSyncProgressPayload?>> =
+    fun pullKoSyncProgress(input: PullKoSyncProgressInput): CompletableFuture<PullKoSyncProgressPayload?> =
         future {
-            asDataFetcherResult {
             val syncResult = KoreaderSyncService.checkAndPullProgress(input.chapterId)
             var syncConflictInfo: SyncConflictInfoType? = null
 
@@ -136,5 +134,4 @@ class KoreaderSyncMutation {
                 syncConflict = syncConflictInfo,
             )
         }
-        }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt

@@ -1,6 +1,7 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
-import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.LikePattern
 import org.jetbrains.exposed.sql.Op
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
@@ -12,7 +13,6 @@ import org.jetbrains.exposed.sql.or
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.MangaMetaType
 import suwayomi.tachidesk.graphql.types.MangaType
@@ -98,11 +98,10 @@ class MangaMutation {
     }
 
     @RequireAuth
-    fun updateManga(input: UpdateMangaInput): CompletableFuture<DataFetcherResult<UpdateMangaPayload?>> {
+    fun updateManga(input: UpdateMangaInput): CompletableFuture<UpdateMangaPayload?> {
         val (clientMutationId, id, patch) = input
 
         return future {
-            asDataFetcherResult {
             updateMangas(listOf(id), patch)
 
             val manga =
@@ -116,14 +115,12 @@ class MangaMutation {
             )
         }
     }
-    }
 
     @RequireAuth
-    fun updateMangas(input: UpdateMangasInput): CompletableFuture<DataFetcherResult<UpdateMangasPayload?>> {
+    fun updateMangas(input: UpdateMangasInput): CompletableFuture<UpdateMangasPayload?> {
         val (clientMutationId, ids, patch) = input
 
         return future {
-            asDataFetcherResult {
             updateMangas(ids, patch)
 
             val mangas =
@@ -137,7 +134,6 @@ class MangaMutation {
             )
         }
     }
-    }
 
     data class FetchMangaInput(
         val clientMutationId: String? = null,
@@ -150,11 +146,10 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun fetchManga(input: FetchMangaInput): CompletableFuture<DataFetcherResult<FetchMangaPayload?>> {
+    fun fetchManga(input: FetchMangaInput): CompletableFuture<FetchMangaPayload?> {
         val (clientMutationId, id) = input
 
         return future {
-            asDataFetcherResult {
             Manga.fetchManga(id)
 
             val manga =
@@ -167,7 +162,6 @@ class MangaMutation {
             )
         }
     }
-    }
 
     data class SetMangaMetaInput(
         val clientMutationId: String? = null,
@@ -180,14 +174,12 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun setMangaMeta(input: SetMangaMetaInput): DataFetcherResult<SetMangaMetaPayload?> {
+    fun setMangaMeta(input: SetMangaMetaInput): SetMangaMetaPayload? {
         val (clientMutationId, meta) = input
 
-        return asDataFetcherResult {
         Manga.modifyMangaMeta(meta.mangaId, meta.key, meta.value)
 
-            SetMangaMetaPayload(clientMutationId, meta)
-        }
+        return SetMangaMetaPayload(clientMutationId, meta)
     }
 
     data class DeleteMangaMetaInput(
@@ -203,10 +195,9 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun deleteMangaMeta(input: DeleteMangaMetaInput): DataFetcherResult<DeleteMangaMetaPayload?> {
+    fun deleteMangaMeta(input: DeleteMangaMetaInput): DeleteMangaMetaPayload? {
         val (clientMutationId, mangaId, key) = input
 
-        return asDataFetcherResult {
         val (meta, manga) =
             transaction {
                 val meta =
@@ -229,8 +220,7 @@ class MangaMutation {
                 } to manga
             }
 
-            DeleteMangaMetaPayload(clientMutationId, meta, manga)
-        }
+        return DeleteMangaMetaPayload(clientMutationId, meta, manga)
     }
 
     data class SetMangaMetasItem(
@@ -250,10 +240,9 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun setMangaMetas(input: SetMangaMetasInput): DataFetcherResult<SetMangaMetasPayload?> {
+    fun setMangaMetas(input: SetMangaMetasInput): SetMangaMetasPayload? {
         val (clientMutationId, items) = input
 
-        return asDataFetcherResult {
         val metaByMangaId =
             items
                 .flatMap { item ->
@@ -285,8 +274,7 @@ class MangaMutation {
                 updatedMetas to mangas
             }
 
-            SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
-        }
+        return SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
     }
 
     data class DeleteMangaMetasItem(
@@ -307,10 +295,9 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun deleteMangaMetas(input: DeleteMangaMetasInput): DataFetcherResult<DeleteMangaMetasPayload?> {
+    fun deleteMangaMetas(input: DeleteMangaMetasInput): DeleteMangaMetasPayload? {
         val (clientMutationId, items) = input
 
-        return asDataFetcherResult {
         items.forEach { item ->
             require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
                 "Either 'keys' or 'prefixes' must be provided for each item"
@@ -363,7 +350,6 @@ class MangaMutation {
                     .distinctBy { it.id }
             }
 
-            DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
-        }
+        return DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.execution.DataFetcherResult
@@ -12,7 +14,6 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.impl.GlobalMeta
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.GlobalMetaType
 import suwayomi.tachidesk.graphql.types.MetaInput
@@ -29,14 +30,12 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun setGlobalMeta(input: SetGlobalMetaInput): DataFetcherResult<SetGlobalMetaPayload?> {
+    fun setGlobalMeta(input: SetGlobalMetaInput): SetGlobalMetaPayload? {
         val (clientMutationId, meta) = input
 
-        return asDataFetcherResult {
         GlobalMeta.modifyMeta(meta.key, meta.value)
 
-            SetGlobalMetaPayload(clientMutationId, meta)
-        }
+        return SetGlobalMetaPayload(clientMutationId, meta)
     }
 
     data class DeleteGlobalMetaInput(
@@ -50,10 +49,9 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun deleteGlobalMeta(input: DeleteGlobalMetaInput): DataFetcherResult<DeleteGlobalMetaPayload?> {
+    fun deleteGlobalMeta(input: DeleteGlobalMetaInput): DeleteGlobalMetaPayload? {
         val (clientMutationId, key) = input
 
-        return asDataFetcherResult {
         val meta =
             transaction {
                 val meta =
@@ -71,8 +69,7 @@ class MetaMutation {
                 }
             }
 
-            DeleteGlobalMetaPayload(clientMutationId, meta)
-        }
+        return DeleteGlobalMetaPayload(clientMutationId, meta)
     }
 
     data class SetGlobalMetasInput(
@@ -86,10 +83,9 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun setGlobalMetas(input: SetGlobalMetasInput): DataFetcherResult<SetGlobalMetasPayload?> {
+    fun setGlobalMetas(input: SetGlobalMetasInput): SetGlobalMetasPayload? {
         val (clientMutationId, metas) = input
 
-        return asDataFetcherResult {
         val metaMap = metas.associate { it.key to it.value }
         GlobalMeta.modifyMetas(metaMap)
 
@@ -101,8 +97,7 @@ class MetaMutation {
                     .map { GlobalMetaType(it) }
             }
 
-            SetGlobalMetasPayload(clientMutationId, updatedMetas)
-        }
+        return SetGlobalMetasPayload(clientMutationId, updatedMetas)
     }
 
     data class DeleteGlobalMetasInput(
@@ -117,10 +112,9 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun deleteGlobalMetas(input: DeleteGlobalMetasInput): DataFetcherResult<DeleteGlobalMetasPayload?> {
+    fun deleteGlobalMetas(input: DeleteGlobalMetasInput): DeleteGlobalMetasPayload? {
         val (clientMutationId, keys, prefixes) = input
 
-        return asDataFetcherResult {
         require(!keys.isNullOrEmpty() || !prefixes.isNullOrEmpty()) {
             "Either 'keys' or 'prefixes' must be provided"
         }
@@ -153,7 +147,6 @@ class MetaMutation {
                 metas
             }
 
-            DeleteGlobalMetasPayload(clientMutationId, metas)
-        }
+        return DeleteGlobalMetasPayload(clientMutationId, metas)
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import com.expediagroup.graphql.generator.annotations.GraphQLIgnore

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import androidx.preference.CheckBoxPreference
@@ -5,7 +7,6 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.SwitchPreferenceCompat
-import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.LikePattern
 import org.jetbrains.exposed.sql.Op
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
@@ -16,7 +17,6 @@ import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.or
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.FilterChange
 import suwayomi.tachidesk.graphql.types.MangaType
@@ -47,14 +47,12 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun setSourceMeta(input: SetSourceMetaInput): DataFetcherResult<SetSourceMetaPayload?> {
+    fun setSourceMeta(input: SetSourceMetaInput): SetSourceMetaPayload? {
         val (clientMutationId, meta) = input
 
-        return asDataFetcherResult {
         Source.modifyMeta(meta.sourceId, meta.key, meta.value)
 
-            SetSourceMetaPayload(clientMutationId, meta)
-        }
+        return SetSourceMetaPayload(clientMutationId, meta)
     }
 
     data class DeleteSourceMetaInput(
@@ -70,10 +68,9 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun deleteSourceMeta(input: DeleteSourceMetaInput): DataFetcherResult<DeleteSourceMetaPayload?> {
+    fun deleteSourceMeta(input: DeleteSourceMetaInput): DeleteSourceMetaPayload? {
         val (clientMutationId, sourceId, key) = input
 
-        return asDataFetcherResult {
         val (meta, source) =
             transaction {
                 val meta =
@@ -100,8 +97,7 @@ class SourceMutation {
                 } to source
             }
 
-            DeleteSourceMetaPayload(clientMutationId, meta, source)
-        }
+        return DeleteSourceMetaPayload(clientMutationId, meta, source)
     }
 
     data class SetSourceMetasItem(
@@ -121,10 +117,9 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun setSourceMetas(input: SetSourceMetasInput): DataFetcherResult<SetSourceMetasPayload?> {
+    fun setSourceMetas(input: SetSourceMetasInput): SetSourceMetasPayload? {
         val (clientMutationId, items) = input
 
-        return asDataFetcherResult {
         val metaBySourceId =
             items
                 .flatMap { item ->
@@ -156,8 +151,7 @@ class SourceMutation {
                 updatedMetas to sources
             }
 
-            SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
-        }
+        return SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
     }
 
     data class DeleteSourceMetasItem(
@@ -178,10 +172,9 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun deleteSourceMetas(input: DeleteSourceMetasInput): DataFetcherResult<DeleteSourceMetasPayload?> {
+    fun deleteSourceMetas(input: DeleteSourceMetasInput): DeleteSourceMetasPayload? {
         val (clientMutationId, items) = input
 
-        return asDataFetcherResult {
         items.forEach { item ->
             require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
                 "Either 'keys' or 'prefixes' must be provided for each item"
@@ -234,8 +227,7 @@ class SourceMutation {
                     .distinctBy { it.id }
             }
 
-            DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
-        }
+        return DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
     }
 
     enum class FetchSourceMangaType {
@@ -260,11 +252,10 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun fetchSourceManga(input: FetchSourceMangaInput): CompletableFuture<DataFetcherResult<FetchSourceMangaPayload?>> {
+    fun fetchSourceManga(input: FetchSourceMangaInput): CompletableFuture<FetchSourceMangaPayload?> {
         val (clientMutationId, sourceId, type, page, query, filters) = input
 
         return future {
-            asDataFetcherResult {
             val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
             val mangasPage =
                 when (type) {
@@ -305,7 +296,6 @@ class SourceMutation {
             )
         }
     }
-    }
 
     data class SourcePreferenceChange(
         val position: Int,
@@ -329,10 +319,9 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun updateSourcePreference(input: UpdateSourcePreferenceInput): DataFetcherResult<UpdateSourcePreferencePayload?> {
+    fun updateSourcePreference(input: UpdateSourcePreferenceInput): UpdateSourcePreferencePayload? {
         val (clientMutationId, sourceId, change) = input
 
-        return asDataFetcherResult {
         Source.setSourcePreference(sourceId, change.position, "") { preference ->
             when (preference) {
                 is SwitchPreferenceCompat -> change.switchState
@@ -344,7 +333,7 @@ class SourceMutation {
             } ?: throw Exception("Expected change to ${preference::class.simpleName}")
         }
 
-            UpdateSourcePreferencePayload(
+        return UpdateSourcePreferencePayload(
             clientMutationId = clientMutationId,
             preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) },
             source =
@@ -353,5 +342,4 @@ class SourceMutation {
                 },
         )
     }
-    }
 }

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
@@ -6,7 +8,6 @@ import graphql.execution.DataFetcherResult
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.TrackRecordType
 import suwayomi.tachidesk.graphql.types.TrackerType
@@ -222,11 +223,10 @@ class TrackMutation {
     )
 
     @RequireAuth
-    fun trackProgress(input: TrackProgressInput): CompletableFuture<DataFetcherResult<TrackProgressPayload?>> {
+    fun trackProgress(input: TrackProgressInput): CompletableFuture<TrackProgressPayload?> {
         val (clientMutationId, mangaId) = input
 
         return future {
-            asDataFetcherResult {
             Track.trackChapter(mangaId)
             val trackRecords =
                 transaction {
@@ -241,7 +241,6 @@ class TrackMutation {
             )
         }
     }
-    }
 
     data class UpdateTrackInput(
         val clientMutationId: String? = null,

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt

@@ -1,9 +1,10 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
-import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.LibraryUpdateStatus
 import suwayomi.tachidesk.graphql.types.UpdateStatus
@@ -28,7 +29,7 @@ class UpdateMutation {
     )
 
     @RequireAuth
-    fun updateLibrary(input: UpdateLibraryInput): CompletableFuture<DataFetcherResult<UpdateLibraryPayload?>> {
+    fun updateLibrary(input: UpdateLibraryInput): CompletableFuture<UpdateLibraryPayload?> {
         updater.addCategoriesToUpdateQueue(
             Category.getCategoryList().filter { input.categories?.contains(it.id) ?: true },
             clear = true,
@@ -36,7 +37,6 @@ class UpdateMutation {
         )
 
         return future {
-            asDataFetcherResult {
             UpdateLibraryPayload(
                 input.clientMutationId,
                 updateStatus =
@@ -48,7 +48,6 @@ class UpdateMutation {
             )
         }
     }
-    }
 
     data class UpdateLibraryMangaInput(
         val clientMutationId: String? = null,
@@ -60,7 +59,7 @@ class UpdateMutation {
     )
 
     @RequireAuth
-    fun updateLibraryManga(input: UpdateLibraryMangaInput): CompletableFuture<DataFetcherResult<UpdateLibraryMangaPayload?>> {
+    fun updateLibraryManga(input: UpdateLibraryMangaInput): CompletableFuture<UpdateLibraryMangaPayload?> {
         updateLibrary(
             UpdateLibraryInput(
                 clientMutationId = input.clientMutationId,
@@ -69,7 +68,6 @@ class UpdateMutation {
         )
 
         return future {
-            asDataFetcherResult {
             UpdateLibraryMangaPayload(
                 input.clientMutationId,
                 updateStatus =
@@ -79,7 +77,6 @@ class UpdateMutation {
             )
         }
     }
-    }
 
     data class UpdateCategoryMangaInput(
         val clientMutationId: String? = null,
@@ -92,7 +89,7 @@ class UpdateMutation {
     )
 
     @RequireAuth
-    fun updateCategoryManga(input: UpdateCategoryMangaInput): CompletableFuture<DataFetcherResult<UpdateCategoryMangaPayload?>> {
+    fun updateCategoryManga(input: UpdateCategoryMangaInput): CompletableFuture<UpdateCategoryMangaPayload?> {
         updateLibrary(
             UpdateLibraryInput(
                 clientMutationId = input.clientMutationId,
@@ -101,7 +98,6 @@ class UpdateMutation {
         )
 
         return future {
-            asDataFetcherResult {
             UpdateCategoryMangaPayload(
                 input.clientMutationId,
                 updateStatus =
@@ -111,7 +107,6 @@ class UpdateMutation {
             )
         }
     }
-    }
 
     data class UpdateStopInput(
         val clientMutationId: String? = null,

server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UserMutation.kt

@@ -1,3 +1,5 @@
+@file:Suppress("RedundantNullableReturnType", "unused")
+
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.schema.DataFetchingEnvironment

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/JavalinGraphQLRequestParser.kt

@@ -11,15 +11,21 @@ import com.expediagroup.graphql.server.execution.GraphQLRequestParser
 import com.expediagroup.graphql.server.types.GraphQLBatchRequest
 import com.expediagroup.graphql.server.types.GraphQLRequest
 import com.expediagroup.graphql.server.types.GraphQLServerRequest
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.http.UploadedFile
+import io.javalin.json.JavalinJackson
+import io.javalin.json.fromJsonStream
 import io.javalin.json.fromJsonString
 import java.io.IOException
 
 class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
+    private val logger = KotlinLogging.logger {}
+
     @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
     override suspend fun parseRequest(context: Context): GraphQLServerRequest? {
         return try {
+            val jsonMapper = context.jsonMapper()
             val contentType = context.contentType()
             val formParam =
                 if (
@@ -29,17 +35,17 @@ class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
                     context.formParam("operations")
                         ?: throw IllegalArgumentException("Cannot find 'operations' body")
                 } else {
-                    return context.bodyAsClass(GraphQLServerRequest::class.java)
+                    return context.bodyInputStream().use { jsonMapper.fromJsonStream<GraphQLServerRequest>(it) }
                 }
 
             val request =
-                context.jsonMapper().fromJsonString<GraphQLServerRequest>(formParam)
+                jsonMapper.fromJsonString<GraphQLServerRequest>(formParam)
 
             val map =
                 context
                     .formParam("map")
                     ?.let {
-                        context.jsonMapper().fromJsonString<Map<String, List<String>>>(it)
+                        jsonMapper.fromJsonString<Map<String, List<String>>>(it)
                     }.orEmpty()
 
             val mapItems =
@@ -73,7 +79,8 @@ class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
                     )
                 }
             }
-        } catch (_: IOException) {
+        } catch (e: IOException) {
+            logger.error(e) { "Error when parsing request" }
             null
         }
     }

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt

@@ -10,7 +10,6 @@ package suwayomi.tachidesk.graphql.server
 import com.expediagroup.graphql.generator.execution.FlowSubscriptionExecutionStrategy
 import com.expediagroup.graphql.server.execution.GraphQLRequestHandler
 import com.expediagroup.graphql.server.execution.GraphQLServer
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import graphql.ExceptionWhileDataFetching
 import graphql.GraphQL
 import graphql.execution.AsyncExecutionStrategy
@@ -27,6 +26,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import suwayomi.tachidesk.graphql.server.subscriptions.ApolloSubscriptionProtocolHandler
 import suwayomi.tachidesk.server.JavalinSetup.future
+import tools.jackson.module.kotlin.jacksonObjectMapper
 
 class TachideskGraphQLServer(
     requestParser: JavalinGraphQLRequestParser,

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/Cursor.kt

@@ -58,7 +58,7 @@ private class GraphqlCursorCoercing : Coercing<Cursor, String> {
                 ),
             )
         }
-        return Cursor(input.value)
+        return Cursor(input.value!!)
     }
 
     private fun valueToLiteralImpl(input: Any): StringValue = StringValue.newStringValue(input.toString()).build()

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/DurationAsString.kt

@@ -71,7 +71,7 @@ private class GraphqlDurationAsStringCoercing : Coercing<Duration, String> {
             )
         }
         return try {
-            Duration.parse(input.value)
+            Duration.parse(input.value!!)
         } catch (e: IllegalArgumentException) {
             throw CoercingParseLiteralException(
                 "Invalid duration format: ${input.value}. Expected ISO-8601 duration string (e.g., 'PT30M', 'P1D')",

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/LongAsString.kt

@@ -53,7 +53,7 @@ private class GraphqlLongAsStringCoercing : Coercing<Long, String> {
                 ),
             )
         }
-        return input.value.toLong()
+        return input.value!!.toLong()
     }
 
     private fun valueToLiteralImpl(input: Any): StringValue = StringValue.newStringValue(input.toString()).build()

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt

@@ -9,9 +9,6 @@ package suwayomi.tachidesk.graphql.server.subscriptions
 
 import com.expediagroup.graphql.server.execution.GraphQLRequestHandler
 import com.expediagroup.graphql.server.types.GraphQLRequest
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.convertValue
-import com.fasterxml.jackson.module.kotlin.readValue
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Header
 import io.javalin.websocket.WsContext
@@ -26,7 +23,7 @@ import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.job
 import kotlinx.coroutines.runBlocking
-import org.eclipse.jetty.websocket.api.CloseStatus
+import org.eclipse.jetty.websocket.core.CloseStatus
 import suwayomi.tachidesk.graphql.server.TachideskGraphQLContextFactory
 import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_CONNECTION_INIT
 import suwayomi.tachidesk.graphql.server.subscriptions.SubscriptionOperationMessage.ClientMessages.GQL_SUBSCRIBE
@@ -41,6 +38,9 @@ import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.getAttributeOrSet
 import suwayomi.tachidesk.server.user.UserType
 import suwayomi.tachidesk.server.user.getUserFromToken
+import tools.jackson.databind.ObjectMapper
+import tools.jackson.module.kotlin.convertValue
+import tools.jackson.module.kotlin.readValue
 
 /**
  * Implementation of the `graphql-transport-ws` protocol defined by Denis Badurina

server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionSessionState.kt

@@ -13,7 +13,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.onCompletion
-import org.eclipse.jetty.websocket.api.CloseStatus
+import org.eclipse.jetty.websocket.core.CloseStatus
 import suwayomi.tachidesk.graphql.server.toGraphQLContext
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/Extension.kt

@@ -14,6 +14,8 @@ import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
 import io.github.oshai.kotlinlogging.KotlinLogging
+import net.dongliu.apk.parser.ApkFile
+import net.dongliu.apk.parser.bean.Icon
 import okhttp3.CacheControl
 import okio.buffer
 import okio.sink
@@ -37,7 +39,9 @@ import suwayomi.tachidesk.manga.impl.util.PackageTools.getPackageInfo
 import suwayomi.tachidesk.manga.impl.util.PackageTools.loadExtensionSources
 import suwayomi.tachidesk.manga.impl.util.network.await
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
+import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.clearCachedImage
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.getImageResponse
+import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.saveImage
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.ApplicationDirs
@@ -115,7 +119,6 @@ object Extension {
 
         val dirPathWithoutType = "${applicationDirs.extensionsRoot}/$fileNameWithoutType"
         val jarFilePath = "$dirPathWithoutType.jar"
-        val dexFilePath = "$dirPathWithoutType.dex"
 
         val packageInfo = getPackageInfo(apkFilePath)
         val pkgName = packageInfo.packageName
@@ -155,11 +158,12 @@ object Extension {
 
             dex2jar(apkFilePath, jarFilePath, fileNameWithoutType)
             extractAssetsFromApk(apkFilePath, jarFilePath)
+            extractAndCacheApkIcon(apkFilePath, apkName)
 
             // clean up
             File(apkFilePath).delete()
-            File(dexFilePath).delete()
 
+            try {
                 // collect sources from the extension
                 val extensionMainClassInstance = loadExtensionSources(jarFilePath, className)
                 val sources: List<CatalogueSource> =
@@ -223,11 +227,46 @@ object Extension {
                     }
                 }
                 return 201 // we installed successfully
+            } catch (e: Throwable) {
+                // free up the file descriptor if exists
+                PackageTools.jarLoaderMap.remove(jarFilePath)?.close()
+                File(jarFilePath).delete()
+
+                uninstallExtension(pkgName)
+                throw e
+            }
         } else {
             return 302 // extension was already installed
         }
     }
 
+    private fun extractAndCacheApkIcon(
+        apkFilePath: String,
+        apkName: String,
+    ) {
+        val iconCacheDir = "${applicationDirs.extensionsRoot}/icon"
+        try {
+            val iconData =
+                ApkFile(File(apkFilePath)).use { apk ->
+                    apk.allIcons
+                        .filterIsInstance<Icon>()
+                        .mapNotNull { it.data?.let { data -> data to it.density } }
+                        .maxByOrNull { (_, density) -> density }
+                        ?.first
+                }
+            if (iconData == null) {
+                logger.warn { "No icon found in APK $apkName" }
+                return
+            }
+
+            File(iconCacheDir).mkdirs()
+            clearCachedImage(iconCacheDir, apkName)
+            saveImage("$iconCacheDir/$apkName", iconData.inputStream(), null)
+        } catch (e: Exception) {
+            logger.warn(e) { "Failed to extract icon from APK $apkName" }
+        }
+    }
+
     private fun extractAssetsFromApk(
         apkPath: String,
         jarPath: String,

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/storage/ImageUtil.kt

@@ -71,6 +71,9 @@ object ImageUtil {
             if (bytes.compareWith(charByteArrayOf(0xFF, 0x0A))) {
                 return JXL
             }
+            if (bytes.compareWith(charByteArrayOf(0x00, 0x00, 0x00, 0x0C, 0x4A, 0x58, 0x4C, 0x20, 0x0D, 0x0A, 0x87, 0x0A))) {
+                return JXL
+            }
         } catch (_: Exception) {
         }
         return null

server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt

@@ -13,12 +13,14 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.Javalin
 import io.javalin.apibuilder.ApiBuilder.after
 import io.javalin.apibuilder.ApiBuilder.path
+import io.javalin.config.RoutesConfig
 import io.javalin.http.Context
 import io.javalin.http.HandlerType
 import io.javalin.http.HttpStatus
 import io.javalin.http.NotFoundResponse
 import io.javalin.http.RedirectResponse
 import io.javalin.http.UnauthorizedResponse
+import io.javalin.json.JavalinJackson3
 import io.javalin.rendering.template.JavalinJte
 import io.javalin.websocket.WsContext
 import kotlinx.coroutines.CoroutineScope
@@ -47,6 +49,7 @@ import java.net.URLEncoder
 import java.util.Locale
 import java.util.concurrent.CompletableFuture
 import kotlin.concurrent.thread
+import kotlin.text.get
 import kotlin.time.Duration.Companion.days
 
 object JavalinSetup {
@@ -58,10 +61,12 @@ object JavalinSetup {
 
     fun javalinSetup() {
         val app =
-            Javalin.create { config ->
+            Javalin.start { config ->
                 val templateEngine = TemplateEngine.createPrecompiled(ContentType.Html)
                 config.fileRenderer(JavalinJte(templateEngine))
 
+                config.jsonMapper(JavalinJackson3())
+
                 WebInterfaceManager.setup(config)
 
                 // config.registerPlugin(OpenApiPlugin(getOpenApiOptions()))
@@ -104,7 +109,8 @@ object JavalinSetup {
                     }
                 }
 
-                config.router.apiBuilder {
+                config.routes.defineCore()
+                config.routes.apiBuilder {
                     path(ServerSubpath.maybeAddAsPrefix("api/")) {
                         path("v1/") {
                             GlobalAPI.defineEndpoints()
@@ -117,17 +123,32 @@ object JavalinSetup {
                         after { ctx ->
                             // If not matched, the request was for an invalid endpoint
                             // Return a 404 instead of redirecting to the UI for usability
-                            if (ctx.endpointHandlerPath() == "*") {
+                            if (ctx.endpoints().lastHttpEndpoint()?.path == "*") {
                                 throw NotFoundResponse()
                             }
                         }
                     }
                 }
+
+                config.events.serverStarted {
+                    if (serverConfig.initialOpenInBrowserEnabled.value) {
+                        Browser.openInBrowser()
+                    }
+                }
             }
 
+        // when JVM is prompted to shutdown, stop javalin gracefully
+        Runtime.getRuntime().addShutdownHook(
+            thread(start = false) {
+                app.stop()
+            },
+        )
+    }
+
+    fun RoutesConfig.defineCore() {
         val loginPath = ServerSubpath.maybeAddAsPrefix("/login.html")
 
-        app.get(loginPath) { ctx ->
+        get(loginPath) { ctx ->
             val locale: Locale = LocalizationHelper.ctxToLocale(ctx)
             ctx.header("content-type", "text/html")
             val httpCacheSeconds = 1.days.inWholeSeconds
@@ -141,7 +162,7 @@ object JavalinSetup {
             )
         }
 
-        app.post(loginPath) { ctx ->
+        post(loginPath) { ctx ->
             val username = ctx.formParam("user")
             val password = ctx.formParam("pass")
             val isValid =
@@ -174,7 +195,7 @@ object JavalinSetup {
             )
         }
 
-        app.beforeMatched { ctx ->
+        beforeMatched { ctx ->
             val isWebManifest =
                 listOf("site.webmanifest", "manifest.json", "login.html").any { ctx.path().endsWith(it) }
             val isPageIcon =
@@ -219,60 +240,43 @@ object JavalinSetup {
             ctx.setAttribute(Attribute.TachideskBasic, credentialsValid())
         }
 
-        app.events { event ->
-            event.serverStarted {
-                if (serverConfig.initialOpenInBrowserEnabled.value) {
-                    Browser.openInBrowser()
-                }
-            }
-        }
-
-        app.wsBefore {
+        wsBefore {
             it.onConnect { ctx ->
                 ctx.setAttribute(Attribute.TachideskUser, getUserFromWsContext(ctx))
             }
         }
 
-        // when JVM is prompted to shutdown, stop javalin gracefully
-        Runtime.getRuntime().addShutdownHook(
-            thread(start = false) {
-                app.stop()
-            },
-        )
-
-        app.exception(NullPointerException::class.java) { e, ctx ->
+        exception(NullPointerException::class.java) { e, ctx ->
             logger.error(e) { "NullPointerException while handling the request" }
             ctx.status(404)
         }
-        app.exception(NoSuchElementException::class.java) { e, ctx ->
+        exception(NoSuchElementException::class.java) { e, ctx ->
             logger.error(e) { "NoSuchElementException while handling the request" }
             ctx.status(404)
         }
-        app.exception(IOException::class.java) { e, ctx ->
+        exception(IOException::class.java) { e, ctx ->
             logger.error(e) { "IOException while handling the request" }
             ctx.status(500)
             ctx.result(e.message ?: "Internal Server Error")
         }
 
-        app.exception(IllegalArgumentException::class.java) { e, ctx ->
+        exception(IllegalArgumentException::class.java) { e, ctx ->
             logger.error(e) { "IllegalArgumentException while handling the request" }
             ctx.status(400)
             ctx.result(e.message ?: "Bad Request")
         }
 
-        app.exception(UnauthorizedException::class.java) { e, ctx ->
+        exception(UnauthorizedException::class.java) { e, ctx ->
             logger.error(e) { "UnauthorizedException while handling the request" }
             ctx.status(HttpStatus.UNAUTHORIZED)
             ctx.result(e.message ?: "Unauthorized")
         }
 
-        app.exception(ForbiddenException::class.java) { e, ctx ->
+        exception(ForbiddenException::class.java) { e, ctx ->
             logger.error(e) { "ForbiddenException while handling the request" }
             ctx.status(HttpStatus.FORBIDDEN)
             ctx.result(e.message ?: "Forbidden")
         }
-
-        app.start()
     }
 
     // private fun getOpenApiOptions(): OpenApiOptions {

server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt

@@ -71,15 +71,14 @@ fun <T> getParam(
                     is Param.FormParam -> ctx.formParamAsClass(param.key, clazz)
                     is Param.PathParam -> ctx.pathParamAsClass(param.key, clazz)
                     is Param.QueryParam -> ctx.queryParamAsClass(param.key, clazz)
-                    else -> throw IllegalStateException("Invalid param")
                 }.let {
                     if (param.nullable) {
-                        it.allowNullable().get() ?: param.defaultValue
+                        it.getOrNull() ?: param.defaultValue
                     } else {
                         if (param.defaultValue != null) {
                             it.getOrDefault(param.defaultValue!!)
                         } else {
-                            it.get()
+                            it.required().get()
                         }
                     }
                 }

server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt

@@ -17,6 +17,7 @@ import io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.reactivecircus.cache4k.Cache
 import io.javalin.config.JavalinConfig
+import io.javalin.http.staticfiles.AliasCheck
 import io.javalin.http.staticfiles.Location
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
@@ -39,7 +40,6 @@ import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
 import net.lingala.zip4j.ZipFile
-import org.eclipse.jetty.server.handler.ContextHandler
 import suwayomi.tachidesk.graphql.types.AboutWebUI
 import suwayomi.tachidesk.graphql.types.UpdateState
 import suwayomi.tachidesk.graphql.types.UpdateState.DOWNLOADING
@@ -180,7 +180,7 @@ object WebInterfaceManager {
             // Use canonical path to avoid Jetty alias issues
             staticFiles.directory = File(applicationDirs.webUIServe).canonicalPath
             staticFiles.location = Location.EXTERNAL
-            staticFiles.aliasCheck = ContextHandler.ApproveAliases()
+            staticFiles.aliasCheck = AliasCheck { _, _ -> true }
         }
 
         serveWebUI = {
@@ -206,20 +206,12 @@ object WebInterfaceManager {
 
         if (ServerSubpath.isDefined() && orgIndexHtml.exists()) {
             val originalIndexHtml = orgIndexHtml.readText()
-            val subpathInjectionScript =
-                """
-                <script>
-                    // <<suwayomi-subpath-injection>>
-                    const baseTag = document.createElement('base');
-                    baseTag.href = location.origin + "${ServerSubpath.asRootPath()}";
-                    document.head.appendChild(baseTag);
-                </script>
-                """.trimIndent()
+            val subpathInjectionBaseTag = "<base href=\"${ServerSubpath.asRootPath()}\">"
 
             val indexHtmlWithSubpathInjection =
                 originalIndexHtml.replace(
                     "<head>",
-                    "<head>$subpathInjectionScript",
+                    "<head>$subpathInjectionBaseTag",
                 )
 
             orgIndexHtml.writeText(indexHtmlWithSubpathInjection)
@@ -312,11 +304,25 @@ object WebInterfaceManager {
             return
         }
 
-        val flavor = WebUIFlavor.current
         val servedFlavor = getServedWebUIFlavor()
 
         val log =
-            KotlinLogging.logger("${logger.name} setupWebUI(flavor= ${flavor.uiName}, servedFlavor= ${servedFlavor.uiName})")
+            KotlinLogging.logger(
+                "${logger.name} setupWebUI(flavor= ${WebUIFlavor.current.uiName}, servedFlavor= ${servedFlavor.uiName}, channel= ${serverConfig.webUIChannel})",
+            )
+
+        val flavor =
+            if (serverConfig.webUIChannel.value == WebUIChannel.BUNDLED) {
+                if (serverConfig.webUIFlavor.value != WebUIFlavor.default) {
+                    log.warn {
+                        "Changed flavor to ${WebUIFlavor.default.uiName}. Channel \"${WebUIChannel.BUNDLED}\" only works with the default flavor"
+                    }
+                }
+
+                WebUIFlavor.default
+            } else {
+                WebUIFlavor.current
+            }
 
         if (doesLocalWebUIExist(applicationDirs.webUIRoot)) {
             val currentVersion = getLocalVersion()