Remove asDataFetcherResult

Fixes
Update to the v10 alpha due to nullability issues in v9
2026-07-15 00:34:12 -05:00 · 2026-05-10 12:32:24 -04:00 · 2026-05-09 15:41:21 -04:00 · 2026-05-09 15:29:34 -04:00 · 2026-05-09 18:54:15 +00:00 · 2026-05-09 14:52:00 -04:00
46 changed files with 1381 additions and 1455 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.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

--- a/.github/workflows/build_push.yml
+++ b/.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"
--- a/.github/workflows/publish.yml
+++ b/.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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

 ## [Unreleased] (Preview)

+### Added
+- .
+
+### Changed
+- .
+
+### Fixed
+- (WebUI) Handle serving non-default webui with "bundled"
+
+## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08
+
+### Major Changes
+
+#### Added UI Login Auth Method!
+We now have another alternative login type! This is our most flexable option as it allows clients and the server to handle it together, it's not an all or nothing authentication method like the others. For example the web-based clients can now use thier own login pages, and the server can add data to the tokens it gives to the clients, improving performance while keeping the security standard high.
+
+#### PostgreSQL Support!
+We finally support alternative database types! H2 is a great database, but it has its issues. Using a more widespread database like PostgreSQL can avoid them while keeping the performance high! Note that PostgreSQL will need to be run externally. See our example [docker-compose.yml](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/ffc7f6990e889d0a257efe3d94db085d5e73f420/docker-compose-postgresql.yml)
+
+#### Remote Image Modification/Conversion
+We now support remote image modification! This will allow you to use an external server that can change your images however you want, such as converting to JXL or WebP, or applying some upscaling or sharpening to them! This pairs well with our new option to convert images before it serves them to the client.
+See our [conversion server](https://github.com/Suwayomi/Suwayomi-converter) for an example.
+
 ### Added
 - (**Source/API**) Expose "baseUrl" (TYPE "SourceType")
 - (**Extension**) Support author notes
@@ -65,6 +88,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - (**Library update**) Fix stale manga data in update subscription status events
 - (**Cloudflare/flaresolverr**) Fix sending POST requests as GET to flaresolverr

+### WebUI
+- [See WebUI changes here][WebUI: v20260508.01]
+
+### Contributors
+@cpiber, @Syer10, @lamaxama, @schroda, @AwkwardPeak7, @ItsGlassPlus1, @manti-X, @Youwes09, @renovate[bot], @D-Brox, @weblate, @Micka149, @TheRay82, @UnknownSkyrimPasserby, @KaceyKoo-gif, @333fred, @KolbyML, @Robonau, @ornaras, @SpicyCatGames, @FadedSociety, @ginocic, @zeedif, @CzechuPL, @mrintrepide, @renjfk, @thiagoalcr, @Smileskun, @dejavui, @allrobot
+
 ## [v2.1.1867] + [WebUI: v20250703.01] - 2025-07-31

 ### Webview!
@@ -166,7 +195,7 @@ This release has been working on the long awaited tracking support! With the las

@schroda, @Syer10, @RatCornu, @FumoVite

-## [v1.0.0] + [WebUI: r1409] - 2024-02-23
+## [v1.0.0] + [WebUI: v1.0.0] - 2024-02-23

 We've done a lot since our last release over a year ago.

@@ -379,6 +408,7 @@ Huge thanks to @martinek who pulled the most of the weight this release!

 <!-- WEBUI LINKS -->

+[WebUI: v20260508.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2026050801-r3136---2026-05-08
 [WebUI: v20251230.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2025123001-r2937---2025-12-30
 [WebUI: v20250801.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2025080101-r2717---2025-08-01
 [WebUI: v20250731.01]: https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md#2025073101-r2715---2025-07-31
@@ -404,7 +434,8 @@ Huge thanks to @martinek who pulled the most of the weight this release!

 <!-- SERVER LINKS -->

-[unreleased]: https://github.com/suwayomi/suwayomi-server/compare/v2.1.1867...HEAD
+[unreleased]: https://github.com/suwayomi/suwayomi-server/compare/v2.2.2100...HEAD
+[v2.2.2100]: https://github.com/suwayomi/suwayomi-server/compare/v2.1.1867...v2.2.2100
 [v2.1.1867]: https://github.com/suwayomi/suwayomi-server/compare/v2.0.1727...v2.1.1867
 [v2.0.1727]: https://github.com/suwayomi/suwayomi-server/compare/v1.1.1...v2.0.1727
 [v1.1.1]: https://github.com/suwayomi/suwayomi-server/compare/v1.1.0...v1.1.1
--- a/README.md
+++ b/README.md
@@ -76,9 +76,9 @@ These clients are built-in options, and the server can keep them automatically u
 - [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 abondend)
+##### 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), requires access to a running server
+- [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
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -53,7 +53,7 @@ subprojects {
            }
            compilerOptions {
                jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-                freeCompilerArgs.add("-Xcontext-receivers")
+                freeCompilerArgs.add("-Xcontext-parameters")
            }
        }
    }
--- a/buildSrc/src/main/kotlin/Constants.kt
+++ b/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 {
--- a/gradle/libs.versions.toml
+++ b/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" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
--- a/2
+++ b/2
@@ -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/.
--- a/gradlew.bat
+++ b/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%
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
+++ b/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(
--- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/WebView.kt
+++ b/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>() {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/AsDataFetcherResult.kt
+++ b/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()
-}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/cache/CustomCacheMap.kt
+++ b/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
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ChapterDataLoader.kt
+++ b/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)
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionDataLoader.kt
+++ b/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 {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MangaDataLoader.kt
+++ b/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(),
        )
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/MetaDataLoader.kt
+++ b/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)
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/SourceDataLoader.kt
+++ b/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 {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/BackupMutation.kt
+++ b/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
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/CategoryMutation.kt
+++ b/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,14 +43,13 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun setCategoryMeta(input: SetCategoryMetaInput): DataFetcherResult<SetCategoryMetaPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, meta) = input
+    fun setCategoryMeta(input: SetCategoryMetaInput): SetCategoryMetaPayload? {
+        val (clientMutationId, meta) = input

-            Category.modifyMeta(meta.categoryId, meta.key, meta.value)
+        Category.modifyMeta(meta.categoryId, meta.key, meta.value)

-            SetCategoryMetaPayload(clientMutationId, meta)
-        }
+        return SetCategoryMetaPayload(clientMutationId, meta)
+    }

    data class DeleteCategoryMetaInput(
        val clientMutationId: String? = null,
@@ -64,34 +64,33 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DataFetcherResult<DeleteCategoryMetaPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, categoryId, key) = input
+    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DeleteCategoryMetaPayload? {
+        val (clientMutationId, categoryId, key) = input

-            val (meta, category) =
-                transaction {
-                    val meta =
-                        CategoryMetaTable
-                            .selectAll()
-                            .where { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
-                            .firstOrNull()
+        val (meta, category) =
+            transaction {
+                val meta =
+                    CategoryMetaTable
+                        .selectAll()
+                        .where { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
+                        .firstOrNull()

-                    CategoryMetaTable.deleteWhere { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
+                CategoryMetaTable.deleteWhere { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }

-                    val category =
-                        transaction {
-                            CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq categoryId }.first())
-                        }
+                val category =
+                    transaction {
+                        CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq categoryId }.first())
+                    }

-                    if (meta != null) {
-                        CategoryMetaType(meta)
-                    } else {
-                        null
-                    } to category
-                }
+                if (meta != null) {
+                    CategoryMetaType(meta)
+                } else {
+                    null
+                } to category
+            }

-            DeleteCategoryMetaPayload(clientMutationId, meta, category)
-        }
+        return DeleteCategoryMetaPayload(clientMutationId, meta, category)
+    }

    data class SetCategoryMetasItem(
        val categoryIds: List<Int>,
@@ -110,43 +109,42 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun setCategoryMetas(input: SetCategoryMetasInput): DataFetcherResult<SetCategoryMetasPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, items) = input
+    fun setCategoryMetas(input: SetCategoryMetasInput): SetCategoryMetasPayload? {
+        val (clientMutationId, items) = input

-            val metaByCategoryId =
-                items
-                    .flatMap { item ->
-                        val metaMap = item.metas.associate { it.key to it.value }
-                        item.categoryIds.map { categoryId -> categoryId to metaMap }
-                    }.groupBy({ it.first }, { it.second })
-                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+        val metaByCategoryId =
+            items
+                .flatMap { item ->
+                    val metaMap = item.metas.associate { it.key to it.value }
+                    item.categoryIds.map { categoryId -> categoryId to metaMap }
+                }.groupBy({ it.first }, { it.second })
+                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }

-            Category.modifyCategoriesMetas(metaByCategoryId)
+        Category.modifyCategoriesMetas(metaByCategoryId)

-            val allCategoryIds = metaByCategoryId.keys
-            val allMetaKeys = metaByCategoryId.values.flatMap { item -> item.keys }.distinct()
+        val allCategoryIds = metaByCategoryId.keys
+        val allMetaKeys = metaByCategoryId.values.flatMap { item -> item.keys }.distinct()

-            val (updatedMetas, categories) =
-                transaction {
-                    val updatedMetas =
-                        CategoryMetaTable
-                            .selectAll()
-                            .where { (CategoryMetaTable.ref inList allCategoryIds) and (CategoryMetaTable.key inList allMetaKeys) }
-                            .map { CategoryMetaType(it) }
+        val (updatedMetas, categories) =
+            transaction {
+                val updatedMetas =
+                    CategoryMetaTable
+                        .selectAll()
+                        .where { (CategoryMetaTable.ref inList allCategoryIds) and (CategoryMetaTable.key inList allMetaKeys) }
+                        .map { CategoryMetaType(it) }

-                    val categories =
-                        CategoryTable
-                            .selectAll()
-                            .where { CategoryTable.id inList allCategoryIds }
-                            .map { CategoryType(it) }
-                            .distinctBy { it.id }
+                val categories =
+                    CategoryTable
+                        .selectAll()
+                        .where { CategoryTable.id inList allCategoryIds }
+                        .map { CategoryType(it) }
+                        .distinctBy { it.id }

-                    updatedMetas to categories
-                }
+                updatedMetas to categories
+            }

-            SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
-        }
+        return SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
+    }

    data class DeleteCategoryMetasItem(
        val categoryIds: List<Int>,
@@ -166,64 +164,63 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DataFetcherResult<DeleteCategoryMetasPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, items) = input
+    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DeleteCategoryMetasPayload? {
+        val (clientMutationId, items) = input

-            items.forEach { item ->
-                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
-                    "Either 'keys' or 'prefixes' must be provided for each item"
+        items.forEach { item ->
+            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                "Either 'keys' or 'prefixes' must be provided for each item"
+            }
+        }
+
+        val (allDeletedMetas, allCategoryIds) =
+            transaction {
+                val deletedMetas = mutableListOf<CategoryMetaType>()
+                val categoryIds = mutableSetOf<Int>()
+
+                items.forEach { item ->
+                    val keyCondition: Op<Boolean>? =
+                        item.keys?.takeIf { it.isNotEmpty() }?.let { CategoryMetaTable.key inList it }
+
+                    val prefixCondition: Op<Boolean>? =
+                        item.prefixes
+                            ?.filter { it.isNotEmpty() }
+                            ?.map { (CategoryMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                            ?.reduceOrNull { acc, op -> acc or op }
+
+                    val metaKeyCondition =
+                        if (keyCondition != null && prefixCondition != null) {
+                            keyCondition or prefixCondition
+                        } else {
+                            keyCondition ?: prefixCondition!!
+                        }
+
+                    val condition = (CategoryMetaTable.ref inList item.categoryIds) and metaKeyCondition
+
+                    deletedMetas +=
+                        CategoryMetaTable
+                            .selectAll()
+                            .where { condition }
+                            .map { CategoryMetaType(it) }
+
+                    CategoryMetaTable.deleteWhere { condition }
+                    categoryIds += item.categoryIds
                }
+
+                deletedMetas to categoryIds
            }

-            val (allDeletedMetas, allCategoryIds) =
-                transaction {
-                    val deletedMetas = mutableListOf<CategoryMetaType>()
-                    val categoryIds = mutableSetOf<Int>()
+        val categories =
+            transaction {
+                CategoryTable
+                    .selectAll()
+                    .where { CategoryTable.id inList allCategoryIds }
+                    .map { CategoryType(it) }
+                    .distinctBy { it.id }
+            }

-                    items.forEach { item ->
-                        val keyCondition: Op<Boolean>? =
-                            item.keys?.takeIf { it.isNotEmpty() }?.let { CategoryMetaTable.key inList it }
-
-                        val prefixCondition: Op<Boolean>? =
-                            item.prefixes
-                                ?.filter { it.isNotEmpty() }
-                                ?.map { (CategoryMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                                ?.reduceOrNull { acc, op -> acc or op }
-
-                        val metaKeyCondition =
-                            if (keyCondition != null && prefixCondition != null) {
-                                keyCondition or prefixCondition
-                            } else {
-                                keyCondition ?: prefixCondition!!
-                            }
-
-                        val condition = (CategoryMetaTable.ref inList item.categoryIds) and metaKeyCondition
-
-                        deletedMetas +=
-                            CategoryMetaTable
-                                .selectAll()
-                                .where { condition }
-                                .map { CategoryMetaType(it) }
-
-                        CategoryMetaTable.deleteWhere { condition }
-                        categoryIds += item.categoryIds
-                    }
-
-                    deletedMetas to categoryIds
-                }
-
-            val categories =
-                transaction {
-                    CategoryTable
-                        .selectAll()
-                        .where { CategoryTable.id inList allCategoryIds }
-                        .map { CategoryType(it) }
-                        .distinctBy { it.id }
-                }
-
-            DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
-        }
+        return DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
+    }

    data class UpdateCategoryPatch(
        val name: String? = null,
@@ -291,40 +288,38 @@ class CategoryMutation {
    }

    @RequireAuth
-    fun updateCategory(input: UpdateCategoryInput): DataFetcherResult<UpdateCategoryPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, id, patch) = input
+    fun updateCategory(input: UpdateCategoryInput): UpdateCategoryPayload? {
+        val (clientMutationId, id, patch) = input

-            updateCategories(listOf(id), patch)
+        updateCategories(listOf(id), patch)

-            val category =
-                transaction {
-                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
-                }
+        val category =
+            transaction {
+                CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
+            }

-            UpdateCategoryPayload(
-                clientMutationId = clientMutationId,
-                category = category,
-            )
-        }
+        return UpdateCategoryPayload(
+            clientMutationId = clientMutationId,
+            category = category,
+        )
+    }

    @RequireAuth
-    fun updateCategories(input: UpdateCategoriesInput): DataFetcherResult<UpdateCategoriesPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, ids, patch) = input
+    fun updateCategories(input: UpdateCategoriesInput): UpdateCategoriesPayload? {
+        val (clientMutationId, ids, patch) = input

-            updateCategories(ids, patch)
+        updateCategories(ids, patch)

-            val categories =
-                transaction {
-                    CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
-                }
+        val categories =
+            transaction {
+                CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
+            }

-            UpdateCategoriesPayload(
-                clientMutationId = clientMutationId,
-                categories = categories,
-            )
-        }
+        return UpdateCategoriesPayload(
+            clientMutationId = clientMutationId,
+            categories = categories,
+        )
+    }

    data class UpdateCategoryOrderPayload(
        val clientMutationId: String?,
@@ -338,50 +333,49 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun updateCategoryOrder(input: UpdateCategoryOrderInput): DataFetcherResult<UpdateCategoryOrderPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, categoryId, position) = input
-            require(position > 0) {
-                "'order' must not be <= 0"
-            }
-
-            transaction {
-                val currentOrder =
-                    CategoryTable
-                        .selectAll()
-                        .where { CategoryTable.id eq categoryId }
-                        .first()[CategoryTable.order]
-
-                if (currentOrder != position) {
-                    if (position < currentOrder) {
-                        CategoryTable.update({ CategoryTable.order greaterEq position }) {
-                            it[CategoryTable.order] = CategoryTable.order + 1
-                        }
-                    } else {
-                        CategoryTable.update({ CategoryTable.order lessEq position }) {
-                            it[CategoryTable.order] = CategoryTable.order - 1
-                        }
-                    }
-
-                    CategoryTable.update({ CategoryTable.id eq categoryId }) {
-                        it[CategoryTable.order] = position
-                    }
-                }
-            }
-
-            Category.normalizeCategories()
-
-            val categories =
-                transaction {
-                    CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
-                }
-
-            UpdateCategoryOrderPayload(
-                clientMutationId = clientMutationId,
-                categories = categories,
-            )
+    fun updateCategoryOrder(input: UpdateCategoryOrderInput): UpdateCategoryOrderPayload? {
+        val (clientMutationId, categoryId, position) = input
+        require(position > 0) {
+            "'order' must not be <= 0"
        }

+        transaction {
+            val currentOrder =
+                CategoryTable
+                    .selectAll()
+                    .where { CategoryTable.id eq categoryId }
+                    .first()[CategoryTable.order]
+
+            if (currentOrder != position) {
+                if (position < currentOrder) {
+                    CategoryTable.update({ CategoryTable.order greaterEq position }) {
+                        it[CategoryTable.order] = CategoryTable.order + 1
+                    }
+                } else {
+                    CategoryTable.update({ CategoryTable.order lessEq position }) {
+                        it[CategoryTable.order] = CategoryTable.order - 1
+                    }
+                }
+
+                CategoryTable.update({ CategoryTable.id eq categoryId }) {
+                    it[CategoryTable.order] = position
+                }
+            }
+        }
+
+        Category.normalizeCategories()
+
+        val categories =
+            transaction {
+                CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
+            }
+
+        return UpdateCategoryOrderPayload(
+            clientMutationId = clientMutationId,
+            categories = categories,
+        )
+    }
+
    data class CreateCategoryInput(
        val clientMutationId: String? = null,
        val name: String,
@@ -397,53 +391,52 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun createCategory(input: CreateCategoryInput): DataFetcherResult<CreateCategoryPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
-            transaction {
-                require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
-                    "'name' must be unique"
-                }
+    fun createCategory(input: CreateCategoryInput): CreateCategoryPayload? {
+        val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
+        transaction {
+            require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
+                "'name' must be unique"
            }
-            require(!name.equals(Category.DEFAULT_CATEGORY_NAME, ignoreCase = true)) {
-                "'name' must not be ${Category.DEFAULT_CATEGORY_NAME}"
-            }
-            if (order != null) {
-                require(order > 0) {
-                    "'order' must not be <= 0"
-                }
+        }
+        require(!name.equals(Category.DEFAULT_CATEGORY_NAME, ignoreCase = true)) {
+            "'name' must not be ${Category.DEFAULT_CATEGORY_NAME}"
+        }
+        if (order != null) {
+            require(order > 0) {
+                "'order' must not be <= 0"
            }
+        }

-            val category =
-                transaction {
-                    if (order != null) {
-                        CategoryTable.update({ CategoryTable.order greaterEq order }) {
-                            it[CategoryTable.order] = CategoryTable.order + 1
+        val category =
+            transaction {
+                if (order != null) {
+                    CategoryTable.update({ CategoryTable.order greaterEq order }) {
+                        it[CategoryTable.order] = CategoryTable.order + 1
+                    }
+                }
+
+                val id =
+                    CategoryTable.insertAndGetId {
+                        it[CategoryTable.name] = input.name
+                        it[CategoryTable.order] = order ?: Int.MAX_VALUE
+                        if (default != null) {
+                            it[CategoryTable.isDefault] = default
+                        }
+                        if (includeInUpdate != null) {
+                            it[CategoryTable.includeInUpdate] = includeInUpdate.value
+                        }
+                        if (includeInDownload != null) {
+                            it[CategoryTable.includeInDownload] = includeInDownload.value
                        }
                    }

-                    val id =
-                        CategoryTable.insertAndGetId {
-                            it[CategoryTable.name] = input.name
-                            it[CategoryTable.order] = order ?: Int.MAX_VALUE
-                            if (default != null) {
-                                it[CategoryTable.isDefault] = default
-                            }
-                            if (includeInUpdate != null) {
-                                it[CategoryTable.includeInUpdate] = includeInUpdate.value
-                            }
-                            if (includeInDownload != null) {
-                                it[CategoryTable.includeInDownload] = includeInDownload.value
-                            }
-                        }
+                Category.normalizeCategories()

-                    Category.normalizeCategories()
+                CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
+            }

-                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
-                }
-
-            CreateCategoryPayload(clientMutationId, category)
-        }
+        return CreateCategoryPayload(clientMutationId, category)
+    }

    data class DeleteCategoryInput(
        val clientMutationId: String? = null,
@@ -457,47 +450,45 @@ class CategoryMutation {
    )

    @RequireAuth
-    fun deleteCategory(input: DeleteCategoryInput): DataFetcherResult<DeleteCategoryPayload?> {
-        return asDataFetcherResult {
-            val (clientMutationId, categoryId) = input
-            if (categoryId == 0) { // Don't delete default category
-                return@asDataFetcherResult DeleteCategoryPayload(
-                    clientMutationId,
-                    null,
-                    emptyList(),
-                )
+    fun deleteCategory(input: DeleteCategoryInput): DeleteCategoryPayload? {
+        val (clientMutationId, categoryId) = input
+        if (categoryId == 0) { // Don't delete default category
+            return DeleteCategoryPayload(
+                clientMutationId,
+                null,
+                emptyList(),
+            )
+        }
+
+        val (category, mangas) =
+            transaction {
+                val category =
+                    CategoryTable
+                        .selectAll()
+                        .where { CategoryTable.id eq categoryId }
+                        .firstOrNull()
+
+                val mangas =
+                    transaction {
+                        MangaTable
+                            .innerJoin(CategoryMangaTable)
+                            .selectAll()
+                            .where { CategoryMangaTable.category eq categoryId }
+                            .map { MangaType(it) }
+                    }
+
+                CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
+
+                Category.normalizeCategories()
+
+                if (category != null) {
+                    CategoryType(category)
+                } else {
+                    null
+                } to mangas
            }

-            val (category, mangas) =
-                transaction {
-                    val category =
-                        CategoryTable
-                            .selectAll()
-                            .where { CategoryTable.id eq categoryId }
-                            .firstOrNull()
-
-                    val mangas =
-                        transaction {
-                            MangaTable
-                                .innerJoin(CategoryMangaTable)
-                                .selectAll()
-                                .where { CategoryMangaTable.category eq categoryId }
-                                .map { MangaType(it) }
-                        }
-
-                    CategoryTable.deleteWhere { CategoryTable.id eq categoryId }
-
-                    Category.normalizeCategories()
-
-                    if (category != null) {
-                        CategoryType(category)
-                    } else {
-                        null
-                    } to mangas
-                }
-
-            DeleteCategoryPayload(clientMutationId, category, mangas)
-        }
+        return DeleteCategoryPayload(clientMutationId, category, mangas)
    }

    data class UpdateMangaCategoriesPatch(
@@ -547,38 +538,36 @@ class CategoryMutation {
    }

    @RequireAuth
-    fun updateMangaCategories(input: UpdateMangaCategoriesInput): DataFetcherResult<UpdateMangaCategoriesPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, id, patch) = input
+    fun updateMangaCategories(input: UpdateMangaCategoriesInput): UpdateMangaCategoriesPayload? {
+        val (clientMutationId, id, patch) = input

-            updateMangas(listOf(id), patch)
+        updateMangas(listOf(id), patch)

-            val manga =
-                transaction {
-                    MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
-                }
+        val manga =
+            transaction {
+                MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
+            }

-            UpdateMangaCategoriesPayload(
-                clientMutationId = clientMutationId,
-                manga = manga,
-            )
-        }
+        return UpdateMangaCategoriesPayload(
+            clientMutationId = clientMutationId,
+            manga = manga,
+        )
+    }

    @RequireAuth
-    fun updateMangasCategories(input: UpdateMangasCategoriesInput): DataFetcherResult<UpdateMangasCategoriesPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, ids, patch) = input
+    fun updateMangasCategories(input: UpdateMangasCategoriesInput): UpdateMangasCategoriesPayload? {
+        val (clientMutationId, ids, patch) = input

-            updateMangas(ids, patch)
+        updateMangas(ids, patch)

-            val mangas =
-                transaction {
-                    MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
-                }
+        val mangas =
+            transaction {
+                MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
+            }

-            UpdateMangasCategoriesPayload(
-                clientMutationId = clientMutationId,
-                mangas = mangas,
-            )
-        }
+        return UpdateMangasCategoriesPayload(
+            clientMutationId = clientMutationId,
+            mangas = mangas,
+        )
+    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
+++ b/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,40 +120,38 @@ class ChapterMutation {
    }

    @RequireAuth
-    fun updateChapter(input: UpdateChapterInput): DataFetcherResult<UpdateChapterPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, id, patch) = input
+    fun updateChapter(input: UpdateChapterInput): UpdateChapterPayload? {
+        val (clientMutationId, id, patch) = input

-            updateChapters(listOf(id), patch)
+        updateChapters(listOf(id), patch)

-            val chapter =
-                transaction {
-                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
-                }
+        val chapter =
+            transaction {
+                ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
+            }

-            UpdateChapterPayload(
-                clientMutationId = clientMutationId,
-                chapter = chapter,
-            )
-        }
+        return UpdateChapterPayload(
+            clientMutationId = clientMutationId,
+            chapter = chapter,
+        )
+    }

    @RequireAuth
-    fun updateChapters(input: UpdateChaptersInput): DataFetcherResult<UpdateChaptersPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, ids, patch) = input
+    fun updateChapters(input: UpdateChaptersInput): UpdateChaptersPayload? {
+        val (clientMutationId, ids, patch) = input

-            updateChapters(ids, patch)
+        updateChapters(ids, patch)

-            val chapters =
-                transaction {
-                    ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
-                }
+        val chapters =
+            transaction {
+                ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
+            }

-            UpdateChaptersPayload(
-                clientMutationId = clientMutationId,
-                chapters = chapters,
-            )
-        }
+        return UpdateChaptersPayload(
+            clientMutationId = clientMutationId,
+            chapters = chapters,
+        )
+    }

    data class FetchChaptersInput(
        val clientMutationId: String? = null,
@@ -166,27 +164,25 @@ 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)
+            Chapter.fetchChapterList(mangaId)

-                val chapters =
-                    transaction {
-                        ChapterTable
-                            .selectAll()
-                            .where { ChapterTable.manga eq mangaId }
-                            .orderBy(ChapterTable.sourceOrder)
-                            .map { ChapterType(it) }
-                    }
+            val chapters =
+                transaction {
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.manga eq mangaId }
+                        .orderBy(ChapterTable.sourceOrder)
+                        .map { ChapterType(it) }
+                }

-                FetchChaptersPayload(
-                    clientMutationId = clientMutationId,
-                    chapters = chapters,
-                )
-            }
+            FetchChaptersPayload(
+                clientMutationId = clientMutationId,
+                chapters = chapters,
+            )
        }
    }

@@ -201,14 +197,13 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun setChapterMeta(input: SetChapterMetaInput): DataFetcherResult<SetChapterMetaPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, meta) = input
+    fun setChapterMeta(input: SetChapterMetaInput): SetChapterMetaPayload? {
+        val (clientMutationId, meta) = input

-            Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
+        Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)

-            SetChapterMetaPayload(clientMutationId, meta)
-        }
+        return SetChapterMetaPayload(clientMutationId, meta)
+    }

    data class DeleteChapterMetaInput(
        val clientMutationId: String? = null,
@@ -223,34 +218,33 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun deleteChapterMeta(input: DeleteChapterMetaInput): DataFetcherResult<DeleteChapterMetaPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, chapterId, key) = input
+    fun deleteChapterMeta(input: DeleteChapterMetaInput): DeleteChapterMetaPayload? {
+        val (clientMutationId, chapterId, key) = input

-            val (meta, chapter) =
-                transaction {
-                    val meta =
-                        ChapterMetaTable
-                            .selectAll()
-                            .where { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
-                            .firstOrNull()
+        val (meta, chapter) =
+            transaction {
+                val meta =
+                    ChapterMetaTable
+                        .selectAll()
+                        .where { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
+                        .firstOrNull()

-                    ChapterMetaTable.deleteWhere { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
+                ChapterMetaTable.deleteWhere { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }

-                    val chapter =
-                        transaction {
-                            ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first())
-                        }
+                val chapter =
+                    transaction {
+                        ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first())
+                    }

-                    if (meta != null) {
-                        ChapterMetaType(meta)
-                    } else {
-                        null
-                    } to chapter
-                }
+                if (meta != null) {
+                    ChapterMetaType(meta)
+                } else {
+                    null
+                } to chapter
+            }

-            DeleteChapterMetaPayload(clientMutationId, meta, chapter)
-        }
+        return DeleteChapterMetaPayload(clientMutationId, meta, chapter)
+    }

    data class SetChapterMetasItem(
        val chapterIds: List<Int>,
@@ -269,43 +263,42 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun setChapterMetas(input: SetChapterMetasInput): DataFetcherResult<SetChapterMetasPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, items) = input
+    fun setChapterMetas(input: SetChapterMetasInput): SetChapterMetasPayload? {
+        val (clientMutationId, items) = input

-            val metaByChapterId =
-                items
-                    .flatMap { item ->
-                        val metaMap = item.metas.associate { it.key to it.value }
-                        item.chapterIds.map { chapterId -> chapterId to metaMap }
-                    }.groupBy({ it.first }, { it.second })
-                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+        val metaByChapterId =
+            items
+                .flatMap { item ->
+                    val metaMap = item.metas.associate { it.key to it.value }
+                    item.chapterIds.map { chapterId -> chapterId to metaMap }
+                }.groupBy({ it.first }, { it.second })
+                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }

-            Chapter.modifyChaptersMetas(metaByChapterId)
+        Chapter.modifyChaptersMetas(metaByChapterId)

-            val allChapterIds = metaByChapterId.keys
-            val allMetaKeys = metaByChapterId.values.flatMap { it.keys }.distinct()
+        val allChapterIds = metaByChapterId.keys
+        val allMetaKeys = metaByChapterId.values.flatMap { it.keys }.distinct()

-            val (updatedMetas, chapters) =
-                transaction {
-                    val updatedMetas =
-                        ChapterMetaTable
-                            .selectAll()
-                            .where { (ChapterMetaTable.ref inList allChapterIds) and (ChapterMetaTable.key inList allMetaKeys) }
-                            .map { ChapterMetaType(it) }
+        val (updatedMetas, chapters) =
+            transaction {
+                val updatedMetas =
+                    ChapterMetaTable
+                        .selectAll()
+                        .where { (ChapterMetaTable.ref inList allChapterIds) and (ChapterMetaTable.key inList allMetaKeys) }
+                        .map { ChapterMetaType(it) }

-                    val chapters =
-                        ChapterTable
-                            .selectAll()
-                            .where { ChapterTable.id inList allChapterIds }
-                            .map { ChapterType(it) }
-                            .distinctBy { it.id }
+                val chapters =
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id inList allChapterIds }
+                        .map { ChapterType(it) }
+                        .distinctBy { it.id }

-                    updatedMetas to chapters
-                }
+                updatedMetas to chapters
+            }

-            SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
-        }
+        return SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
+    }

    data class DeleteChapterMetasItem(
        val chapterIds: List<Int>,
@@ -325,64 +318,63 @@ class ChapterMutation {
    )

    @RequireAuth
-    fun deleteChapterMetas(input: DeleteChapterMetasInput): DataFetcherResult<DeleteChapterMetasPayload?> =
-        asDataFetcherResult {
-            val (clientMutationId, items) = input
+    fun deleteChapterMetas(input: DeleteChapterMetasInput): DeleteChapterMetasPayload? {
+        val (clientMutationId, items) = input

-            items.forEach { item ->
-                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
-                    "Either 'keys' or 'prefixes' must be provided for each item"
+        items.forEach { item ->
+            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                "Either 'keys' or 'prefixes' must be provided for each item"
+            }
+        }
+
+        val (allDeletedMetas, allChapterIds) =
+            transaction {
+                val deletedMetas = mutableListOf<ChapterMetaType>()
+                val chapterIds = mutableSetOf<Int>()
+
+                items.forEach { item ->
+                    val keyCondition: Op<Boolean>? =
+                        item.keys?.takeIf { it.isNotEmpty() }?.let { ChapterMetaTable.key inList it }
+
+                    val prefixCondition: Op<Boolean>? =
+                        item.prefixes
+                            ?.filter { it.isNotEmpty() }
+                            ?.map { (ChapterMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                            ?.reduceOrNull { acc, op -> acc or op }
+
+                    val metaKeyCondition =
+                        if (keyCondition != null && prefixCondition != null) {
+                            keyCondition or prefixCondition
+                        } else {
+                            keyCondition ?: prefixCondition!!
+                        }
+
+                    val condition = (ChapterMetaTable.ref inList item.chapterIds) and metaKeyCondition
+
+                    deletedMetas +=
+                        ChapterMetaTable
+                            .selectAll()
+                            .where { condition }
+                            .map { ChapterMetaType(it) }
+
+                    ChapterMetaTable.deleteWhere { condition }
+                    chapterIds += item.chapterIds
                }
+
+                deletedMetas to chapterIds
            }

-            val (allDeletedMetas, allChapterIds) =
-                transaction {
-                    val deletedMetas = mutableListOf<ChapterMetaType>()
-                    val chapterIds = mutableSetOf<Int>()
+        val chapters =
+            transaction {
+                ChapterTable
+                    .selectAll()
+                    .where { ChapterTable.id inList allChapterIds }
+                    .map { ChapterType(it) }
+                    .distinctBy { it.id }
+            }

-                    items.forEach { item ->
-                        val keyCondition: Op<Boolean>? =
-                            item.keys?.takeIf { it.isNotEmpty() }?.let { ChapterMetaTable.key inList it }
-
-                        val prefixCondition: Op<Boolean>? =
-                            item.prefixes
-                                ?.filter { it.isNotEmpty() }
-                                ?.map { (ChapterMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                                ?.reduceOrNull { acc, op -> acc or op }
-
-                        val metaKeyCondition =
-                            if (keyCondition != null && prefixCondition != null) {
-                                keyCondition or prefixCondition
-                            } else {
-                                keyCondition ?: prefixCondition!!
-                            }
-
-                        val condition = (ChapterMetaTable.ref inList item.chapterIds) and metaKeyCondition
-
-                        deletedMetas +=
-                            ChapterMetaTable
-                                .selectAll()
-                                .where { condition }
-                                .map { ChapterMetaType(it) }
-
-                        ChapterMetaTable.deleteWhere { condition }
-                        chapterIds += item.chapterIds
-                    }
-
-                    deletedMetas to chapterIds
-                }
-
-            val chapters =
-                transaction {
-                    ChapterTable
-                        .selectAll()
-                        .where { ChapterTable.id inList allChapterIds }
-                        .map { ChapterType(it) }
-                        .distinctBy { it.id }
-                }
-
-            DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
-        }
+        return DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
+    }

    data class FetchChapterPagesInput(
        val clientMutationId: String? = null,
@@ -405,67 +397,65 @@ 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
+            var chapter = getChapterDownloadReadyById(chapterId)
+            val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
+            var syncConflictInfo: SyncConflictInfoType? = null

-                if (syncResult != null) {
-                    if (syncResult.isConflict) {
-                        syncConflictInfo =
-                            SyncConflictInfoType(
-                                deviceName = syncResult.device,
-                                remotePage = syncResult.pageRead,
-                            )
-                    }
-
-                    if (syncResult.shouldUpdate) {
-                        // Update DB for SILENT and RECEIVE
-                        transaction {
-                            ChapterTable.update({ ChapterTable.id eq chapter.id }) {
-                                it[lastPageRead] = syncResult.pageRead
-                                it[lastReadAt] = syncResult.timestamp
-                            }
-                        }
-                    }
-                    // For PROMPT, SILENT, and RECEIVE, return the remote progress
-                    chapter =
-                        chapter.copy(
-                            lastPageRead = if (syncResult.shouldUpdate) syncResult.pageRead else chapter.lastPageRead,
-                            lastReadAt = if (syncResult.shouldUpdate) syncResult.timestamp else chapter.lastReadAt,
+            if (syncResult != null) {
+                if (syncResult.isConflict) {
+                    syncConflictInfo =
+                        SyncConflictInfoType(
+                            deviceName = syncResult.device,
+                            remotePage = syncResult.pageRead,
                        )
                }

-                val params =
-                    buildString {
-                        if (paramsMap.isNotEmpty()) {
-                            append("?")
-                            paramsMap.entries.forEach { entry ->
-                                if (length > 1) {
-                                    append("&")
-                                }
-                                append(entry.key)
-                                append("=")
-                                append(URLEncoder.encode(entry.value, Charsets.UTF_8))
-                            }
+                if (syncResult.shouldUpdate) {
+                    // Update DB for SILENT and RECEIVE
+                    transaction {
+                        ChapterTable.update({ ChapterTable.id eq chapter.id }) {
+                            it[lastPageRead] = syncResult.pageRead
+                            it[lastReadAt] = syncResult.timestamp
                        }
                    }
-
-                FetchChapterPagesPayload(
-                    clientMutationId = clientMutationId,
-                    pages =
-                        List(chapter.pageCount) { index ->
-                            "/api/v1/manga/${chapter.mangaId}/chapter/${chapter.index}/page/${index}$params"
-                        },
-                    chapter = ChapterType(chapter),
-                    syncConflict = syncConflictInfo,
-                )
+                }
+                // For PROMPT, SILENT, and RECEIVE, return the remote progress
+                chapter =
+                    chapter.copy(
+                        lastPageRead = if (syncResult.shouldUpdate) syncResult.pageRead else chapter.lastPageRead,
+                        lastReadAt = if (syncResult.shouldUpdate) syncResult.timestamp else chapter.lastReadAt,
+                    )
            }
+
+            val params =
+                buildString {
+                    if (paramsMap.isNotEmpty()) {
+                        append("?")
+                        paramsMap.entries.forEach { entry ->
+                            if (length > 1) {
+                                append("&")
+                            }
+                            append(entry.key)
+                            append("=")
+                            append(URLEncoder.encode(entry.value, Charsets.UTF_8))
+                        }
+                    }
+                }
+
+            FetchChapterPagesPayload(
+                clientMutationId = clientMutationId,
+                pages =
+                    List(chapter.pageCount) { index ->
+                        "/api/v1/manga/${chapter.mangaId}/chapter/${chapter.index}/page/${index}$params"
+                    },
+                chapter = ChapterType(chapter),
+                syncConflict = syncConflictInfo,
+            )
        }
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/DownloadMutation.kt
+++ b/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,23 +31,21 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DataFetcherResult<DeleteDownloadedChaptersPayload?> {
+    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DeleteDownloadedChaptersPayload? {
        val (clientMutationId, chapters) = input

-        return asDataFetcherResult {
-            Chapter.deleteChapters(chapters)
+        Chapter.deleteChapters(chapters)

-            DeleteDownloadedChaptersPayload(
-                clientMutationId = clientMutationId,
-                chapters =
-                    transaction {
-                        ChapterTable
-                            .selectAll()
-                            .where { ChapterTable.id inList chapters }
-                            .map { ChapterType(it) }
-                    },
-            )
-        }
+        return DeleteDownloadedChaptersPayload(
+            clientMutationId = clientMutationId,
+            chapters =
+                transaction {
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id inList chapters }
+                        .map { ChapterType(it) }
+                },
+        )
    }

    data class DeleteDownloadedChapterInput(
@@ -60,20 +59,18 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DataFetcherResult<DeleteDownloadedChapterPayload?> {
+    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DeleteDownloadedChapterPayload? {
        val (clientMutationId, chapter) = input

-        return asDataFetcherResult {
-            Chapter.deleteChapters(listOf(chapter))
+        Chapter.deleteChapters(listOf(chapter))

-            DeleteDownloadedChapterPayload(
-                clientMutationId = clientMutationId,
-                chapters =
-                    transaction {
-                        ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapter }.first())
-                    },
-            )
-        }
+        return DeleteDownloadedChapterPayload(
+            clientMutationId = clientMutationId,
+            chapters =
+                transaction {
+                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapter }.first())
+                },
+        )
    }

    data class EnqueueChapterDownloadsInput(
@@ -87,28 +84,24 @@ 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))
+            DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))

-                EnqueueChapterDownloadsPayload(
-                    clientMutationId = clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first {
-                                        DownloadManager.getStatus().queue.any { it.chapterId in chapters }
-                                    }.let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            EnqueueChapterDownloadsPayload(
+                clientMutationId = clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first {
+                                    DownloadManager.getStatus().queue.any { it.chapterId in chapters }
+                                }.let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }
    }

@@ -123,25 +116,23 @@ 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)))
+            DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))

-                EnqueueChapterDownloadPayload(
-                    clientMutationId = clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first { it.updates.any { it.downloadQueueItem.chapterId == chapter } }
-                                    .let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            EnqueueChapterDownloadPayload(
+                clientMutationId = clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first { it.updates.any { it.downloadQueueItem.chapterId == chapter } }
+                                .let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }
    }

@@ -156,30 +147,26 @@ 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))
+            DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))

-                DequeueChapterDownloadsPayload(
-                    clientMutationId = clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first {
-                                        it.updates.any {
-                                            it.downloadQueueItem.chapterId in chapters && it.type == DEQUEUED
-                                        }
-                                    }.let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            DequeueChapterDownloadsPayload(
+                clientMutationId = clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first {
+                                    it.updates.any {
+                                        it.downloadQueueItem.chapterId in chapters && it.type == DEQUEUED
+                                    }
+                                }.let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }
    }

@@ -194,28 +181,26 @@ 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)))
+            DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))

-                DequeueChapterDownloadPayload(
-                    clientMutationId = clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first {
-                                        it.updates.any {
-                                            it.downloadQueueItem.chapterId == chapter && it.type == DEQUEUED
-                                        }
-                                    }.let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            DequeueChapterDownloadPayload(
+                clientMutationId = clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first {
+                                    it.updates.any {
+                                        it.downloadQueueItem.chapterId == chapter && it.type == DEQUEUED
+                                    }
+                                }.let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }
    }

@@ -229,23 +214,21 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun startDownloader(input: StartDownloaderInput): CompletableFuture<DataFetcherResult<StartDownloaderPayload?>> =
+    fun startDownloader(input: StartDownloaderInput): CompletableFuture<StartDownloaderPayload?> =
        future {
-            asDataFetcherResult {
-                DownloadManager.start()
+            DownloadManager.start()

-                StartDownloaderPayload(
-                    input.clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first { it.status == Status.Started }
-                                    .let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            StartDownloaderPayload(
+                input.clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first { it.status == Status.Started }
+                                .let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }

    data class StopDownloaderInput(
@@ -258,23 +241,21 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<DataFetcherResult<StopDownloaderPayload?>> =
+    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<StopDownloaderPayload?> =
        future {
-            asDataFetcherResult {
-                DownloadManager.stop()
+            DownloadManager.stop()

-                StopDownloaderPayload(
-                    input.clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first { it.status == Status.Stopped }
-                                    .let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            StopDownloaderPayload(
+                input.clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first { it.status == Status.Stopped }
+                                .let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }

    data class ClearDownloaderInput(
@@ -287,23 +268,21 @@ class DownloadMutation {
    )

    @RequireAuth
-    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<DataFetcherResult<ClearDownloaderPayload?>> =
+    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<ClearDownloaderPayload?> =
        future {
-            asDataFetcherResult {
-                DownloadManager.clear()
+            DownloadManager.clear()

-                ClearDownloaderPayload(
-                    input.clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first { it.status == Status.Stopped }
-                                    .let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            ClearDownloaderPayload(
+                input.clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first { it.status == Status.Stopped }
+                                .let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }

    data class ReorderChapterDownloadInput(
@@ -318,25 +297,23 @@ 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)
+            DownloadManager.reorder(chapter, to)

-                ReorderChapterDownloadPayload(
-                    clientMutationId,
-                    downloadStatus =
-                        withTimeout(30.seconds) {
-                            DownloadStatus(
-                                DownloadManager.updates
-                                    .first { it.updates.indexOfFirst { it.downloadQueueItem.chapterId == chapter } <= to }
-                                    .let { DownloadManager.getStatus() },
-                            )
-                        },
-                )
-            }
+            ReorderChapterDownloadPayload(
+                clientMutationId,
+                downloadStatus =
+                    withTimeout(30.seconds) {
+                        DownloadStatus(
+                            DownloadManager.updates
+                                .first { it.updates.indexOfFirst { it.downloadQueueItem.chapterId == chapter } <= to }
+                                .let { DownloadManager.getStatus() },
+                        )
+                    },
+            )
        }
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
+++ b/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,51 +76,47 @@ 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)
+            updateExtensions(listOf(id), patch)

-                val extension =
-                    transaction {
-                        ExtensionTable
-                            .selectAll()
-                            .where { ExtensionTable.pkgName eq id }
-                            .firstOrNull()
-                            ?.let { ExtensionType(it) }
-                    }
+            val extension =
+                transaction {
+                    ExtensionTable
+                        .selectAll()
+                        .where { ExtensionTable.pkgName eq id }
+                        .firstOrNull()
+                        ?.let { ExtensionType(it) }
+                }

-                UpdateExtensionPayload(
-                    clientMutationId = clientMutationId,
-                    extension = extension,
-                )
-            }
+            UpdateExtensionPayload(
+                clientMutationId = clientMutationId,
+                extension = extension,
+            )
        }
    }

    @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)
+            updateExtensions(ids, patch)

-                val extensions =
-                    transaction {
-                        ExtensionTable
-                            .selectAll()
-                            .where { ExtensionTable.pkgName inList ids }
-                            .map { ExtensionType(it) }
-                    }
+            val extensions =
+                transaction {
+                    ExtensionTable
+                        .selectAll()
+                        .where { ExtensionTable.pkgName inList ids }
+                        .map { ExtensionType(it) }
+                }

-                UpdateExtensionsPayload(
-                    clientMutationId = clientMutationId,
-                    extensions = extensions,
-                )
-            }
+            UpdateExtensionsPayload(
+                clientMutationId = clientMutationId,
+                extensions = extensions,
+            )
        }
    }

@@ -133,26 +130,24 @@ class ExtensionMutation {
    )

    @RequireAuth
-    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<DataFetcherResult<FetchExtensionsPayload?>> {
+    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<FetchExtensionsPayload?> {
        val (clientMutationId) = input

        return future {
-            asDataFetcherResult {
-                ExtensionsList.fetchExtensions()
+            ExtensionsList.fetchExtensions()

-                val extensions =
-                    transaction {
-                        ExtensionTable
-                            .selectAll()
-                            .where { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
-                            .map { ExtensionType(it) }
-                    }
+            val extensions =
+                transaction {
+                    ExtensionTable
+                        .selectAll()
+                        .where { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
+                        .map { ExtensionType(it) }
+                }

-                FetchExtensionsPayload(
-                    clientMutationId = clientMutationId,
-                    extensions = extensions,
-                )
-            }
+            FetchExtensionsPayload(
+                clientMutationId = clientMutationId,
+                extensions = extensions,
+            )
        }
    }

@@ -167,23 +162,19 @@ 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())
+            Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())

-                val dbExtension =
-                    transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq extensionFile.filename() }.first() }
+            val dbExtension =
+                transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq extensionFile.filename() }.first() }

-                InstallExternalExtensionPayload(
-                    clientMutationId,
-                    extension = ExtensionType(dbExtension),
-                )
-            }
+            InstallExternalExtensionPayload(
+                clientMutationId,
+                extension = ExtensionType(dbExtension),
+            )
        }
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ImageMutation.kt
+++ b/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
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/InfoMutation.kt
+++ b/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,55 +27,51 @@ 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)
-                    }
+            withTimeout(30.seconds) {
+                if (WebInterfaceManager.status.value.state === DOWNLOADING) {
+                    return@withTimeout WebUIUpdatePayload(input.clientMutationId, WebInterfaceManager.status.value)
+                }

-                    val flavor = WebUIFlavor.current
+                val flavor = WebUIFlavor.current

-                    val (version, updateAvailable) = WebInterfaceManager.isUpdateAvailable(flavor)
+                val (version, updateAvailable) = WebInterfaceManager.isUpdateAvailable(flavor)

-                    if (!updateAvailable) {
-                        val didUpdateCheckFail = version.isEmpty()
+                if (!updateAvailable) {
+                    val didUpdateCheckFail = version.isEmpty()

-                        return@withTimeout WebUIUpdatePayload(
-                            input.clientMutationId,
-                            WebInterfaceManager.getStatus(version, if (didUpdateCheckFail) ERROR else IDLE),
-                        )
-                    }
-                    try {
-                        WebInterfaceManager.startDownloadInScope(flavor, version)
-                    } catch (e: Exception) {
-                        // ignore since we use the status anyway
-                    }
-
-                    WebUIUpdatePayload(
+                    return@withTimeout WebUIUpdatePayload(
                        input.clientMutationId,
-                        updateStatus = WebInterfaceManager.status.first { it.state == DOWNLOADING },
+                        WebInterfaceManager.getStatus(version, if (didUpdateCheckFail) ERROR else IDLE),
                    )
                }
+                try {
+                    WebInterfaceManager.startDownloadInScope(flavor, version)
+                } catch (e: Exception) {
+                    // ignore since we use the status anyway
+                }
+
+                WebUIUpdatePayload(
+                    input.clientMutationId,
+                    updateStatus = WebInterfaceManager.status.first { it.state == DOWNLOADING },
+                )
            }
        }
    }

    @RequireAuth
-    fun resetWebUIUpdateStatus(): CompletableFuture<DataFetcherResult<WebUIUpdateStatus?>> =
+    fun resetWebUIUpdateStatus(): CompletableFuture<WebUIUpdateStatus?> =
        future {
-            asDataFetcherResult {
-                withTimeout(30.seconds) {
-                    val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
-                    if (!isUpdateFinished) {
-                        throw Exception("Status reset is not allowed during status \"$DOWNLOADING\"")
-                    }
-
-                    WebInterfaceManager.resetStatus()
-
-                    WebInterfaceManager.status.first { it.state == IDLE }
+            withTimeout(30.seconds) {
+                val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
+                if (!isUpdateFinished) {
+                    throw Exception("Status reset is not allowed during status \"$DOWNLOADING\"")
                }
+
+                WebInterfaceManager.resetStatus()
+
+                WebInterfaceManager.status.first { it.state == IDLE }
            }
        }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/KoreaderSyncMutation.kt
+++ b/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,26 +63,24 @@ class KoreaderSyncMutation {
    )

    @RequireAuth
-    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<DataFetcherResult<PushKoSyncProgressPayload?>> =
+    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<PushKoSyncProgressPayload?> =
        future {
-            asDataFetcherResult {
-                KoreaderSyncService.pushProgress(input.chapterId)
+            KoreaderSyncService.pushProgress(input.chapterId)

-                val chapter =
-                    transaction {
-                        ChapterTable
-                            .selectAll()
-                            .where { ChapterTable.id eq input.chapterId }
-                            .firstOrNull()
-                            ?.let { ChapterType(it) }
-                    }
+            val chapter =
+                transaction {
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id eq input.chapterId }
+                        .firstOrNull()
+                        ?.let { ChapterType(it) }
+                }

-                PushKoSyncProgressPayload(
-                    clientMutationId = input.clientMutationId,
-                    success = true,
-                    chapter = chapter,
-                )
-            }
+            PushKoSyncProgressPayload(
+                clientMutationId = input.clientMutationId,
+                success = true,
+                chapter = chapter,
+            )
        }

    data class PullKoSyncProgressInput(
@@ -96,45 +95,43 @@ 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
+            val syncResult = KoreaderSyncService.checkAndPullProgress(input.chapterId)
+            var syncConflictInfo: SyncConflictInfoType? = null

-                if (syncResult != null) {
-                    if (syncResult.isConflict) {
-                        syncConflictInfo =
-                            SyncConflictInfoType(
-                                deviceName = syncResult.device,
-                                remotePage = syncResult.pageRead,
-                            )
-                    }
+            if (syncResult != null) {
+                if (syncResult.isConflict) {
+                    syncConflictInfo =
+                        SyncConflictInfoType(
+                            deviceName = syncResult.device,
+                            remotePage = syncResult.pageRead,
+                        )
+                }

-                    if (syncResult.shouldUpdate) {
-                        transaction {
-                            ChapterTable.update({ ChapterTable.id eq input.chapterId }) {
-                                it[lastPageRead] = syncResult.pageRead
-                                it[lastReadAt] = syncResult.timestamp
-                            }
+                if (syncResult.shouldUpdate) {
+                    transaction {
+                        ChapterTable.update({ ChapterTable.id eq input.chapterId }) {
+                            it[lastPageRead] = syncResult.pageRead
+                            it[lastReadAt] = syncResult.timestamp
                        }
                    }
                }
-
-                val chapter =
-                    transaction {
-                        ChapterTable
-                            .selectAll()
-                            .where { ChapterTable.id eq input.chapterId }
-                            .firstOrNull()
-                            ?.let { ChapterType(it) }
-                    }
-
-                PullKoSyncProgressPayload(
-                    clientMutationId = input.clientMutationId,
-                    chapter = chapter,
-                    syncConflict = syncConflictInfo,
-                )
            }
+
+            val chapter =
+                transaction {
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id eq input.chapterId }
+                        .firstOrNull()
+                        ?.let { ChapterType(it) }
+                }
+
+            PullKoSyncProgressPayload(
+                clientMutationId = input.clientMutationId,
+                chapter = chapter,
+                syncConflict = syncConflictInfo,
+            )
        }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
+++ b/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,44 +98,40 @@ 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)
+            updateMangas(listOf(id), patch)

-                val manga =
-                    transaction {
-                        MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
-                    }
+            val manga =
+                transaction {
+                    MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
+                }

-                UpdateMangaPayload(
-                    clientMutationId = clientMutationId,
-                    manga = manga,
-                )
-            }
+            UpdateMangaPayload(
+                clientMutationId = clientMutationId,
+                manga = manga,
+            )
        }
    }

    @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)
+            updateMangas(ids, patch)

-                val mangas =
-                    transaction {
-                        MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
-                    }
+            val mangas =
+                transaction {
+                    MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
+                }

-                UpdateMangasPayload(
-                    clientMutationId = clientMutationId,
-                    mangas = mangas,
-                )
-            }
+            UpdateMangasPayload(
+                clientMutationId = clientMutationId,
+                mangas = mangas,
+            )
        }
    }

@@ -150,22 +146,20 @@ 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)
+            Manga.fetchManga(id)

-                val manga =
-                    transaction {
-                        MangaTable.selectAll().where { MangaTable.id eq id }.first()
-                    }
-                FetchMangaPayload(
-                    clientMutationId = clientMutationId,
-                    manga = MangaType(manga),
-                )
-            }
+            val manga =
+                transaction {
+                    MangaTable.selectAll().where { MangaTable.id eq id }.first()
+                }
+            FetchMangaPayload(
+                clientMutationId = clientMutationId,
+                manga = MangaType(manga),
+            )
        }
    }

@@ -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)
+        Manga.modifyMangaMeta(meta.mangaId, meta.key, meta.value)

-            SetMangaMetaPayload(clientMutationId, meta)
-        }
+        return SetMangaMetaPayload(clientMutationId, meta)
    }

    data class DeleteMangaMetaInput(
@@ -203,34 +195,32 @@ 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 =
-                        MangaMetaTable
-                            .selectAll()
-                            .where { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }
-                            .firstOrNull()
+        val (meta, manga) =
+            transaction {
+                val meta =
+                    MangaMetaTable
+                        .selectAll()
+                        .where { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }
+                        .firstOrNull()

-                    MangaMetaTable.deleteWhere { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }
+                MangaMetaTable.deleteWhere { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }

-                    val manga =
-                        transaction {
-                            MangaType(MangaTable.selectAll().where { MangaTable.id eq mangaId }.first())
-                        }
+                val manga =
+                    transaction {
+                        MangaType(MangaTable.selectAll().where { MangaTable.id eq mangaId }.first())
+                    }

-                    if (meta != null) {
-                        MangaMetaType(meta)
-                    } else {
-                        null
-                    } to manga
-                }
+                if (meta != null) {
+                    MangaMetaType(meta)
+                } else {
+                    null
+                } to manga
+            }

-            DeleteMangaMetaPayload(clientMutationId, meta, manga)
-        }
+        return DeleteMangaMetaPayload(clientMutationId, meta, manga)
    }

    data class SetMangaMetasItem(
@@ -250,43 +240,41 @@ 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 ->
-                        val metaMap = item.metas.associate { it.key to it.value }
-                        item.mangaIds.map { mangaId -> mangaId to metaMap }
-                    }.groupBy({ it.first }, { it.second })
-                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+        val metaByMangaId =
+            items
+                .flatMap { item ->
+                    val metaMap = item.metas.associate { it.key to it.value }
+                    item.mangaIds.map { mangaId -> mangaId to metaMap }
+                }.groupBy({ it.first }, { it.second })
+                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }

-            Manga.modifyMangasMetas(metaByMangaId)
+        Manga.modifyMangasMetas(metaByMangaId)

-            val allMangaIds = metaByMangaId.keys
-            val allMetaKeys = metaByMangaId.values.flatMap { it.keys }.distinct()
+        val allMangaIds = metaByMangaId.keys
+        val allMetaKeys = metaByMangaId.values.flatMap { it.keys }.distinct()

-            val (updatedMetas, mangas) =
-                transaction {
-                    val updatedMetas =
-                        MangaMetaTable
-                            .selectAll()
-                            .where { (MangaMetaTable.ref inList allMangaIds) and (MangaMetaTable.key inList allMetaKeys) }
-                            .map { MangaMetaType(it) }
+        val (updatedMetas, mangas) =
+            transaction {
+                val updatedMetas =
+                    MangaMetaTable
+                        .selectAll()
+                        .where { (MangaMetaTable.ref inList allMangaIds) and (MangaMetaTable.key inList allMetaKeys) }
+                        .map { MangaMetaType(it) }

-                    val mangas =
-                        MangaTable
-                            .selectAll()
-                            .where { MangaTable.id inList allMangaIds }
-                            .map { MangaType(it) }
-                            .distinctBy { it.id }
+                val mangas =
+                    MangaTable
+                        .selectAll()
+                        .where { MangaTable.id inList allMangaIds }
+                        .map { MangaType(it) }
+                        .distinctBy { it.id }

-                    updatedMetas to mangas
-                }
+                updatedMetas to mangas
+            }

-            SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
-        }
+        return SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
    }

    data class DeleteMangaMetasItem(
@@ -307,63 +295,61 @@ 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"
+        items.forEach { item ->
+            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                "Either 'keys' or 'prefixes' must be provided for each item"
+            }
+        }
+
+        val (allDeletedMetas, allMangaIds) =
+            transaction {
+                val deletedMetas = mutableListOf<MangaMetaType>()
+                val mangaIds = mutableSetOf<Int>()
+
+                items.forEach { item ->
+                    val keyCondition: Op<Boolean>? =
+                        item.keys?.takeIf { it.isNotEmpty() }?.let { MangaMetaTable.key inList it }
+
+                    val prefixCondition: Op<Boolean>? =
+                        item.prefixes
+                            ?.filter { it.isNotEmpty() }
+                            ?.map { (MangaMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                            ?.reduceOrNull { acc, op -> acc or op }
+
+                    val metaKeyCondition =
+                        if (keyCondition != null && prefixCondition != null) {
+                            keyCondition or prefixCondition
+                        } else {
+                            keyCondition ?: prefixCondition!!
+                        }
+
+                    val condition = (MangaMetaTable.ref inList item.mangaIds) and metaKeyCondition
+
+                    deletedMetas +=
+                        MangaMetaTable
+                            .selectAll()
+                            .where { condition }
+                            .map { MangaMetaType(it) }
+
+                    MangaMetaTable.deleteWhere { condition }
+                    mangaIds += item.mangaIds
                }
+
+                deletedMetas to mangaIds
            }

-            val (allDeletedMetas, allMangaIds) =
-                transaction {
-                    val deletedMetas = mutableListOf<MangaMetaType>()
-                    val mangaIds = mutableSetOf<Int>()
+        val mangas =
+            transaction {
+                MangaTable
+                    .selectAll()
+                    .where { MangaTable.id inList allMangaIds }
+                    .map { MangaType(it) }
+                    .distinctBy { it.id }
+            }

-                    items.forEach { item ->
-                        val keyCondition: Op<Boolean>? =
-                            item.keys?.takeIf { it.isNotEmpty() }?.let { MangaMetaTable.key inList it }
-
-                        val prefixCondition: Op<Boolean>? =
-                            item.prefixes
-                                ?.filter { it.isNotEmpty() }
-                                ?.map { (MangaMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                                ?.reduceOrNull { acc, op -> acc or op }
-
-                        val metaKeyCondition =
-                            if (keyCondition != null && prefixCondition != null) {
-                                keyCondition or prefixCondition
-                            } else {
-                                keyCondition ?: prefixCondition!!
-                            }
-
-                        val condition = (MangaMetaTable.ref inList item.mangaIds) and metaKeyCondition
-
-                        deletedMetas +=
-                            MangaMetaTable
-                                .selectAll()
-                                .where { condition }
-                                .map { MangaMetaType(it) }
-
-                        MangaMetaTable.deleteWhere { condition }
-                        mangaIds += item.mangaIds
-                    }
-
-                    deletedMetas to mangaIds
-                }
-
-            val mangas =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where { MangaTable.id inList allMangaIds }
-                        .map { MangaType(it) }
-                        .distinctBy { it.id }
-                }
-
-            DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
-        }
+        return DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MetaMutation.kt
+++ b/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)
+        GlobalMeta.modifyMeta(meta.key, meta.value)

-            SetGlobalMetaPayload(clientMutationId, meta)
-        }
+        return SetGlobalMetaPayload(clientMutationId, meta)
    }

    data class DeleteGlobalMetaInput(
@@ -50,29 +49,27 @@ 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 =
-                        GlobalMetaTable
-                            .selectAll()
-                            .where { GlobalMetaTable.key eq key }
-                            .firstOrNull()
+        val meta =
+            transaction {
+                val meta =
+                    GlobalMetaTable
+                        .selectAll()
+                        .where { GlobalMetaTable.key eq key }
+                        .firstOrNull()

-                    GlobalMetaTable.deleteWhere { GlobalMetaTable.key eq key }
+                GlobalMetaTable.deleteWhere { GlobalMetaTable.key eq key }

-                    if (meta != null) {
-                        GlobalMetaType(meta)
-                    } else {
-                        null
-                    }
+                if (meta != null) {
+                    GlobalMetaType(meta)
+                } else {
+                    null
                }
+            }

-            DeleteGlobalMetaPayload(clientMutationId, meta)
-        }
+        return DeleteGlobalMetaPayload(clientMutationId, meta)
    }

    data class SetGlobalMetasInput(
@@ -86,23 +83,21 @@ 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)
+        val metaMap = metas.associate { it.key to it.value }
+        GlobalMeta.modifyMetas(metaMap)

-            val updatedMetas =
-                transaction {
-                    GlobalMetaTable
-                        .selectAll()
-                        .where { GlobalMetaTable.key inList metaMap.keys }
-                        .map { GlobalMetaType(it) }
-                }
+        val updatedMetas =
+            transaction {
+                GlobalMetaTable
+                    .selectAll()
+                    .where { GlobalMetaTable.key inList metaMap.keys }
+                    .map { GlobalMetaType(it) }
+            }

-            SetGlobalMetasPayload(clientMutationId, updatedMetas)
-        }
+        return SetGlobalMetasPayload(clientMutationId, updatedMetas)
    }

    data class DeleteGlobalMetasInput(
@@ -117,43 +112,41 @@ 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"
+        require(!keys.isNullOrEmpty() || !prefixes.isNullOrEmpty()) {
+            "Either 'keys' or 'prefixes' must be provided"
+        }
+
+        val metas =
+            transaction {
+                val keyCondition: Op<Boolean>? = keys?.takeIf { it.isNotEmpty() }?.let { GlobalMetaTable.key inList it }
+
+                val prefixCondition: Op<Boolean>? =
+                    prefixes
+                        ?.filter { it.isNotEmpty() }
+                        ?.map { (GlobalMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                        ?.reduceOrNull { acc, op -> acc or op }
+
+                val finalCondition =
+                    if (keyCondition != null && prefixCondition != null) {
+                        keyCondition or prefixCondition
+                    } else {
+                        keyCondition ?: prefixCondition!!
+                    }
+
+                val metas =
+                    GlobalMetaTable
+                        .selectAll()
+                        .where { finalCondition }
+                        .map { GlobalMetaType(it) }
+
+                GlobalMetaTable.deleteWhere { finalCondition }
+
+                metas
            }

-            val metas =
-                transaction {
-                    val keyCondition: Op<Boolean>? = keys?.takeIf { it.isNotEmpty() }?.let { GlobalMetaTable.key inList it }
-
-                    val prefixCondition: Op<Boolean>? =
-                        prefixes
-                            ?.filter { it.isNotEmpty() }
-                            ?.map { (GlobalMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
-
-                    val finalCondition =
-                        if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
-                        } else {
-                            keyCondition ?: prefixCondition!!
-                        }
-
-                    val metas =
-                        GlobalMetaTable
-                            .selectAll()
-                            .where { finalCondition }
-                            .map { GlobalMetaType(it) }
-
-                    GlobalMetaTable.deleteWhere { finalCondition }
-
-                    metas
-                }
-
-            DeleteGlobalMetasPayload(clientMutationId, metas)
-        }
+        return DeleteGlobalMetasPayload(clientMutationId, metas)
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt
+++ b/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
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SourceMutation.kt
+++ b/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)
+        Source.modifyMeta(meta.sourceId, meta.key, meta.value)

-            SetSourceMetaPayload(clientMutationId, meta)
-        }
+        return SetSourceMetaPayload(clientMutationId, meta)
    }

    data class DeleteSourceMetaInput(
@@ -70,38 +68,36 @@ 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 =
-                        SourceMetaTable
+        val (meta, source) =
+            transaction {
+                val meta =
+                    SourceMetaTable
+                        .selectAll()
+                        .where { (SourceMetaTable.ref eq sourceId) and (SourceMetaTable.key eq key) }
+                        .firstOrNull()
+
+                SourceMetaTable.deleteWhere { (SourceMetaTable.ref eq sourceId) and (SourceMetaTable.key eq key) }
+
+                val source =
+                    transaction {
+                        SourceTable
                            .selectAll()
-                            .where { (SourceMetaTable.ref eq sourceId) and (SourceMetaTable.key eq key) }
+                            .where { SourceTable.id eq sourceId }
                            .firstOrNull()
+                            ?.let { SourceType(it) }
+                    }

-                    SourceMetaTable.deleteWhere { (SourceMetaTable.ref eq sourceId) and (SourceMetaTable.key eq key) }
+                if (meta != null) {
+                    SourceMetaType(meta)
+                } else {
+                    null
+                } to source
+            }

-                    val source =
-                        transaction {
-                            SourceTable
-                                .selectAll()
-                                .where { SourceTable.id eq sourceId }
-                                .firstOrNull()
-                                ?.let { SourceType(it) }
-                        }
-
-                    if (meta != null) {
-                        SourceMetaType(meta)
-                    } else {
-                        null
-                    } to source
-                }
-
-            DeleteSourceMetaPayload(clientMutationId, meta, source)
-        }
+        return DeleteSourceMetaPayload(clientMutationId, meta, source)
    }

    data class SetSourceMetasItem(
@@ -121,43 +117,41 @@ 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 ->
-                        val metaMap = item.metas.associate { it.key to it.value }
-                        item.sourceIds.map { sourceId -> sourceId to metaMap }
-                    }.groupBy({ it.first }, { it.second })
-                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+        val metaBySourceId =
+            items
+                .flatMap { item ->
+                    val metaMap = item.metas.associate { it.key to it.value }
+                    item.sourceIds.map { sourceId -> sourceId to metaMap }
+                }.groupBy({ it.first }, { it.second })
+                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }

-            Source.modifySourceMetas(metaBySourceId)
+        Source.modifySourceMetas(metaBySourceId)

-            val allSourceIds = metaBySourceId.keys
-            val allMetaKeys = metaBySourceId.values.flatMap { it.keys }.distinct()
+        val allSourceIds = metaBySourceId.keys
+        val allMetaKeys = metaBySourceId.values.flatMap { it.keys }.distinct()

-            val (updatedMetas, sources) =
-                transaction {
-                    val updatedMetas =
-                        SourceMetaTable
-                            .selectAll()
-                            .where { (SourceMetaTable.ref inList allSourceIds) and (SourceMetaTable.key inList allMetaKeys) }
-                            .map { SourceMetaType(it) }
+        val (updatedMetas, sources) =
+            transaction {
+                val updatedMetas =
+                    SourceMetaTable
+                        .selectAll()
+                        .where { (SourceMetaTable.ref inList allSourceIds) and (SourceMetaTable.key inList allMetaKeys) }
+                        .map { SourceMetaType(it) }

-                    val sources =
-                        SourceTable
-                            .selectAll()
-                            .where { SourceTable.id inList allSourceIds }
-                            .mapNotNull { SourceType(it) }
-                            .distinctBy { it.id }
+                val sources =
+                    SourceTable
+                        .selectAll()
+                        .where { SourceTable.id inList allSourceIds }
+                        .mapNotNull { SourceType(it) }
+                        .distinctBy { it.id }

-                    updatedMetas to sources
-                }
+                updatedMetas to sources
+            }

-            SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
-        }
+        return SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
    }

    data class DeleteSourceMetasItem(
@@ -178,64 +172,62 @@ 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"
+        items.forEach { item ->
+            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                "Either 'keys' or 'prefixes' must be provided for each item"
+            }
+        }
+
+        val (allDeletedMetas, allSourceIds) =
+            transaction {
+                val deletedMetas = mutableListOf<SourceMetaType>()
+                val sourceIds = mutableSetOf<Long>()
+
+                items.forEach { item ->
+                    val keyCondition: Op<Boolean>? =
+                        item.keys?.takeIf { it.isNotEmpty() }?.let { SourceMetaTable.key inList it }
+
+                    val prefixCondition: Op<Boolean>? =
+                        item.prefixes
+                            ?.filter { it.isNotEmpty() }
+                            ?.map { (SourceMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                            ?.reduceOrNull { acc, op -> acc or op }
+
+                    val metaKeyCondition =
+                        if (keyCondition != null && prefixCondition != null) {
+                            keyCondition or prefixCondition
+                        } else {
+                            keyCondition ?: prefixCondition!!
+                        }
+
+                    val condition = (SourceMetaTable.ref inList item.sourceIds) and metaKeyCondition
+
+                    deletedMetas +=
+                        SourceMetaTable
+                            .selectAll()
+                            .where { condition }
+                            .map { SourceMetaType(it) }
+
+                    SourceMetaTable.deleteWhere { condition }
+                    sourceIds += item.sourceIds
                }
+
+                deletedMetas to sourceIds
            }

-            val (allDeletedMetas, allSourceIds) =
-                transaction {
-                    val deletedMetas = mutableListOf<SourceMetaType>()
-                    val sourceIds = mutableSetOf<Long>()
+        val sources =
+            transaction {
+                SourceTable
+                    .selectAll()
+                    .where { SourceTable.id inList allSourceIds }
+                    .mapNotNull { SourceType(it) }
+                    .distinctBy { it.id }
+            }

-                    items.forEach { item ->
-                        val keyCondition: Op<Boolean>? =
-                            item.keys?.takeIf { it.isNotEmpty() }?.let { SourceMetaTable.key inList it }
-
-                        val prefixCondition: Op<Boolean>? =
-                            item.prefixes
-                                ?.filter { it.isNotEmpty() }
-                                ?.map { (SourceMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                                ?.reduceOrNull { acc, op -> acc or op }
-
-                        val metaKeyCondition =
-                            if (keyCondition != null && prefixCondition != null) {
-                                keyCondition or prefixCondition
-                            } else {
-                                keyCondition ?: prefixCondition!!
-                            }
-
-                        val condition = (SourceMetaTable.ref inList item.sourceIds) and metaKeyCondition
-
-                        deletedMetas +=
-                            SourceMetaTable
-                                .selectAll()
-                                .where { condition }
-                                .map { SourceMetaType(it) }
-
-                        SourceMetaTable.deleteWhere { condition }
-                        sourceIds += item.sourceIds
-                    }
-
-                    deletedMetas to sourceIds
-                }
-
-            val sources =
-                transaction {
-                    SourceTable
-                        .selectAll()
-                        .where { SourceTable.id inList allSourceIds }
-                        .mapNotNull { SourceType(it) }
-                        .distinctBy { it.id }
-                }
-
-            DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
-        }
+        return DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
    }

    enum class FetchSourceMangaType {
@@ -260,50 +252,48 @@ 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) {
-                        FetchSourceMangaType.SEARCH -> {
-                            source.getSearchManga(
-                                page = page,
-                                query = query.orEmpty(),
-                                filters = updateFilterList(source, filters),
-                            )
-                        }
-
-                        FetchSourceMangaType.POPULAR -> {
-                            source.getPopularManga(page)
-                        }
-
-                        FetchSourceMangaType.LATEST -> {
-                            if (!source.supportsLatest) throw Exception("Source does not support latest")
-                            source.getLatestUpdates(page)
-                        }
+            val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
+            val mangasPage =
+                when (type) {
+                    FetchSourceMangaType.SEARCH -> {
+                        source.getSearchManga(
+                            page = page,
+                            query = query.orEmpty(),
+                            filters = updateFilterList(source, filters),
+                        )
                    }

-                val mangaIds = mangasPage.insertOrUpdate(sourceId)
-
-                val mangas =
-                    transaction {
-                        MangaTable
-                            .selectAll()
-                            .where { MangaTable.id inList mangaIds }
-                            .map { MangaType(it) }
-                    }.sortedBy {
-                        mangaIds.indexOf(it.id)
+                    FetchSourceMangaType.POPULAR -> {
+                        source.getPopularManga(page)
                    }

-                FetchSourceMangaPayload(
-                    clientMutationId = clientMutationId,
-                    mangas = mangas,
-                    hasNextPage = mangasPage.hasNextPage,
-                )
-            }
+                    FetchSourceMangaType.LATEST -> {
+                        if (!source.supportsLatest) throw Exception("Source does not support latest")
+                        source.getLatestUpdates(page)
+                    }
+                }
+
+            val mangaIds = mangasPage.insertOrUpdate(sourceId)
+
+            val mangas =
+                transaction {
+                    MangaTable
+                        .selectAll()
+                        .where { MangaTable.id inList mangaIds }
+                        .map { MangaType(it) }
+                }.sortedBy {
+                    mangaIds.indexOf(it.id)
+                }
+
+            FetchSourceMangaPayload(
+                clientMutationId = clientMutationId,
+                mangas = mangas,
+                hasNextPage = mangasPage.hasNextPage,
+            )
        }
    }

@@ -329,29 +319,27 @@ 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
-                    is CheckBoxPreference -> change.checkBoxState
-                    is EditTextPreference -> change.editTextState
-                    is ListPreference -> change.listState
-                    is MultiSelectListPreference -> change.multiSelectState?.toSet()
-                    else -> throw RuntimeException("sealed class cannot have more subtypes!")
-                } ?: throw Exception("Expected change to ${preference::class.simpleName}")
-            }
-
-            UpdateSourcePreferencePayload(
-                clientMutationId = clientMutationId,
-                preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) },
-                source =
-                    transaction {
-                        SourceType(SourceTable.selectAll().where { SourceTable.id eq sourceId }.first())!!
-                    },
-            )
+        Source.setSourcePreference(sourceId, change.position, "") { preference ->
+            when (preference) {
+                is SwitchPreferenceCompat -> change.switchState
+                is CheckBoxPreference -> change.checkBoxState
+                is EditTextPreference -> change.editTextState
+                is ListPreference -> change.listState
+                is MultiSelectListPreference -> change.multiSelectState?.toSet()
+                else -> throw RuntimeException("sealed class cannot have more subtypes!")
+            } ?: throw Exception("Expected change to ${preference::class.simpleName}")
        }
+
+        return UpdateSourcePreferencePayload(
+            clientMutationId = clientMutationId,
+            preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) },
+            source =
+                transaction {
+                    SourceType(SourceTable.selectAll().where { SourceTable.id eq sourceId }.first())!!
+                },
+        )
    }
 }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/TrackMutation.kt
+++ b/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,24 +223,22 @@ 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 {
-                        TrackRecordTable
-                            .selectAll()
-                            .where { TrackRecordTable.mangaId eq mangaId }
-                            .toList()
-                    }
-                TrackProgressPayload(
-                    clientMutationId,
-                    trackRecords.map { TrackRecordType(it) },
-                )
-            }
+            Track.trackChapter(mangaId)
+            val trackRecords =
+                transaction {
+                    TrackRecordTable
+                        .selectAll()
+                        .where { TrackRecordTable.mangaId eq mangaId }
+                        .toList()
+                }
+            TrackProgressPayload(
+                clientMutationId,
+                trackRecords.map { TrackRecordType(it) },
+            )
        }
    }

--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UpdateMutation.kt
+++ b/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,17 +37,15 @@ class UpdateMutation {
        )

        return future {
-            asDataFetcherResult {
-                UpdateLibraryPayload(
-                    input.clientMutationId,
-                    updateStatus =
-                        withTimeout(30.seconds) {
-                            LibraryUpdateStatus(
-                                updater.updates.first(),
-                            )
-                        },
-                )
-            }
+            UpdateLibraryPayload(
+                input.clientMutationId,
+                updateStatus =
+                    withTimeout(30.seconds) {
+                        LibraryUpdateStatus(
+                            updater.updates.first(),
+                        )
+                    },
+            )
        }
    }

@@ -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,15 +68,13 @@ class UpdateMutation {
        )

        return future {
-            asDataFetcherResult {
-                UpdateLibraryMangaPayload(
-                    input.clientMutationId,
-                    updateStatus =
-                        withTimeout(30.seconds) {
-                            UpdateStatus(updater.status.first())
-                        },
-                )
-            }
+            UpdateLibraryMangaPayload(
+                input.clientMutationId,
+                updateStatus =
+                    withTimeout(30.seconds) {
+                        UpdateStatus(updater.status.first())
+                    },
+            )
        }
    }

@@ -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,15 +98,13 @@ class UpdateMutation {
        )

        return future {
-            asDataFetcherResult {
-                UpdateCategoryMangaPayload(
-                    input.clientMutationId,
-                    updateStatus =
-                        withTimeout(30.seconds) {
-                            UpdateStatus(updater.status.first())
-                        },
-                )
-            }
+            UpdateCategoryMangaPayload(
+                input.clientMutationId,
+                updateStatus =
+                    withTimeout(30.seconds) {
+                        UpdateStatus(updater.status.first())
+                    },
+            )
        }
    }

--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/UserMutation.kt
+++ b/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
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/JavalinGraphQLRequestParser.kt
+++ b/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
        }
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLServer.kt
+++ b/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,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/Cursor.kt
+++ b/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()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/DurationAsString.kt
+++ b/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')",
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/primitives/LongAsString.kt
+++ b/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()
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionProtocolHandler.kt
+++ b/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
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/subscriptions/ApolloSubscriptionSessionState.kt
+++ b/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
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
+++ b/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 {
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/DocumentationDsl.kt
+++ b/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()
                        }
                    }
                }
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt
+++ b/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 = {
@@ -304,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()
Author	SHA1	Message	Date
Syer10	5561761020	Remove asDataFetcherResult	2026-05-10 12:32:24 -04:00
Syer10	a210153ed1	Fixes	2026-05-09 15:41:21 -04:00
Syer10	b40447c4f9	Update to the v10 alpha due to nullability issues in v9	2026-05-09 15:29:34 -04:00
renovate[bot]	193dd1ee84	Update graphqlkotlin to v9	2026-05-09 18:54:15 +00:00
renovate[bot]	6ee3348f50	Update javalin to v7 (major) (#1920 ) * 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>	2026-05-09 14:52:00 -04:00
renovate[bot]	c98899d501	Update plugin shadowjar to v8.3.10 (#2007 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 12:01:08 -04:00
renovate[bot]	7654653a25	Update plugin buildconfig to v6.0.9 (#2006 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 12:00:44 -04:00
renovate[bot]	0c1a0ef408	Update Gradle to v9.5.0 (#2004 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 12:00:30 -04:00
renovate[bot]	e7f2192579	Update plugin ktlint to v14.2.0 (#2005 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:59:40 -04:00
renovate[bot]	5c3b1e0b07	Update moko to v0.26.4 (#2003 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:58:02 -04:00
renovate[bot]	6ad59f2e2b	Update dex2jar to v2.4.36 (#2001 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:51:32 -04:00
renovate[bot]	03dd778fac	Update jte to v3.2.4 (#2002 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:50:46 -04:00
renovate[bot]	6b833a38d1	Update kotlinx-coroutines monorepo to v1.11.0 (#1995 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:47:26 -04:00
renovate[bot]	a83885353c	Update dependency com.typesafe:config to v1.4.8 (#1922 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:46:20 -04:00
renovate[bot]	10d7c7c06d	Update polyglot to v25 (#1651 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:45:53 -04:00
Shozikan	3b575271cb	Chore: Updated Moku's Description & Quick Spelling Fix (#1999 ) Corrected spelling of 'abandoned' and clarified Moku's server management capabilities.	2026-05-09 11:44:29 -04:00
renovate[bot]	5ad92413f3	Update GitHub Artifact Actions (#1986 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:44:11 -04:00
renovate[bot]	7fbdb39319	Update dependency io.github.oshai:kotlin-logging-jvm to v8.0.02 (#1983 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:44:02 -04:00
renovate[bot]	92abdf7fb7	Update dependency com.auth0:java-jwt to v4.5.2 (#1980 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:43:47 -04:00
renovate[bot]	ea0c666cfe	Update dependency com.android.tools.build:apksig to v9.2.1 (#1984 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:43:36 -04:00
renovate[bot]	b5e395a039	Update dependency com.ibm.icu:icu4j to v78.3 (#1985 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:43:25 -04:00
renovate[bot]	e530072a07	Update softprops/action-gh-release action to v3 (#1987 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:43:14 -04:00
renovate[bot]	f85cbe1ca5	Update dependency org.jsoup:jsoup to v1.22.2 (#1988 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:43:04 -04:00
renovate[bot]	5f9126eb2f	Update dependency org.postgresql:postgresql to v42.7.11 (#1989 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:42:53 -04:00
renovate[bot]	d77c57ede0	Update dependency androidx.annotation:annotation to v1.10.0 (#1990 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:42:43 -04:00
renovate[bot]	02f9a0d1d7	Update dependency androidx.annotation:annotation to v1.10.0 (#1990 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:42:36 -04:00
renovate[bot]	53192f56ca	Update serialization to v1.11.0 (#1996 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:42:23 -04:00
renovate[bot]	01d89cbb48	Update dependency org.bouncycastle:bcprov-jdk18on to v1.84 (#1994 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:42:04 -04:00
renovate[bot]	be55cb974b	Update dependency io.insert-koin:koin-core to v4.2.1 (#1993 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:41:49 -04:00
renovate[bot]	34c394ed19	Update dependency com.squareup.okio:okio to v3.17.0 (#1992 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:41:39 -04:00
renovate[bot]	1433a21abd	Update graphqlkotlin to v8.9.0 (#1981 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-09 11:41:33 -04:00
renovate[bot]	ec28794655	Update kotlin to v2.3.21 (#1991 ) * Update kotlin to v2.3.21 * Context Parameters * Use new format * Lint --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Syer10 <syer10@users.noreply.github.com>	2026-05-09 11:41:27 -04:00
Syer10	72122b7cbf	[skip ci] Update Changelog	2026-05-08 17:32:44 -04:00
renovate[bot]	392a7990d2	Update dependency com.github.junrar:junrar to v7.5.10 (#1926 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-08 17:30:48 -04:00
schroda	0bdcf8b4ba	Handle serving non-default webui with "bundled" channel (#1924 ) Channel "bundled" only works with the default webui. So force change the flavor and log a warning for information	2026-05-08 17:30:42 -04:00
renovate[bot]	8295440bfd	Update twelvemonkeys to v3.13.1 (#1919 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-08 17:30:36 -04:00
Syer10	e52aa6daf4	[skip ci] Fix WebUI changelog link	2026-05-08 16:52:34 -04:00
Syer10	ef067ef5b9	Release v2.2.2100	2026-05-08 16:48:27 -04:00