Lint

.editorconfig

@@ -11,8 +11,4 @@ ktlint_standard_if-else-wrapping=disabled
 ktlint_standard_no-consecutive-comments=disabled
 
 [**/generated/**]
-ktlint=disabled
+ktlint=disabled
-
-[*.json]
-indent_size=2
-indent_style = space

.github/workflows/build_pull_request.yml

@@ -67,7 +67,7 @@ jobs:
           export LD_PRELOAD="$(pwd)/scripts/resources/catch_abort.so"
           JAR=$(ls ./server/build/*.jar| head -1)
           set +e
-          timeout 30s java \
+          timeout 30s java -DcrashOnFailedMigration=true \
               -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false \
               -Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false \
               -Dsuwayomi.tachidesk.config.server.databaseType=POSTGRESQL \
@@ -83,7 +83,7 @@ jobs:
             exit "$ecode"
           fi
 
-          timeout 30s java \
+          timeout 30s java -DcrashOnFailedMigration=true \
               -Dsuwayomi.tachidesk.config.server.systemTrayEnabled=false \
               -Dsuwayomi.tachidesk.config.server.initialOpenInBrowserEnabled=false \
               -jar "$JAR"
@@ -96,10 +96,6 @@ jobs:
           fi
           exit 0
 
-      - name: "Run tests"
-        working-directory: master
-        run: ./gradlew test --stacktrace
-
   check_docs:
     name: Validate that all options are documented
     runs-on: ubuntu-latest

.github/workflows/build_push.yml

@@ -54,14 +54,14 @@ jobs:
         run: ./gradlew :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         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@v7
+        uses: actions/upload-artifact@v6
         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@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}-jre
           path: suwa
@@ -134,26 +134,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
           name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: scripts
 
@@ -164,7 +164,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
       - name: Upload ${{ matrix.name }} release
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}
           path: upload/*
@@ -174,35 +174,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: appimage
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: windows-x64
           path: release
@@ -240,7 +240,7 @@ jobs:
           git push origin $TAG
 
       - name: Upload Preview Release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.DEPLOY_PREVIEW_TOKEN }}
           repository: "Suwayomi/Suwayomi-Server-preview"

.github/workflows/publish.yml

@@ -56,14 +56,14 @@ jobs:
         run: ./gradlew :server:downloadWebUI :server:shadowJar --stacktrace
 
       - name: Upload Jar
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: jar
           path: master/server/build/*.jar
           if-no-files-found: error
 
       - name: Upload icons
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         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@v7
+        uses: actions/upload-artifact@v6
         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@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}-jre
           path: suwa
@@ -136,26 +136,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Jar
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: jar
           path: server/build
 
       - name: Download JRE
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         if: matrix.name != 'linux-assets' && matrix.name != 'debian-all'
         with:
           name: ${{ matrix.jre }}-jre
           path: jre
 
       - name: Download icons
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: icon
           path: server/src/main/resources/icon
 
       - name: Download scripts.tar.gz
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           name: scripts
 
@@ -166,7 +166,7 @@ jobs:
           scripts/bundler.sh -o upload/ ${{ matrix.name }}
 
       - name: Upload ${{ matrix.name }} files
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.name }}
           path: upload/*
@@ -177,35 +177,35 @@ jobs:
     needs: bundle
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: jar
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: debian-all
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: appimage
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-assets
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: linux-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-x64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: macOS-arm64
           path: release
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v7
         with:
           name: windows-x64
           path: release
@@ -214,7 +214,7 @@ jobs:
         run: cd release && sha256sum * > Checksums.sha256
 
       - name: Release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
         with:
           token: ${{ secrets.DEPLOY_RELEASE_TOKEN }}
           draft: true

.github/workflows/wiki.yml

@@ -1,7 +1,6 @@
 name: GitHub Wiki upload
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - master
@@ -24,8 +23,6 @@ jobs:
         with:
           repository: ${{github.repository}}
           path: ${{github.repository}}
-          fetch-depth: 0 # fetch history & tags to determine stable version
-          fetch-tags: true
 
       - name: Checkout Wiki
         uses: actions/checkout@v6
@@ -38,13 +35,6 @@ jobs:
           set -e
           cd $GITHUB_WORKSPACE/${{github.repository}}.wiki
           cp -r $GITHUB_WORKSPACE/${{github.repository}}/docs/* .
-          
-          stable="$(git -C $GITHUB_WORKSPACE/${{github.repository}} describe --abbrev=0 --tags)"
-          if ! git -C $GITHUB_WORKSPACE/${{github.repository}} log --exit-code --pretty= "$stable.." -- docs/Configuring-Suwayomi‐Server.md; then
-            echo "Changes to config detected, embedding link to stable"
-            sed -i '1s/^/> [!WARNING]\n> This document describes the settings available in the preview version. Please head to ['$stable'](https:\/\/github.com\/Suwayomi\/Suwayomi-Server\/blob\/'$stable'\/docs\/Configuring-Suwayomi%E2%80%90Server.md) for the current stable version\n\n/' Configuring-Suwayomi‐Server.md
-          fi
-          
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add .

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/SafePath.kt

@@ -9,9 +9,6 @@ package xyz.nulldev.androidcompat.util
 
 // adopted from: https://github.com/tachiyomiorg/tachiyomi/blob/4cefbce7c34e724b409b6ba127f3c6c5c346ad8d/app/src/main/java/eu/kanade/tachiyomi/util/storage/DiskUtil.kt
 object SafePath {
-    private const val MAX_FILENAME_CHARS = 240
-    private const val MAX_FILENAME_UTF8_BYTES = 240
-
     /**
      * Mutate the given filename to make it valid for a FAT filesystem,
      * replacing any invalid characters with "_". This method doesn't allow hidden files (starting
@@ -30,41 +27,11 @@ object SafePath {
                 sb.append('_')
             }
         }
-
+        // Even though vfat allows 255 UCS-2 chars, we might eventually write to
-        return truncateFilename(sb.toString())
+        // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
+        return sb.toString().take(240)
     }
 
-    private fun truncateFilename(filename: String): String {
-        // Keep a safety margin under common filesystem limits and satisfy both
-        // character count and UTF-8 byte-length constraints.
-        val output = StringBuilder(minOf(filename.length, MAX_FILENAME_CHARS))
-        var usedBytes = 0
-        var index = 0
-
-        while (index < filename.length && output.length < MAX_FILENAME_CHARS) {
-            val codePoint = Character.codePointAt(filename, index)
-            val codePointBytes = utf8ByteCount(codePoint)
-
-            if (usedBytes + codePointBytes > MAX_FILENAME_UTF8_BYTES) {
-                break
-            }
-
-            output.appendCodePoint(codePoint)
-            usedBytes += codePointBytes
-            index += Character.charCount(codePoint)
-        }
-
-        return output.toString()
-    }
-
-    private fun utf8ByteCount(codePoint: Int): Int =
-        when {
-            codePoint <= 0x7f -> 1
-            codePoint <= 0x7ff -> 2
-            codePoint <= 0xffff -> 3
-            else -> 4
-        }
-
     /**
      * Returns true if the given character is a valid filename character, false otherwise.
      */

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CefHelper.kt

@@ -1,47 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.first
-import org.cef.CefApp
-import org.cef.CefClient
-
-private val logger = KotlinLogging.logger {}
-
-object CefHelper {
-    val cefApp = MutableStateFlow<Result<CefApp?>>(Result.success(null))
-
-    suspend fun createClient(): CefClient {
-        val app = waitForInit().first()
-        val client = app.createClient()
-        JsHandler(client) // This adds itself to a global map
-        return client
-    }
-
-    fun waitForInit() =
-        callbackFlow {
-            val app = cefApp.first { it.isFailure || it.getOrThrow() != null }.getOrThrow()!!
-            app.onInitialization {
-                logger.debug { "CEF: Initialization state $it" }
-                when (it) {
-                    CefApp.CefAppState.INITIALIZED -> {
-                        trySend(app)
-                        close()
-                    }
-
-                    CefApp.CefAppState.SHUTTING_DOWN, CefApp.CefAppState.TERMINATED -> {
-                        close(CefException("Shutting down"))
-                    }
-
-                    else -> {}
-                }
-            }
-            awaitClose {}
-        }
-
-    class CefException(
-        msg: String,
-    ) : Exception(msg)
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefHelper.kt

@@ -1,136 +0,0 @@
-package xyz.nulldev.androidcompat.webkit
-
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.cef.CefClient
-import org.cef.browser.CefBrowser
-import org.cef.browser.CefFrame
-import org.cef.browser.CefMessageRouter
-import org.cef.callback.CefQueryCallback
-import org.cef.handler.CefMessageRouterHandlerAdapter
-import kotlin.random.Random
-
-private val logger = KotlinLogging.logger {}
-private val jsHandler: MutableMap<CefClient, JsHandler> = mutableMapOf()
-
-fun CefBrowser.evaluateJavaScript(
-    expression: String,
-    cb: (String?) -> Unit,
-) = jsHandler[this.client]!!.eval(this, expression, cb)
-
-fun CefBrowser.dispose() {
-    stopLoad()
-    setCloseAllowed()
-    close(true)
-}
-
-class JsHandler : CefMessageRouterHandlerAdapter {
-    private val handler: MutableMap<String, (String?) -> Unit> = mutableMapOf()
-
-    constructor(client: CefClient) {
-        val config = CefMessageRouter.CefMessageRouterConfig()
-        config.jsQueryFunction = QUERY_FN
-        config.jsCancelFunction = QUERY_CANCEL_FN
-        client.addMessageRouter(CefMessageRouter.create(config, this))
-        jsHandler[client] = this
-    }
-
-    fun eval(
-        frame: CefFrame,
-        expression: String,
-        cb: (String?) -> Unit,
-    ) {
-        val id = Random.nextBytes(48).toHexString()
-        handler[id] = cb
-        frame.executeJavaScript(expression.toCode(id), "about:cef", 0)
-    }
-
-    fun eval(
-        browser: CefBrowser,
-        expression: String,
-        cb: (String?) -> Unit,
-    ) {
-        val id = Random.nextBytes(48).toHexString()
-        handler[id] = cb
-        browser.executeJavaScript(expression.toCode(id), "about:cef", 0)
-    }
-
-    override fun onQuery(
-        browser: CefBrowser?,
-        frame: CefFrame?,
-        queryId: Long,
-        request: String?,
-        persistent: Boolean,
-        callback: CefQueryCallback?,
-    ): Boolean {
-        super.onQuery(browser, frame, queryId, request, persistent, callback)
-
-        if (request != null) {
-            val invoke =
-                try {
-                    Json.decodeFromString<FunctionCall>(request)
-                } catch (e: Exception) {
-                    logger.warn(e) { "Invalid request received" }
-                    return false
-                }
-            val handler = handler.remove(invoke.id) ?: return false
-            handler(invoke.result)
-            callback?.success("")
-            return true
-        }
-
-        return false
-    }
-
-    @Serializable
-    private data class FunctionCall(
-        val id: String,
-        val result: String? = null,
-    )
-
-    companion object {
-        const val QUERY_FN = "__\$_evalQuery"
-        const val QUERY_CANCEL_FN = "__\$_evalQueryCancel"
-
-        private fun Char.isLineBreak(): Boolean = this == '\n' || this == '\r'
-
-        private fun String.containsLineBreak(): Boolean =
-            this.any {
-                it.isLineBreak()
-            }
-
-        private fun String.asFunctionBody(): String =
-            let { expression ->
-                when {
-                    expression.containsLineBreak() -> expression
-                    expression.trim().startsWith("return", false) -> expression
-                    else -> "return $expression"
-                }
-            }
-
-        private fun String.toCode(id: String): String =
-            """
-            function payload() {
-              ${this.asFunctionBody()}
-            }
-
-            try {
-              var result = payload();
-
-              window.${QUERY_FN}({
-                  request: JSON.stringify({ id: "$id", result }),
-                  onSuccess: function (response) {},
-                  onFailure: function (error_code, error_message) {}
-              });
-            } catch (e) {
-              console.error("Failed to eval $id", e)
-              window.${QUERY_CANCEL_FN}({
-                  request: JSON.stringify({ id: "$id", error: ""+e }),
-                  onSuccess: function (response) {},
-                  onFailure: function (error_code, error_message) {}
-              });
-            }
-            """.trimIndent()
-    }
-}

AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/KcefWebViewProvider.kt

@@ -51,10 +51,12 @@ import android.webkit.WebViewProvider.ScrollDelegate
 import android.webkit.WebViewProvider.ViewDelegate
 import android.webkit.WebViewRenderProcess
 import android.webkit.WebViewRenderProcessClient
-import kotlinx.coroutines.runBlocking
+import dev.datlag.kcef.KCEF
+import dev.datlag.kcef.KCEFBrowser
+import dev.datlag.kcef.KCEFClient
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import org.cef.CefClient
 import org.cef.CefSettings
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
@@ -68,7 +70,6 @@ import org.cef.handler.CefLoadHandler
 import org.cef.handler.CefLoadHandlerAdapter
 import org.cef.handler.CefMessageRouterHandlerAdapter
 import org.cef.handler.CefPermissionHandler
-import org.cef.handler.CefRenderHandlerAdapter
 import org.cef.handler.CefRequestHandler
 import org.cef.handler.CefRequestHandlerAdapter
 import org.cef.handler.CefResourceHandler
@@ -83,14 +84,12 @@ import org.cef.network.CefPostDataElement
 import org.cef.network.CefRequest
 import org.cef.network.CefResponse
 import org.koin.mp.KoinPlatformTools
-import java.awt.Rectangle
 import java.io.BufferedWriter
 import java.io.File
 import java.io.IOException
-import java.nio.ByteBuffer
 import java.util.concurrent.Executor
-import javax.swing.JPanel
+import kotlin.collections.Map
-import kotlin.math.min
+import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberFunctions
 import kotlin.reflect.jvm.javaMethod
@@ -101,13 +100,12 @@ class KcefWebViewProvider(
     private val settings = KcefWebSettings()
     private var viewClient = WebViewClient()
     private var chromeClient = WebChromeClient()
-    private val renderHandler = RenderHandler()
     private val mappings: MutableList<FunctionMapping> = mutableListOf()
     private val urlHttpMapping: MutableMap<String, String> = mutableMapOf()
     private var initialRequestData: InitialRequestData? = null
 
-    private var kcefClient: CefClient? = null
+    private var kcefClient: KCEFClient? = null
-    private var browser: CefBrowser? = null
+    private var browser: KCEFBrowser? = null
 
     private val handler = Handler(view.webViewLooper)
 
@@ -119,8 +117,8 @@ class KcefWebViewProvider(
         private val initHandler: InitBrowserHandler by KoinPlatformTools.defaultContext().get().inject()
     }
 
-    interface InitBrowserHandler {
+    public interface InitBrowserHandler {
-        fun init(provider: KcefWebViewProvider): Unit
+        public fun init(provider: KcefWebViewProvider): Unit
     }
 
     private data class InitialRequestData(
@@ -196,7 +194,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class DisplayHandler : CefDisplayHandlerAdapter() {
+    private inner class DisplayHandler : CefDisplayHandlerAdapter() {
         override fun onConsoleMessage(
             browser: CefBrowser,
             level: CefSettings.LogSeverity,
@@ -224,7 +222,6 @@ class KcefWebViewProvider(
         }
     }
 
-    @Suppress("DEPRECATION")
     private inner class LoadHandler : CefLoadHandlerAdapter() {
         override fun onLoadEnd(
             browser: CefBrowser,
@@ -371,7 +368,7 @@ class KcefWebViewProvider(
             callback: CefCallback,
         ): Boolean {
             val data = resolvedData ?: return false
-            val bytesToTransfer = min(bytesToRead, data.size - readOffset)
+            val bytesToTransfer = Math.min(bytesToRead, data.size - readOffset)
             Log.v(
                 TAG,
                 "readResponse: $readOffset/${data.size}, reading $bytesToRead->$bytesToTransfer",
@@ -383,7 +380,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class WebResponseResourceHandler(
+    private inner class WebResponseResourceHandler(
         val webResponse: WebResourceResponse,
     ) : ArrayResponseResourceHandler() {
         override fun processRequest(
@@ -413,7 +410,7 @@ class KcefWebViewProvider(
         }
     }
 
-    private class HtmlResponseResourceHandler(
+    private inner class HtmlResponseResourceHandler(
         val html: String,
     ) : ArrayResponseResourceHandler() {
         override fun processRequest(
@@ -444,7 +441,7 @@ class KcefWebViewProvider(
                     view,
                     CefWebResourceRequest(request, frame, false),
                 )
-            Log.v(TAG, "Resource ${request.url}, result is cancel? $cancel")
+            Log.v(TAG, "Resource ${request?.url}, result is cancel? $cancel")
 
             handler.post { viewClient.onLoadResource(view, frame?.url) }
 
@@ -471,7 +468,7 @@ class KcefWebViewProvider(
                 }
             if (response == null) {
                 // prefer user's response override
-                urlHttpMapping[request.url.trimEnd('/')]?.let {
+                urlHttpMapping.get(request.url.trimEnd('/'))?.let {
                     return HtmlResponseResourceHandler(it)
                 }
             }
@@ -480,7 +477,6 @@ class KcefWebViewProvider(
         }
     }
 
-    @Suppress("DEPRECATION")
     private inner class RequestHandler : CefRequestHandlerAdapter() {
         override fun getResourceRequestHandler(
             browser: CefBrowser,
@@ -490,13 +486,11 @@ class KcefWebViewProvider(
             isDownload: Boolean,
             requestInitiator: String,
             disableDefaultHandling: BoolRef,
-        ): CefResourceRequestHandler = ResourceRequestHandler()
+        ): CefResourceRequestHandler? = ResourceRequestHandler()
 
         override fun onRenderProcessTerminated(
             browser: CefBrowser,
             status: CefRequestHandler.TerminationStatus,
-            errorCode: Int,
-            errorString: String,
         ) {
             handler.post {
                 viewClient.onRenderProcessGone(
@@ -515,33 +509,18 @@ class KcefWebViewProvider(
         override fun onRequestMediaAccessPermission(
             browser: CefBrowser,
             frame: CefFrame,
-            requestingUrl: String,
+            requesting_url: String,
-            requestedPermissions: Int,
+            requested_permissions: Int,
             callback: CefMediaAccessCallback,
         ): Boolean {
             handler.post {
-                Log.v(TAG, "Checking permission for $requestingUrl: $requestedPermissions")
+                Log.v(TAG, "Checking permission for $requesting_url: $requested_permissions")
-                chromeClient.onPermissionRequest(CefPermissionRequest(requestingUrl, requestedPermissions, callback))
+                chromeClient.onPermissionRequest(CefPermissionRequest(requesting_url, requested_permissions, callback))
             }
             return true
         }
     }
 
-    private class RenderHandler : CefRenderHandlerAdapter() {
-        override fun getViewRect(browser: CefBrowser): Rectangle = Rectangle(0, 0, 1280, 2856)
-
-        override fun onPaint(
-            browser: CefBrowser,
-            popup: Boolean,
-            dirtyRects: Array<Rectangle>,
-            buffer: ByteBuffer,
-            width: Int,
-            height: Int,
-        ) {
-            // do nothing
-        }
-    }
-
     override fun init(
         javaScriptInterfaces: Map<String, Any>?,
         privateBrowsing: Boolean,
@@ -549,18 +528,16 @@ class KcefWebViewProvider(
         Log.v(TAG, "KcefWebViewProvider: initialize")
         destroy()
         kcefClient =
-            runBlocking {
+            KCEF.newClientBlocking().apply {
-                CefHelper.createClient().apply {
+                addDisplayHandler(DisplayHandler())
-                    addDisplayHandler(DisplayHandler())
+                addLoadHandler(LoadHandler())
-                    addLoadHandler(LoadHandler())
+                addRequestHandler(RequestHandler())
-                    addRequestHandler(RequestHandler())
+                addPermissionHandler(PermissionHandler())
-                    addPermissionHandler(PermissionHandler())
 
-                    val config = CefMessageRouter.CefMessageRouterConfig()
+                val config = CefMessageRouter.CefMessageRouterConfig()
-                    config.jsQueryFunction = QUERY_FN
+                config.jsQueryFunction = QUERY_FN
-                    config.jsCancelFunction = QUERY_CANCEL_FN
+                config.jsCancelFunction = QUERY_CANCEL_FN
-                    addMessageRouter(CefMessageRouter.create(config, MessageRouterHandler()))
+                addMessageRouter(CefMessageRouter.create(config, MessageRouterHandler()))
-                }
             }
         initHandler.init(this)
     }
@@ -637,8 +614,7 @@ class KcefWebViewProvider(
             kcefClient!!
                 .createBrowser(
                     loadUrl,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
-                    false,
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events
                     createImmediately()
@@ -662,8 +638,7 @@ class KcefWebViewProvider(
             kcefClient!!
                 .createBrowser(
                     url,
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    CefRendering.OFFSCREEN,
-                    false,
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events
                     createImmediately()
@@ -689,19 +664,27 @@ class KcefWebViewProvider(
         browser?.close(true)
         browser?.dispose()
         chromeClient.onProgressChanged(view, 0)
-        val url = baseUrl ?: "about:blank"
-        urlHttpMapping[url.trimEnd('/')] = data
 
         browser =
-            kcefClient!!
+            (
-                .createBrowser(
+                baseUrl?.let { url ->
-                    url,
+                    urlHttpMapping.put(url.trimEnd('/'), data)
-                    CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
+                    kcefClient!!.createBrowser(
-                    false,
+                        url,
-                ).apply {
+                        CefRendering.OFFSCREEN,
-                    // NOTE: Without this, we don't seem to be receiving any events
+                    )
-                    createImmediately()
                 }
+                    ?: run {
+                        kcefClient!!.createBrowserWithHtml(
+                            data,
+                            KCEFBrowser.BLANK_URI,
+                            CefRendering.OFFSCREEN,
+                        )
+                    }
+            ).apply {
+                // NOTE: Without this, we don't seem to be receiving any events
+                createImmediately()
+            }
         Log.d(TAG, "Page loaded from data at base URL $baseUrl")
     }
 
@@ -711,11 +694,11 @@ class KcefWebViewProvider(
     ) {
         browser!!.evaluateJavaScript(
             script.removePrefix("javascript:"),
-        )
             {
                 Log.v(TAG, "JS returned: $it")
                 it?.let { handler.post { resultCallback?.onReceiveValue(it) } }
-            }
+            },
+        )
     }
 
     override fun saveWebArchive(filename: String): Unit = throw RuntimeException("Stub!")
@@ -795,23 +778,15 @@ class KcefWebViewProvider(
 
     override fun getContentWidth(): Int = throw RuntimeException("Stub!")
 
-    override fun pauseTimers() {
+    override fun pauseTimers(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "pauseTimers: doing nothing")
-    }
 
-    override fun resumeTimers() {
+    override fun resumeTimers(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "resumeTimers: doing nothing")
-    }
 
-    override fun onPause() {
+    override fun onPause(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "onPause: doing nothing")
-    }
 
-    override fun onResume() {
+    override fun onResume(): Unit = throw RuntimeException("Stub!")
-        Log.v(TAG, "onResume: doing nothing")
-    }
 
-    override fun isPaused(): Boolean = false
+    override fun isPaused(): Boolean = throw RuntimeException("Stub!")
 
     override fun freeMemory(): Unit = throw RuntimeException("Stub!")
 
@@ -865,7 +840,6 @@ class KcefWebViewProvider(
 
     override fun getWebChromeClient(): WebChromeClient = chromeClient
 
-    @Suppress("DEPRECATION")
     override fun setPictureListener(listener: PictureListener): Unit = throw RuntimeException("Stub!")
 
     @Serializable
@@ -888,7 +862,7 @@ class KcefWebViewProvider(
         obj: Any,
         interfaceName: String,
     ) {
-        val cls = obj::class
+        val cls = obj::class as KClass<Any>
         mappings.addAll(
             cls.declaredMemberFunctions.map {
                 // This is ridiculous, but necessary, otherwise "public final" throws
@@ -950,8 +924,7 @@ class KcefWebViewProvider(
     override fun getRendererPriorityWaivedWhenNotVisible(): Boolean = throw RuntimeException("Stub!")
 
     @SuppressWarnings("unused")
-    override fun setTextClassifier(textClassifier: TextClassifier?) {
+    override fun setTextClassifier(textClassifier: TextClassifier?) {}
-    }
 
     override fun getTextClassifier(): TextClassifier = TextClassifier.NO_OP
 
@@ -977,13 +950,11 @@ class KcefWebViewProvider(
         override fun onProvideAutofillVirtualStructure(
             @SuppressWarnings("unused") structure: android.view.ViewStructure,
             @SuppressWarnings("unused") flags: Int,
-        ) {
+        ) {}
-        }
 
         override fun autofill(
             @SuppressWarnings("unused") values: SparseArray<AutofillValue>,
-        ) {
+        ) {}
-        }
 
         override fun isVisibleToUserForAutofill(
             @SuppressWarnings("unused") virtualId: Int,
@@ -994,8 +965,7 @@ class KcefWebViewProvider(
         override fun onProvideContentCaptureStructure(
             @SuppressWarnings("unused") structure: android.view.ViewStructure,
             @SuppressWarnings("unused") flags: Int,
-        ) {
+        ) {}
-        }
 
         override fun getAccessibilityNodeProvider(): AccessibilityNodeProvider = throw RuntimeException("Stub!")
 
@@ -1065,8 +1035,7 @@ class KcefWebViewProvider(
         override fun onMovedToDisplay(
             displayId: Int,
             config: Configuration,
-        ) {
+        ) {}
-        }
 
         override fun onVisibilityChanged(
             changedView: View,

CHANGELOG.md

@@ -7,30 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ## [Unreleased] (Preview)
 
 ### Added
-- (**Sync**) Added [SyncYomi](https://github.com/syncyomi/syncyomi) support
+- .
-- (**OPDS**) Add option to skip chapter metadata feed providing direct stream/download links
 
 ### Changed
-- (**Database/H2**) Use the latest H2 database engine
+- .
-- (**Startup**) Crash on startup if an unrecoverable error happens
-- (**WebView**) Use JCEF directly and update to newest Chromium
-- (**Extension/Android**) Switch MessageQueue to LegacyMessageQueue from ConcurrentMessageQueue
 
 ### Fixed
-- (**CloudFlareInterceptor**) Don't send the `cf_clearance` cookie back to Flaresolverr
+- (WebUI) Handle serving non-default webui with "bundled"
-- (**WebUI**) Handle serving non-default webui with "bundled"
-- (**WebUI**) Wait until WebUI is ready to open in browser
-- (**Downloads**) Truncate filenames by byte length to prevent "File name too long" IO errors
-- (**Downloads**) Fix being unable to find downloads after manga was renamed during an update
-- (**Downloads**) Fix preserving chapter download states during an update
-- (**Extension**) Do not indicate an update is available when the extension is not installed
-- (**Chapter**) Fix losing chapter data on failed chapter list update
-- (**Chapter**) Fix database error when fetching chapter updates
-- (**Manga/API**) Fix "mangas" graphql query with active sorting and using a PostgreSQL database (QUERY "mangas")
-- (**API**) Fix GraphQL `Filter` `notAll` and `notAny` being inversed
-- (**API**) Fix GraphQL `Filter` causing an UnsupportedOperationException when passing an empty list as a `Any` filter value
-- (**Build**) Fix CURL failing silently in builds
-- (**Backup/Database**) Fix backup creation slowdown when mapping chapters
 
 ## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08
 

README.md

@@ -8,7 +8,7 @@
   - [Features](#features)
 - [Suwayomi client projects](#suwayomi-client-projects)
   - [Integrated clients](#integrated-clients)
-  - [Other clients](#other-clients-potentially-inactive-or-abandoned)
+  - [Other clients](#other-clients-potentially-inactive-or-abondend)
 - [Downloading and Running the app](#downloading-and-running-the-app)
   - [Using Operating System Specific Bundles](#using-operating-system-specific-bundles)
     - [Windows](#windows)
@@ -76,13 +76,12 @@ 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 abandoned)
+##### Other clients (potentially inactive or abondend)
 - [Tachidesk-VaadinUI](https://github.com/Suwayomi/Tachidesk-VaadinUI): Desktop app (windows, linux, mac); UI in the browser, manages its own suwayomi server instance
-- [Moku](https://github.com/Youwes09/Moku): Desktop app (windows, linux, mac), can manage its own suwayomi server instance
+- [Moku](https://github.com/Youwes09/Moku): Desktop app (windows, linux, mac), requires access to a running server
 - [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
-- [Suwayomi Client for KOReader](https://github.com/LK4D4/suwayomi.koplugin): KOReader plugin; works anywhere KOReader can run (Android, Kindle, Kobo, etc.); requires access to a running server
 
 # Downloading and Running the app
 ## Using Operating System Specific Bundles
@@ -107,21 +106,22 @@ Download the latest `linux-x64`(x86_64) release from [the releases section](http
 
 #### WebView support (GNU/Linux)
 
-WebView support is implemented via [JCEF](https://github.com/JetBrains/jcef).
+WebView support is implemented via [KCEF](https://github.com/DATL4G/KCEF).
 This is optional, and is only necessary to support some extensions.
 
-To have a functional WebView, some X11 dependencies are required for rendering Chromium.
+To have a functional WebView, several dependencies are required; aside from X11 libraries necessary for rendering Chromium, some JNI bindings are necessary: gluegen and jogl (found in Ubuntu as `libgluegen2-jni` and `libjogl2-jni`).
-These include `libxrender`, `libxcomposite` `libxdamage`, `libxkbcommon` and `libxtst`.
+Note that on some systems (e.g. Ubuntu), the JNI libraries are not automatically found, see below.
 
-A CEF server is launched on startup, which loads the X11 libraries.
+A KCEF server is launched on startup, which loads the X11 libraries.
 If those are missing, you should see "Could not load 'jcef' library".
 If so, use `ldd ~/.local/share/Tachidesk/bin/kcef/libjcef.so | grep not` to figure out which libraries are not found on your system.
 
-Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.
+The JNI bindings are only loaded when a browser is actually launched.
+This is done by extensions that rely on WebView, not by Suwayomi itself.
+If there is a problem loading the JNI libraries, you should see a message indicating the library and the search path.
+This search path includes the current working directory, if you do not want to modify system directories.
 
-Note that it is required to have an X session active and available to Suwayomi (i.e. `DISPLAY` is set).
+Refer to the [Dockerfile](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/Dockerfile) for more details.
-It is not enough to have `WAYLAND_DISPLAY`, if your environment does not provide xwayland (or if you run Suwayomi as a service), you need to use a tool like [`Xvfb`](https://en.wikipedia.org/wiki/Xvfb).
-The Dockerfile linked above also does this.
 
 ## Other methods of getting Suwayomi
 ### Docker

build.gradle.kts

@@ -25,7 +25,6 @@ allprojects {
         maven("https://github.com/Suwayomi/Suwayomi-Server/raw/android-jar/")
         maven("https://jitpack.io")
         maven("https://jogamp.org/deployment/maven")
-        maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
     }
 }
 

buildSrc/src/main/kotlin/Constants.kt

@@ -14,8 +14,6 @@ val getTachideskVersion = { "v2.2.${getCommitCount()}" }
 
 val webUIRevisionTag = "r3136"
 
-val webviewJbrRelease = "jbr-release-25.0.3b508.4"
-
 private val getCommitCount = {
     runCatching {
         ProcessBuilder()

docs/Configuring-Suwayomi‐Server.md

@@ -63,14 +63,6 @@ server.webUISubpath = ""
 - `server.webUIUpdateCheckInterval` the interval time in hours at which to check for updates. Use `0` to disable update checking.
 - `server.webUISubpath` controls on which sub-path the UI is served; by default, it will be accessible on `/` (i.e. directly), with this setting it can also be set to appear at e.g. `/suwayomi`
 
-
-### webView
-```
-server.kcefEnabled = true
-```
-- `server.kcefEnabled` controls if KCEF WebView provider is enabled.
-
-
 ### Downloader
 ```
 server.downloadAsCbz = true
@@ -232,7 +224,6 @@ server.opdsShowOnlyUnreadChapters = false
 server.opdsShowOnlyDownloadedChapters = false
 server.opdsChapterSortOrder = "DESC"
 server.opdsCbzMimetype = "MODERN"
-server.opdsSkipChapterMetadataFeed = false
 ```
 - `server.opdsUseBinaryFileSizes = false` controls if Suwayomi should display file sizes in binary units (KiB, MiB, GiB) or decimal (KB, MB, GB) in OPDS listings.
 - `server.opdsItemsPerPage = 50` sets the number of items per page in OPDS listings. Range: 10 <= n <= 5000.
@@ -242,7 +233,6 @@ server.opdsSkipChapterMetadataFeed = false
 - `server.opdsShowOnlyDownloadedChapters = false` controls if OPDS listings should only include downloaded chapters.
 - `server.opdsChapterSortOrder = "DESC"` sets the default chapter sort order in OPDS listings, either `"ASC"` or `"DESC"`
 - `server.opdsCbzMimetype = "MODERN"` controls which mimetype to use for CBZ downloads. This affects the offered link in OPDS, as well as the content type of the CBZ download. Allowed is MODERN (current IANA standard), LEGACY (deprecated mimetype for .cbz) and COMPATIBLE (deprecated mimetype for all comic archives). Use LEGACY or COMPATIBLE if older clients don't offer the chapter download (note that the chapter needs to first be downloaded in Suwayomi, before it is available in OPDS).
-- `server.opdsSkipChapterMetadataFeed = false` controls if the metadata feed should be skipped. When enabled, download and streaming links are provided directly in the chapter list. This improves compatibility with automated downloaders (like KOReader). KoSync strategies are applied, but `PROMPT` conflicts are ignored (treating local progress as priority).
 
 ### KOReader Sync
 ```
@@ -278,28 +268,6 @@ server.useHikariConnectionPool = true
 - `server.databasePassword` the username with which to authenticate at the PostgreSQL instance.
 - `server.useHikariConnectionPool` use Hikari Connection Pool to connect to the database.
 
-### SyncYomi
-```
-server.syncYomiEnabled = false
-server.syncYomiHost = ""
-server.syncYomiApiKey = ""
-server.syncDataManga = true
-server.syncDataChapters = true
-server.syncDataTracking = true
-server.syncDataHistory = true
-server.syncDataCategories = true
-server.syncInterval = "0s"
-```
-- `server.syncYomiEnabled` controls whether SyncYomi is enabled.
-- `server.syncYomiHost` base URL of the SyncYomi server instance. e.g. `http://localhost:8282`
-- `server.syncYomiApiKey` API key to authenticate with SyncYomi. You must use the same API key in both Suwayomi and SyncYomi.
-- `server.syncDataManga` enables syncing manga.
-- `server.syncDataChapters` enables syncing chapters.
-- `server.syncDataTracking` enables syncing tracking data.
-- `server.syncDataHistory` enables syncing reading history.
-- `server.syncDataCategories` enables syncing categories.
-- `server.syncInterval` interval between automatic sync operations. Use `0s` to disable.
-
 **Note:** The example [docker-compose.yml file](https://github.com/Suwayomi/Suwayomi-Server-docker/blob/main/docker-compose.yml) contains everything you need to get started with Suwayomi+PostgreSQL. Please be aware that PostgreSQL support is currently still in beta.
 
 **Note:** These settings are excluded from backups, so a backup can be used to easily switch database installations by setting up the connection first, then restoring the backup.

docs/Troubleshooting.md

@@ -1,92 +1,19 @@
-# Troubleshooting
-
-This page is laid out in several sections, where each section describes a specific problem, followed by one or more possible solutions.
-
-At the end, you will find a General section, which is the nuclear option if nothing else works.
-
-For further support, visit the [official Suwayomi Discord server](https://discord.gg/DDZdqZWaHA).  
-In such cases, it will be helpful to have logs ready. You can find them in [The Data Directory](./The-Data-Directory) in the logs directory.
-
-**All steps below assume that you have stopped Suwayomi**.
-
-
-## Broken database
-
-- `failed due to
-org.jetbrains.exposed.exceptions.ExposedSQLException: org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "CATEGORY.SORT_ORDER" not found`
-- `org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "CHAPTER.KOREADER_HASH" not found`
-- `java.lang.IllegalStateException: Unable to read the page at position 96170708817765466`
-- Any other error text that includes "SQL Statement"
-
-Your database is either corrupted or incompatible.
-
-One of these is the cause:
-- You were running a preview version and decided to downgrade to stable.
-- You did not shut down Suwayomi properly.
-- Suwayomi crashed in an unexpected way.
-
-Solutions:
-- If you downgraded, upgrade to preview again.
-- Otherwise, you will need to reset and restore from a backup. See [General Troubleshooting](#general-troubleshooting) below.
-
-
-## `HTTP error 429`
-
-The source (or, if trackers are enabled, possibly the tracker) has blocked you for sending too many requests.  
-Note that Mass-Migration can result in an unexpectedly high number of requests to both the source and any configured trackers.
-
-Solution: Use other/more sources, download less, and wait between request-heavy actions.
-
-
-## Extension times out
-
-- `Timed out waiting for 20000 ms…`
-- `Timed out waiting for page list`
-
-First, check if this is an extension issue or a Suwayomi issue.
-On the manga page of the problematic entry, click "Open in WebView".
-
-Solutions:
-- If the WebView loads: The issue is with the extension. Search [the issues](https://github.com/Suwayomi/Suwayomi-Server/issues) and discord if there are known problems with that extension.
-- If the WebView errors: Go to [The Data Directory](./The-Data-Directory) and remove the `bin` and `cache` folders.
-    - If the WebView still does not work after a restart, your installation is incomplete. On Linux, refer to [the README](https://github.com/Suwayomi/Suwayomi-Server#webview-support-gnulinux).
-
-
-## Flaresolverr required
-
-- `java.io.IOException: Cloudflare bypass currently disabled`
-
-The source you are using has enabled CloudFlare's bot protection.
-If you open the source's website in your browser, you should see the "Confirm I'm human" page.
-
-Solution:
-- Download and set up [Flaresolverr](https://github.com/FlareSolverr/FlareSolverr) or [Byparr](https://github.com/ThePhaseless/Byparr). Make sure to run Flaresolverr/Byparr every time you use this source.
-
-
-## Flaresolverr not running
-
-- `java.io.IOException: Failed to connect to localhost/[0:0:0:0:0:0:0:1]:8191`
-
-You have configured Flaresolverr by enabling the `server.flareSolverrEnabled` setting, but Flaresolverr is not installed and/or running.
-
-Solutions:
-- Install Flaresolverr if you haven't already (see previous section). Then ensure it is running (Windows: do not close the console window!).
-- If it is running, ensure the configured url in `server.flareSolverrUrl` is correct. There is usually no need to change this.
-- If it is running and the url is correct, check your firewall settings, your system may be blocking access to Flaresolverr.
-
-
 ## General Troubleshooting
 This guide will try to fix Suwayomi by reseting it to a clean installation state.
 
-> [!WARNING]
-> This will remove all your data, including the library.
-> Make sure you have copied your backups as described above!
-
 - Make sure you have a recent backup of your library or create one in the app (if possible) because we **are going to wipe all Suwayomi data**.
 - Make sure Suwayomi is not running (right click on tray icon and quit or kill it through the way your Operating System provides)
 - Clear all browsing data on your browser if you use Suwayomi from a browser.
-- Delete the Suwayomi data directory located below and re-run the app. See the article [The Data Directory](./The-Data-Directory) for information on how to find it.
+- Delete the Suwayomi data directory located below and re-run the app.
-    - If you wish to keep your downloads, you may also attempt to surgically remove only parts. You will need to remove `database.mv.db`, `database.trace.db`, `bin`, `cache`, `extensions`, `settings`, `webUI`. Removing only a subset of these files and folders may fail to resolve the problem.
+
-- Open Suwayomi and go to Settings > Backup > Restore Backup, and select the latest backup you have.
+Note: Replace `<Account>` with the currently logged in account/username on your pc.
-    - Restoring from backup does not restore your downloads. If you chose to keep them in the above step, you will now need to re-download all manga. Suwayomi will pick up on the existing files and not actually download anything that isn't new.
+
+On Mac OS X : `/Users/<Account>/Library/Application Support/Tachidesk`
+
+On Windows XP : `C:\Documents and Settings\<Account>\Application Data\Local Settings\Tachidesk`
+
+On Windows 7 and later : `C:\Users\<Account>\AppData\Local\Tachidesk`
+
+On Unix/Linux : `/home/<account>/.local/share/Tachidesk`
+
 - In the case that you have to periodically perform this fix or the problem persists or the method failed to fix it, open an issue or Join the [Suwayomi discord server](https://discord.gg/DDZdqZWaHA) to hang out with the community and to receive support and help.

gradle/libs.versions.toml

@@ -1,23 +1,22 @@
 [versions]
-kotlin = "2.4.0"
+kotlin = "2.3.21"
-coroutines = "1.11.0"
+coroutines = "1.10.2"
-serialization = "1.11.0"
+serialization = "1.10.0"
 jvmTarget = "21"
-okhttp = "5.4.0" # Major version is locked by Tachiyomi extensions
+okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
-javalin = "7.2.2"
+javalin = "6.7.0"
-jte = "3.2.4"
+jte = "3.2.3"
-jackson = "3.2.0" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "2.18.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
-exposed = "1.2.0"
+exposed = "0.61.0"
-dex2jar = "2.4.36"
+dex2jar = "2.4.34"
-polyglot = "25.0.3"
+polyglot = "24.2.2"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
-graphqlkotlin = "10.0.0"
+graphqlkotlin = "8.8.1"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
-koin = "4.2.2"
+koin = "4.1.1"
-moko = "0.26.4"
+moko = "0.26.0"
-jcef = "144.0.15-g72717cf-chromium-144.0.7559.172-api-1.21-262-b37"
 
 [libraries]
 # Kotlin
@@ -38,24 +37,24 @@ serialization-xml-core = { module = "io.github.pdvrieze.xmlutil:core", version.r
 serialization-xml = { module = "io.github.pdvrieze.xmlutil:serialization-jvm", version.ref = "xmlserialization" }
 
 # Logging
-slf4japi = "org.slf4j:slf4j-api:2.0.18"
+slf4japi = "org.slf4j:slf4j-api:2.0.17"
-logback = "ch.qos.logback:logback-classic:1.5.34"
+logback = "ch.qos.logback:logback-classic:1.5.32"
-kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.4"
+kotlinlogging = "io.github.oshai:kotlin-logging-jvm:8.0.01"
 
 # 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.17.0"
+okio = "com.squareup.okio:okio:3.16.4"
 
 # 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-jte", version.ref = "javalin" }
+javalin-rendering = { module = "io.javalin:javalin-rendering", version.ref = "javalin" }
-jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
-jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
+jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.22"
+jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }
 
@@ -69,13 +68,12 @@ 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" }
-exposed-kotlintime = { module = "org.jetbrains.exposed:exposed-kotlin-datetime", 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
-h2 = "com.h2database:h2:2.4.240"
+hikaricp = "com.zaxxer:HikariCP:7.0.2"
-hikaricp = "com.zaxxer:HikariCP:7.1.0"
 
 # Exposed Migrations
-exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.10.1"
+exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.8.0"
 
 # Dependency Injection
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
@@ -88,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.2"
+jsoup = "org.jsoup:jsoup:1.22.1"
 
 # Config
-config = "com.typesafe:config:1.4.9"
+config = "com.typesafe:config:1.4.5"
 config4k = "io.github.config4k:config4k:0.7.0"
 
 # Sort
@@ -107,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.2.1"
+apksig = "com.android.tools.build:apksig:9.0.1"
 
 # Xml
 xmlpull = "xmlpull:xmlpull:1.1.3.4a"
@@ -117,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.6.0"
+junrar = "com.github.junrar:junrar:7.5.10"
 
 # AES/CBC/PKCS7Padding Cypher provider
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.83"
 
 # AndroidX annotations
-android-annotations = "androidx.annotation:annotation:1.10.0"
+android-annotations = "androidx.annotation:annotation:1.9.1"
 
 # Substitute for duktape-android
 polyglot-core = { module = "org.graalvm.polyglot:polyglot", version.ref = "polyglot" }
@@ -134,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.3"
+icu4j = "com.ibm.icu:icu4j:78.2"
 
 # Image Decoding implementation provider
 twelvemonkeys-common-lang = { module = "com.twelvemonkeys.common:common-lang", version.ref = "twelvemonkeys" }
@@ -145,10 +143,10 @@ twelvemonkeys-imageio-metadata = { module = "com.twelvemonkeys.imageio:imageio-m
 twelvemonkeys-imageio-jpeg = { module = "com.twelvemonkeys.imageio:imageio-jpeg", version.ref = "twelvemonkeys" }
 twelvemonkeys-imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys" }
 
-imageio-webp = "com.github.usefulness:webp-imageio:0.11.0"
+imageio-webp = "com.github.usefulness:webp-imageio:0.10.2"
 
 # Testing
-mockk = "io.mockk:mockk:1.14.11"
+mockk = "io.mockk:mockk:1.14.9"
 
 # cron scheduler
 cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
@@ -157,10 +155,10 @@ cron4j = "it.sauronsoftware.cron4j:cron4j:2.2.5"
 cronUtils = "com.cronutils:cron-utils:9.2.1"
 
 # Webview
-jcef = { module = "org.jetbrains.intellij.deps.jcef:jcef", version.ref = "jcef" }
+kcef = "dev.datlag:kcef:2024.04.20.4"
 
 # User
-jwt = "com.auth0:java-jwt:4.5.2"
+jwt = "com.auth0:java-jwt:4.5.1"
 
 # lint - used for renovate to update ktlint version
 ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
@@ -175,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.2.0"}
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.0.1"}
 
 # Build config
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.10"}
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "6.0.7"}
 
 # Download
 download = { id = "de.undercouch.download", version = "5.7.0"}
 
 # ShadowJar
-shadowjar = { id = "com.gradleup.shadow", version = "8.3.11"}
+shadowjar = { id = "com.gradleup.shadow", version = "8.3.9"}
 
 # Moko
 moko = { id = "dev.icerock.mobile.multiplatform-resources", version.ref = "moko" }
@@ -214,7 +212,7 @@ shared = [
     "dex2jar-tools",
     "apk-parser",
     "jackson-annotations",
-    "jcef",
+    "kcef"
 ]
 
 sharedTest = [
@@ -244,7 +242,6 @@ exposed = [
     "exposed-dao",
     "exposed-jdbc",
     "exposed-javatime",
-    "exposed-kotlintime",
 ]
 systemtray = [
     "systemtray-core",

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
+@rem Set local scope for the variables with windows NT shell
-setlocal EnableExtensions
+if "%OS%"=="Windows_NT" setlocal
 
 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
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :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
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
@@ -73,10 +73,21 @@ echo location of your Java installation. 1>&2
 
 
 @rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-@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
 
-:exitWithErrorLevel
+:end
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+@rem End local scope for the variables with windows NT shell
-"%COMSPEC%" /c exit %ERRORLEVEL%
+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

renovate.json

@@ -16,43 +16,14 @@
       "depNameTemplate": "zulu",
       "datasourceTemplate": "custom.zulu",
       "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+).*$"
-    },
-    {
-      "customType": "regex",
-      "managerFilePatterns": [
-        "/buildSrc/src/main/kotlin/Constants.kt/"
-      ],
-      "matchStrings": [
-        "val\\s+webviewJbrRelease\\s*=\\s*\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "JetBrainsRuntime",
-      "packageNameTemplate": "JetBrains/JetBrainsRuntime",
-      "datasourceTemplate": "github-releases",
-      "versioningTemplate": "regex:^jbr-release-(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)b(?<build>\\d+)\\.(?<revision>\\d+)$"
     }
   ],
   "customDatasources": {
     "zulu": {
       "defaultRegistryUrlTemplate": "https://api.azul.com/metadata/v1/zulu/packages?availability_types=ca&release_status=both&java_package_type=jre&crac_supported=false&javafx_bundled=false&support_term=lts&arch=x86&os=linux&archive_type=zip&page_size=1000&include_fields=java_package_features,release_status,support_term,os,arch,hw_bitness,abi,java_package_type,javafx_bundled,sha256_hash,cpu_gen,size,archive_type,certifications,lib_c_type,crac_supported&page=1&azul_com=true",
       "transformTemplates": [
-        "{ \"releases\": $map($, function($v) { { \"version\": $join([$string($v.distro_version[0]), \".\", $string($v.distro_version[1]), \".\", $string($v.distro_version[2]), \"_\", $string($v.java_version[0]), \".\", $string($v.java_version[1]), \".\", $string($v.java_version[2])]) } }) }"
+        "{\"releases\": $$.$join([$join($map(distro_version[[0..2]], $string), \".\"), \"_\", $join($map(java_version, $string), \".\")])}"
       ]
     }
-  },
+  }
-  "packageRules": [
-    {
-      "matchPackageNames": [
-        "org.jetbrains.intellij.deps.jcef:jcef",
-        "JetBrains/JetBrainsRuntime"
-      ],
-      "groupName": "JCEF + JetBrains Runtime",
-      "groupSlug": "jcef-jbr"
-    },
-    {
-      "matchPackageNames": [
-        "com.github.Suwayomi:android-jar"
-      ],
-      "enabled": false
-    }
-  ]
 }

scripts/bundler.sh

@@ -42,7 +42,7 @@ main() {
     gcc -fPIC -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so
   fi
 
-  JRE_ZULU="25.34.17_25.0.3"
+  JRE_ZULU="25.30.17_25.0.1"
   JRE_RELEASE="jre${JRE_ZULU#*_}" # e.g. jre25.0.1
   ZULU_RELEASE="zulu${JRE_ZULU%_*}" # e.g. zulu25.30.17
 
@@ -149,15 +149,15 @@ move_release_to_output_dir() {
 }
 
 download_launcher() {
-  LAUNCHER_URL=$(curl -sf "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
+  LAUNCHER_URL=$(curl -s "https://api.github.com/repos/Suwayomi/Suwayomi-Launcher/releases/latest" | grep "browser_download_url" | grep ".jar" | head -n 1 | cut -d '"' -f 4)
-  curl -fL "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
+  curl -L "$LAUNCHER_URL" -o "Suwayomi-Launcher.jar"
   mv "Suwayomi-Launcher.jar" "$RELEASE_NAME/Suwayomi-Launcher.jar"
 }
 
 download_jogamp() {
   local platform="$1"
   if [ ! -f jogamp-all-platforms.7z ]; then
-    curl -f "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
+    curl "https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z" -o jogamp-all-platforms.7z
   fi
 
   7z x jogamp-all-platforms.7z "jogamp-all-platforms/lib/$platform/"
@@ -168,7 +168,7 @@ download_jogamp() {
 
 download_electron() {
   if [ ! -f "$ELECTRON" ]; then
-    curl -fL "$ELECTRON_URL" -o "$ELECTRON"
+    curl -L "$ELECTRON_URL" -o "$ELECTRON"
   fi
 
   unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
@@ -181,7 +181,7 @@ setup_jre() {
     mv "jre" "$RELEASE_NAME/jre"
   else
     if [ ! -f "$JRE" ]; then
-      curl -fL "$JRE_URL" -o "$JRE"
+      curl -L "$JRE_URL" -o "$JRE"
     fi
 
     local ext="${JRE##*.}"
@@ -273,7 +273,7 @@ make_appimage() {
     sudo apt update
     sudo apt install libfuse2
   fi
-  curl -fL $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
+  curl -L $APPIMAGE_URL -o $APPIMAGE_TOOLNAME
   chmod +x $APPIMAGE_TOOLNAME
   ARCH=x86_64 ./$APPIMAGE_TOOLNAME "$RELEASE_NAME" "$RELEASE"
 }
@@ -300,7 +300,7 @@ make_windows_bundle() {
   #local rcedit_url="https://github.com/electron/rcedit/releases/download/v0.1.1/$rcedit"
   ## change electron's icon
   #if [ ! -f "$rcedit" ]; then
-    #curl -fL "$rcedit_url" -o "$rcedit"
+    #curl -L "$rcedit_url" -o "$rcedit"
   #fi
 
   #local icon="server/src/main/resources/icon/faviconlogo.ico"

server/build.gradle.kts

@@ -159,8 +159,6 @@ buildConfig {
 
     buildConfigField("String", "GITHUB", quoteWrap("https://github.com/Suwayomi/Suwayomi-Server"))
     buildConfigField("String", "DISCORD", quoteWrap("https://discord.gg/DDZdqZWaHA"))
-    buildConfigField("String", "JCEF_VERSION", quoteWrap(libs.versions.jcef.get()))
-    buildConfigField("String", "JCEF_JBR_RELEASE", quoteWrap(webviewJbrRelease))
 }
 
 tasks {
@@ -173,8 +171,6 @@ tasks {
                 "Implementation-Vendor" to "The Suwayomi Project",
                 "Specification-Version" to getTachideskVersion(),
                 "Implementation-Version" to getTachideskRevision(),
-                "Multi-Release" to true, // needed for polyglot
-                "X-JBR-Release" to webviewJbrRelease,
             )
         }
         archiveBaseName.set(rootProject.name)
@@ -185,11 +181,7 @@ tasks {
     }
 
     test {
-        useJUnitPlatform {
+        useJUnitPlatform()
-            if (!project.hasProperty("masstest")) {
-                exclude("**/masstest/*")
-            }
-        }
         testLogging {
             showStandardStreams = true
             events("passed", "skipped", "failed")

server/i18n/src/commonMain/moko-resources/values/base/strings.xml

@@ -153,7 +153,4 @@
     <string name="login_label_login">Log In</string>
     <string name="login_placeholder_username">Type username...</string>
     <string name="login_placeholder_password">Secret...</string>
-
-    <string name="opds_chapter_title_oneshot">Oneshot</string>
-    <string name="opds_chapter_title_fallback">Chapter %1$s</string>
 </resources>

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupServerSettingsGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsBackupServerSettingsGenerator {
     fun generate(

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsBackupSettingsHandlerGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsBackupSettingsHandlerGenerator {
     fun generate(

server/server-config-generate/src/main/kotlin/suwayomi/tachidesk/server/settings/generation/SettingsGraphqlTypeGenerator.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings.generation
 
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import java.io.File
+import kotlin.text.appendLine
 
 object SettingsGraphqlTypeGenerator {
     fun generate(

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt

@@ -15,15 +15,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
 import suwayomi.tachidesk.graphql.types.AuthMode
 import suwayomi.tachidesk.graphql.types.CbzMediaType
 import suwayomi.tachidesk.graphql.types.DatabaseType
@@ -54,14 +56,16 @@ import suwayomi.tachidesk.server.settings.PathSetting
 import suwayomi.tachidesk.server.settings.SettingGroup
 import suwayomi.tachidesk.server.settings.SettingsRegistry
 import suwayomi.tachidesk.server.settings.StringSetting
-import uy.kohesive.injekt.injectLazy
 import xyz.nulldev.ts.config.GlobalConfigManager
 import xyz.nulldev.ts.config.SystemPropertyOverridableConfigModule
+import kotlin.collections.associate
+import kotlin.getValue
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
+import uy.kohesive.injekt.injectLazy
 
 val mutableConfigValueScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
@@ -71,21 +75,6 @@ val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
 
 private val application: Application by injectLazy()
 
-@OptIn(ExperimentalCoroutinesApi::class)
-fun <T> subscribeTo(
-    flow: Flow<T>,
-    ignoreInitialValue: Boolean = true,
-    onChange: suspend (value: T) -> Unit,
-) {
-    val actualFlow =
-        if (ignoreInitialValue) {
-            flow.drop(1)
-        } else {
-            flow
-        }
-    actualFlow.distinctUntilChanged().conflate().onEach { onChange(it) }.launchIn(mutableConfigValueScope)
-}
-
 // Settings are ordered by "protoNumber".
 class ServerConfig(
     getConfig: () -> Config,
@@ -593,7 +582,7 @@ class ServerConfig(
         privacySafe = true,
         defaultValue = SortOrder.DESC,
         enumClass = SortOrder::class,
-        typeInfo = SettingsRegistry.PartialTypeInfo(imports = listOf("org.jetbrains.exposed.v1.core.SortOrder")),
+        typeInfo = SettingsRegistry.PartialTypeInfo(imports = listOf("org.jetbrains.exposed.sql.SortOrder")),
     )
 
     val authMode: MutableStateFlow<AuthMode> by EnumSetting(
@@ -1027,85 +1016,7 @@ class ServerConfig(
         description = "Use Hikari Connection Pool to connect to the database.",
     )
 
-    val kcefEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 86,
-        group = SettingGroup.WEB_VIEW,
-        privacySafe = true,
-        defaultValue = true,
-        description = "Enable the WebView via CEF (Chromium)"
-    )
 
-    val syncYomiEnabled: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 87,
-        defaultValue = false,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true
-    )
-
-    val syncYomiHost: MutableStateFlow<String> by StringSetting(
-        protoNumber = 88,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncYomiApiKey: MutableStateFlow<String> by StringSetting(
-        protoNumber = 89,
-        defaultValue = "",
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = false,
-    )
-
-    val syncDataManga: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 90,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataChapters: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 91,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataTracking: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 92,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataHistory: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 93,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncDataCategories: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 94,
-        defaultValue = true,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val syncInterval: MutableStateFlow<Duration> by DurationSetting(
-        protoNumber = 95,
-        defaultValue = 0.seconds,
-        group = SettingGroup.SYNCYOMI,
-        privacySafe = true,
-    )
-
-    val opdsSkipChapterMetadataFeed: MutableStateFlow<Boolean> by BooleanSetting(
-        protoNumber = 96,
-        group = SettingGroup.OPDS,
-        privacySafe = true,
-        defaultValue = false,
-        description = "Skips the metadata feed and provides download/stream links directly in the chapter list. Improves compatibility with KOReader auto-downloader. KoSync strategies are applied, but PROMPT conflicts are ignored (treating local progress as priority)."
-
-    )
 
     /** ****************************************************************** **/
     /**                                                                    **/
@@ -1150,7 +1061,18 @@ class ServerConfig(
         flow: Flow<T>,
         onChange: suspend (value: T) -> Unit,
         ignoreInitialValue: Boolean = true,
-    ) = subscribeTo(flow, ignoreInitialValue, onChange)
+    ) {
+        val actualFlow =
+            if (ignoreInitialValue) {
+                flow.drop(1)
+            } else {
+                flow
+            }
+
+        val sharedFlow = MutableSharedFlow<T>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+        actualFlow.distinctUntilChanged().mapLatest { sharedFlow.emit(it) }.launchIn(mutableConfigValueScope)
+        sharedFlow.onEach { onChange(it) }.launchIn(mutableConfigValueScope)
+    }
 
     fun <T> subscribeTo(
         flow: Flow<T>,

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingGroup.kt

@@ -17,8 +17,6 @@ enum class SettingGroup(
     CLOUDFLARE("Cloudflare"),
     OPDS("OPDS"),
     KOREADER_SYNC("KOReader sync"),
-    WEB_VIEW("WebView"),
-    SYNCYOMI("SyncYomi")
     ;
 
     override fun toString(): String = value

server/server-config/src/main/kotlin/suwayomi/tachidesk/server/settings/SettingsRegistry.kt

@@ -2,6 +2,7 @@ package suwayomi.tachidesk.server.settings
 
 import com.typesafe.config.ConfigValue
 import com.typesafe.config.parser.ConfigDocument
+import kotlin.collections.find
 import kotlin.reflect.KClass
 
 /**
@@ -88,6 +89,4 @@ object SettingsRegistry {
     fun get(name: String): SettingMetadata? = settings[name]
 
     fun getAll(): Map<String, SettingMetadata> = settings.toMap()
-
-    fun clear() = settings.clear()
 }

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

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.network
 
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.okio.decodeFromBufferedSource
 import kotlinx.serialization.serializer

server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt

@@ -103,7 +103,7 @@ class CloudflareInterceptor(
     companion object {
         private val ERROR_CODES = listOf(403, 503)
         private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
-        val COOKIE_NAMES = listOf("cf_clearance")
+        private val COOKIE_NAMES = listOf("cf_clearance")
         private val CHROME_IMAGE_TEMPLATE_REGEX = Regex("""<title>(.*?) \(\d+×\d+\)</title>""")
     }
 }
@@ -205,12 +205,9 @@ object CFClearance {
                                             session = serverConfig.flareSolverrSessionName.value,
                                             sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
                                             cookies =
-                                                network.cookieStore
+                                                network.cookieStore.get(originalRequest.url).map {
-                                                    .get(originalRequest.url)
+                                                    FlareSolverCookie(it.name, it.value)
-                                                    .filter { it.name !in CloudflareInterceptor.COOKIE_NAMES }
+                                                },
-                                                    .map { cookie ->
-                                                        FlareSolverCookie(cookie.name, cookie.value)
-                                                    },
                                             returnOnlyCookies = onlyCookies,
                                             maxTimeout = timeout.inWholeMilliseconds.toInt(),
                                             postData =

server/src/main/kotlin/eu/kanade/tachiyomi/source/local/LocalSource.kt

@@ -36,11 +36,10 @@ import nl.adaptivity.xmlutil.ExperimentalXmlUtilApi
 import nl.adaptivity.xmlutil.core.KtXmlReader
 import nl.adaptivity.xmlutil.serialization.XML
 import org.apache.commons.compress.archivers.zip.ZipFile
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.registerCatalogueSource
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import suwayomi.tachidesk.manga.model.table.ExtensionTable

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

@@ -1,12 +1,10 @@
 package suwayomi.tachidesk.global.impl
 
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 
 /*
@@ -34,14 +32,13 @@ object GlobalMeta {
             val (existingMeta, newMeta) = meta.toList().partition { (key) -> key in dbMetaMap.keys }
 
             if (existingMeta.isNotEmpty()) {
-                BatchUpdateStatement(GlobalMetaTable)
+                BatchUpdateStatement(GlobalMetaTable).apply {
-                    .apply {
+                    existingMeta.forEach { (key, value) ->
-                        existingMeta.forEach { (key, value) ->
+                        addBatch(EntityID(dbMetaMap[key]!![GlobalMetaTable.id].value, GlobalMetaTable))
-                            addBatch(EntityID(dbMetaMap[key]!![GlobalMetaTable.id].value, GlobalMetaTable))
+                        this[GlobalMetaTable.value] = value
-                            this[GlobalMetaTable.value] = value
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
 
             if (newMeta.isNotEmpty()) {

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

@@ -1,14 +1,15 @@
 package suwayomi.tachidesk.global.impl
 
+import dev.datlag.kcef.KCEF
+import dev.datlag.kcef.KCEFBrowser
+import dev.datlag.kcef.KCEFClient
 import eu.kanade.tachiyomi.network.NetworkHelper
 import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Cookie
 import okhttp3.HttpUrl
-import org.cef.CefClient
 import org.cef.CefSettings
 import org.cef.browser.CefBrowser
 import org.cef.browser.CefFrame
@@ -25,9 +26,6 @@ import org.cef.network.CefCookie
 import org.cef.network.CefCookieManager
 import org.cef.network.CefRequest
 import uy.kohesive.injekt.injectLazy
-import xyz.nulldev.androidcompat.webkit.CefHelper
-import xyz.nulldev.androidcompat.webkit.dispose
-import xyz.nulldev.androidcompat.webkit.evaluateJavaScript
 import java.awt.Component
 import java.awt.HeadlessException
 import java.awt.Rectangle
@@ -49,8 +47,8 @@ import javax.swing.JPanel
 class KcefWebView {
     private val logger = KotlinLogging.logger {}
     private val renderHandler = RenderHandler()
-    private var kcefClient: CefClient? = null
+    private var kcefClient: KCEFClient? = null
-    private var browser: CefBrowser? = null
+    private var browser: KCEFBrowser? = null
     private var width = 1000
     private var height = 1000
 
@@ -78,8 +76,7 @@ class KcefWebView {
         }
     }
 
-    @Serializable
+    @Serializable sealed class Event
-    sealed class Event
 
     @Serializable
     @SerialName("consoleMessage")
@@ -250,12 +247,10 @@ class KcefWebView {
     init {
         destroy()
         kcefClient =
-            runBlocking {
+            KCEF.newClientBlocking().apply {
-                CefHelper.createClient().apply {
+                addDisplayHandler(DisplayHandler())
-                    addDisplayHandler(DisplayHandler())
+                addLoadHandler(LoadHandler())
-                    addLoadHandler(LoadHandler())
+                addRequestHandler(RequestHandler())
-                    addRequestHandler(RequestHandler())
-                }
             }
 
         logger.debug { "Start loading cookies" }
@@ -294,7 +289,6 @@ class KcefWebView {
                 .createBrowser(
                     url,
                     CefRendering.CefRenderingWithHandler(renderHandler, JPanel()),
-                    false,
                     // NOTE: with a context, we don't seem to be getting any cookies
                 ).apply {
                     // NOTE: Without this, we don't seem to be receiving any events

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.core.CloseStatus
+import org.eclipse.jetty.websocket.api.CloseStatus
 import suwayomi.tachidesk.manga.impl.update.Websocket
 
 object WebView : Websocket<String>() {

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt

@@ -1,519 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import io.github.oshai.kotlinlogging.KotlinLogging
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.protobuf.ProtoBuf
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-import suwayomi.tachidesk.manga.impl.Category
-import suwayomi.tachidesk.manga.impl.Library.handleMangaThumbnail
-import suwayomi.tachidesk.manga.impl.backup.BackupFlags
-import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupMangaHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupSourceHandler
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
-import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
-import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
-import suwayomi.tachidesk.manga.model.table.CategoryTable
-import suwayomi.tachidesk.manga.model.table.ChapterTable
-import suwayomi.tachidesk.manga.model.table.MangaTable
-import suwayomi.tachidesk.manga.model.table.toDataClass
-import suwayomi.tachidesk.server.serverConfig
-import suwayomi.tachidesk.util.HAScheduler
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import kotlin.time.Clock
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-import kotlin.time.measureTime
-
-@Serializable
-data class SyncData(
-    val backup: Backup? = null,
-)
-
-object SyncManager {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-    private val logger = KotlinLogging.logger {}
-
-    private var currentTaskId: String? = null
-    private val syncMutex = Mutex()
-
-    private val _lastSyncState: MutableStateFlow<SyncState?> = MutableStateFlow(null)
-    val lastSyncState: StateFlow<SyncState?> = _lastSyncState.asStateFlow()
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun scheduleSyncTask() {
-        serverConfig.subscribeTo(
-            combine(
-                serverConfig.syncYomiEnabled,
-                serverConfig.syncInterval,
-            ) { enabled, interval -> Pair(enabled, interval) },
-            { (enabled, interval) ->
-                currentTaskId?.let { HAScheduler.deschedule(it) }
-
-                currentTaskId =
-                    if (enabled && interval > 0.seconds) {
-                        val lastSyncDate =
-                            syncPreferences
-                                .getLong("last_scheduled_sync", 0L)
-                                .takeIf { it != 0L }
-                                ?.let { Instant.fromEpochMilliseconds(it) }
-
-                        if (lastSyncDate == null) {
-                            syncPreferences
-                                .edit()
-                                .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                .apply()
-                        }
-
-                        val delay =
-                            if (lastSyncDate != null) {
-                                ((interval) - (Clock.System.now() - lastSyncDate)).coerceAtLeast(0.seconds)
-                            } else {
-                                interval
-                            }
-
-                        HAScheduler.schedule(
-                            {
-                                startSync(periodic = true)
-
-                                syncPreferences
-                                    .edit()
-                                    .putLong("last_scheduled_sync", Clock.System.now().toEpochMilliseconds())
-                                    .apply()
-                            },
-                            interval = interval.inWholeMilliseconds,
-                            delay = delay.inWholeMilliseconds,
-                            name = "sync",
-                        )
-                    } else {
-                        syncPreferences
-                            .edit()
-                            .remove("last_scheduled_sync")
-                            .apply()
-                        null
-                    }
-            },
-            ignoreInitialValue = false,
-        )
-    }
-
-    @OptIn(DelicateCoroutinesApi::class)
-    fun startSync(periodic: Boolean = false): StartSyncResult {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return StartSyncResult.SYNC_DISABLED
-        }
-
-        if (!syncMutex.tryLock()) {
-            return StartSyncResult.SYNC_IN_PROGRESS
-        }
-
-        GlobalScope.launch {
-            try {
-                syncData(periodic)
-            } finally {
-                syncMutex.unlock()
-            }
-        }
-
-        return StartSyncResult.SUCCESS
-    }
-
-    suspend fun ensureSync() {
-        if (!serverConfig.syncYomiEnabled.value) {
-            return
-        }
-
-        if (syncMutex.tryLock()) {
-            // there is no ongoing sync, so start one
-            try {
-                syncData()
-            } finally {
-                syncMutex.unlock()
-            }
-        } else {
-            // wait for the ongoing sync to finish
-            syncMutex.withLock {}
-        }
-    }
-
-    private suspend fun syncData(periodic: Boolean = false) {
-        val startInstant = Clock.System.now()
-        _lastSyncState.value = SyncState.Started(startInstant)
-
-        try {
-            logger.info {
-                if (periodic) {
-                    "Starting periodic sync"
-                } else {
-                    "Starting manual sync"
-                }
-            }
-
-            transaction {
-                MangaTable.update({ MangaTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                ChapterTable.update({ ChapterTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-                CategoryTable.update({ CategoryTable.isSyncing eq true }) {
-                    it[isSyncing] = false
-                }
-            }
-
-            val backupFlags =
-                BackupFlags(
-                    includeManga = serverConfig.syncDataManga.value,
-                    includeCategories = serverConfig.syncDataCategories.value,
-                    includeChapters = serverConfig.syncDataChapters.value,
-                    includeTracking = serverConfig.syncDataTracking.value,
-                    includeHistory = serverConfig.syncDataHistory.value,
-                    includeClientData = false,
-                    includeServerSettings = false,
-                )
-
-            _lastSyncState.value = SyncState.CreatingBackup(startInstant)
-            val backupMangas = BackupMangaHandler.backup(backupFlags)
-            val backup =
-                Backup(
-                    backupMangas,
-                    BackupCategoryHandler.backup(backupFlags).filter { it.name != Category.DEFAULT_CATEGORY_NAME },
-                    BackupSourceHandler.backup(backupMangas, backupFlags),
-                    emptyMap(),
-                    null,
-                )
-
-            val syncData =
-                SyncData(
-                    backup = backup,
-                )
-
-            val remoteBackup =
-                SyncYomiSyncService.doSync(syncData, startInstant) {
-                    _lastSyncState.value = it
-                }
-
-            if (remoteBackup == null) {
-                logger.debug { "Skip restore due to network issues" }
-                finishWithError(startInstant, "Network error", periodic)
-                return
-            }
-
-            if (remoteBackup === syncData.backup) {
-                // nothing changed
-                logger.debug { "Skip restore due to remote was overwrite from local" }
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            // Stop the sync early if the remote backup is null or empty
-            if (remoteBackup.backupManga.isEmpty() && remoteBackup.backupCategories.isEmpty() && remoteBackup.backupSources.isEmpty()) {
-                logger.error { "No data found on remote server." }
-                finishWithError(startInstant, "No data found on remote server.", periodic)
-                return
-            }
-
-            val isLibraryEmpty =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where { MangaTable.inLibrary eq true }
-                        .empty()
-                }
-
-            // Check if it's first sync based on lastSyncTimestamp
-            if (syncPreferences.getLong("last_sync_timestamp", 0) == 0L && !isLibraryEmpty) {
-                // It's first sync no need to restore data. (just update remote data)
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            val (filteredFavorites, nonFavorites) = filterFavoritesAndNonFavorites(remoteBackup)
-            updateNonFavorites(nonFavorites)
-
-            val newSyncData =
-                backup.copy(
-                    backupManga = filteredFavorites,
-                    backupCategories = remoteBackup.backupCategories,
-                    backupSources = remoteBackup.backupSources,
-                )
-
-            val hasMangaChanges = filteredFavorites.isNotEmpty()
-            val hasCategoryChanges = remoteBackup.backupCategories != backup.backupCategories
-            val hasSourceChanges = remoteBackup.backupSources != backup.backupSources
-
-            if (!hasMangaChanges && !hasCategoryChanges && !hasSourceChanges) {
-                // update the sync timestamp
-                finishWithSuccess(startInstant, periodic)
-                return
-            }
-
-            if (serverConfig.syncDataCategories.value) {
-                val mergedUids = newSyncData.backupCategories.map { it.uid }.toSet()
-                val mergedNames = newSyncData.backupCategories.map { it.name }.toSet()
-                val localCategories = Category.getCategoryList().filterNot { it.default } // Exclude system category
-                val categoriesToDelete =
-                    localCategories.filter {
-                        it.uid !in mergedUids && it.name !in mergedNames
-                    }
-                if (categoriesToDelete.isNotEmpty()) {
-                    transaction {
-                        categoriesToDelete.forEach {
-                            Category.removeCategory(it.id)
-                        }
-                    }
-                }
-            }
-
-            val backupStream = ProtoBuf.encodeToByteArray(Backup.serializer(), newSyncData).inputStream()
-            val restoreId =
-                ProtoBackupImport.restore(
-                    sourceStream = backupStream,
-                    flags = backupFlags,
-                    isSync = true,
-                )
-            _lastSyncState.value = SyncState.Restoring(startInstant, restoreId)
-
-            ProtoBackupImport.notifyFlow.first {
-                val restoreState = ProtoBackupImport.getRestoreState(restoreId)
-
-                restoreState == ProtoBackupImport.BackupRestoreState.Success ||
-                    restoreState == ProtoBackupImport.BackupRestoreState.Failure
-            }
-
-            // update the sync timestamp
-            finishWithSuccess(startInstant, periodic)
-        } catch (e: Throwable) {
-            logger.error { "Error syncing: ${e.message}" }
-            finishWithError(startInstant, "${e::class.qualifiedName}: ${e.message}", periodic)
-        }
-    }
-
-    private fun finishWithSuccess(
-        startInstant: Instant,
-        periodic: Boolean,
-    ) {
-        syncPreferences
-            .edit()
-            .putLong("last_sync_timestamp", Clock.System.now().toEpochMilliseconds())
-            .apply()
-        _lastSyncState.value = SyncState.Success(startInstant)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync completed successfully"
-            } else {
-                "Manual sync completed successfully"
-            }
-        }
-    }
-
-    private fun finishWithError(
-        startInstant: Instant,
-        message: String,
-        periodic: Boolean,
-    ) {
-        _lastSyncState.value = SyncState.Error(startInstant, message)
-
-        logger.info {
-            if (periodic) {
-                "Periodic sync failed: $message"
-            } else {
-                "Manual sync failed: $message"
-            }
-        }
-    }
-
-    private fun isMangaDifferent(
-        localManga: MangaDataClass,
-        remoteManga: BackupManga,
-    ): Boolean {
-        if (localManga.version != remoteManga.version) {
-            return true
-        }
-
-        val localChapters =
-            transaction {
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.manga eq localManga.id }
-                    .map { ChapterTable.toDataClass(it) }
-            }
-
-        if (areChaptersDifferent(localChapters, remoteManga.chapters)) {
-            return true
-        }
-
-        val localCategories =
-            transaction {
-                CategoryMangaTable
-                    .innerJoin(CategoryTable)
-                    .selectAll()
-                    .where { CategoryMangaTable.manga eq localManga.id }
-                    .map { it[CategoryTable.order] }
-            }
-
-        return localCategories.toSet() != remoteManga.categories.toSet()
-    }
-
-    private fun areChaptersDifferent(
-        localChapters: List<ChapterDataClass>,
-        remoteChapters: List<BackupChapter>,
-    ): Boolean {
-        val localChapterMap = localChapters.associateBy { it.url }
-        val remoteChapterMap = remoteChapters.associateBy { it.url }
-
-        if (localChapterMap.size != remoteChapterMap.size) {
-            return true
-        }
-
-        for ((url, localChapter) in localChapterMap) {
-            val remoteChapter = remoteChapterMap[url]
-
-            // If a matching remote chapter doesn't exist, or the version numbers are different, consider them different
-            if (remoteChapter == null || localChapter.version != remoteChapter.version) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    private fun filterFavoritesAndNonFavorites(backup: Backup): Pair<List<BackupManga>, List<BackupManga>> {
-        val favorites = mutableListOf<BackupManga>()
-        val nonFavorites = mutableListOf<BackupManga>()
-
-        val elapsedTime =
-            measureTime {
-                logger.debug { "Starting to filter favorites and non-favorites from backup data." }
-
-                backup.backupManga.forEach { remoteManga ->
-                    val localManga =
-                        transaction {
-                            MangaTable
-                                .selectAll()
-                                .where {
-                                    (MangaTable.sourceReference eq remoteManga.source) and
-                                        (MangaTable.url eq remoteManga.url)
-                                }.limit(1)
-                                .map { MangaTable.toDataClass(it) }
-                                .firstOrNull()
-                        }
-
-                    when {
-                        // Checks if the manga is in favorites and needs updating or adding
-                        remoteManga.favorite -> {
-                            if (localManga == null || isMangaDifferent(localManga, remoteManga)) {
-                                logger.debug { "Adding to favorites: ${remoteManga.title}" }
-                                favorites.add(remoteManga)
-                            } else {
-                                logger.debug { "Already up-to-date favorite: ${remoteManga.title}" }
-                            }
-                        }
-
-                        // Handle non-favorites
-                        !remoteManga.favorite -> {
-                            logger.debug { "Adding to non-favorites: ${remoteManga.title}" }
-                            nonFavorites.add(remoteManga)
-                        }
-                    }
-                }
-            }
-
-        logger.debug {
-            "Filtering completed in $elapsedTime. Favorites found: ${favorites.size}, Non-favorites found: ${nonFavorites.size}"
-        }
-
-        return Pair(favorites, nonFavorites)
-    }
-
-    private fun updateNonFavorites(nonFavorites: List<BackupManga>) {
-        nonFavorites.forEach { nonFavorite ->
-            val localManga =
-                transaction {
-                    MangaTable
-                        .selectAll()
-                        .where {
-                            (MangaTable.sourceReference eq nonFavorite.source) and
-                                (MangaTable.url eq nonFavorite.url)
-                        }.limit(1)
-                        .map { MangaTable.toDataClass(it) }
-                        .firstOrNull()
-                }
-
-            if (localManga != null) {
-                if (localManga.inLibrary != nonFavorite.favorite) {
-                    transaction {
-                        MangaTable.update({ MangaTable.id eq localManga.id }) {
-                            it[inLibrary] = nonFavorite.favorite
-                        }
-                    }.apply {
-                        handleMangaThumbnail(localManga.id, nonFavorite.favorite)
-                    }
-                }
-            }
-        }
-    }
-
-    sealed class SyncState(
-        open val startDate: Instant,
-    ) {
-        data class Started(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class CreatingBackup(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Downloading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Merging(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Uploading(
-            override val startDate: Instant,
-        ) : SyncState(startDate)
-
-        data class Restoring(
-            override val startDate: Instant,
-            val restoreId: String,
-        ) : SyncState(startDate)
-
-        data class Success(
-            override val startDate: Instant,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-
-        data class Error(
-            override val startDate: Instant,
-            val message: String,
-            val endDate: Instant = Clock.System.now(),
-        ) : SyncState(startDate)
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt

@@ -1,517 +0,0 @@
-package suwayomi.tachidesk.global.impl.sync
-
-import android.app.Application
-import android.content.Context
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.network.PUT
-import eu.kanade.tachiyomi.network.await
-import io.github.oshai.kotlinlogging.KotlinLogging
-import io.javalin.http.HttpStatus
-import kotlinx.serialization.SerializationException
-import kotlinx.serialization.protobuf.ProtoBuf
-import okhttp3.Headers
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody.Companion.toRequestBody
-import suwayomi.tachidesk.manga.impl.backup.proto.models.Backup
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupCategory
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupChapter
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupManga
-import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupSource
-import suwayomi.tachidesk.server.serverConfig
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import uy.kohesive.injekt.injectLazy
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
-import kotlin.time.Instant
-
-object SyncYomiSyncService {
-    private val syncPreferences = Injekt.get<Application>().getSharedPreferences("sync", Context.MODE_PRIVATE)
-
-    private val network: NetworkHelper by injectLazy()
-    private val logger = KotlinLogging.logger {}
-
-    private class SyncYomiException(
-        message: String?,
-    ) : Exception(message)
-
-    suspend fun doSync(
-        syncData: SyncData,
-        startDate: Instant,
-        setSyncState: (SyncManager.SyncState) -> Unit,
-    ): Backup? {
-        setSyncState(SyncManager.SyncState.Downloading(startDate))
-        val (remoteData, etag) = pullSyncData()
-
-        val finalSyncData =
-            if (remoteData != null) {
-                require(etag.isNotEmpty()) { "ETag should never be empty if remote data is not null" }
-                logger.debug { "Try update remote data with ETag($etag)" }
-                setSyncState(SyncManager.SyncState.Merging(startDate))
-                mergeSyncData(syncData, remoteData)
-            } else {
-                // init or overwrite remote data
-                logger.debug { "Try overwrite remote data with ETag($etag)" }
-                syncData
-            }
-
-        if (finalSyncData.backup != null) {
-            setSyncState(SyncManager.SyncState.Uploading(startDate))
-        }
-        pushSyncData(finalSyncData, etag)
-        return finalSyncData.backup
-    }
-
-    private suspend fun pullSyncData(): Pair<SyncData?, String> {
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val downloadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        val lastETag = syncPreferences.getString("last_sync_etag", "") ?: ""
-        if (lastETag != "") {
-            headersBuilder.add("If-None-Match", lastETag)
-        }
-        val headers = headersBuilder.build()
-
-        val downloadRequest =
-            GET(
-                url = downloadUrl,
-                headers = headers,
-            )
-
-        val response = network.client.newCall(downloadRequest).await()
-
-        if (response.code == HttpStatus.NOT_MODIFIED.code) {
-            // not modified
-            require(lastETag.isNotEmpty())
-            logger.info { "Remote server not modified" }
-            return Pair(null, lastETag)
-        } else if (response.code == HttpStatus.NOT_FOUND.code) {
-            // maybe got deleted from remote
-            return Pair(null, "")
-        }
-
-        if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-
-            val byteArray =
-                response.body.byteStream().use {
-                    return@use it.readBytes()
-                }
-
-            return try {
-                val backup = ProtoBuf.decodeFromByteArray(Backup.serializer(), byteArray)
-                return Pair(SyncData(backup = backup), newETag)
-            } catch (_: SerializationException) {
-                logger.info { "Bad content responsed from server" }
-                // the body is invalid
-                // return default value so we can overwrite it
-                Pair(null, "")
-            }
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-            throw SyncYomiException("Failed to download sync data: $responseBody")
-        }
-    }
-
-    private suspend fun pushSyncData(
-        syncData: SyncData,
-        eTag: String,
-    ) {
-        val backup = syncData.backup ?: return
-
-        val host = serverConfig.syncYomiHost.value
-        val apiKey = serverConfig.syncYomiApiKey.value
-        val uploadUrl = "$host/api/sync/content"
-
-        val headersBuilder = Headers.Builder().add("X-API-Token", apiKey)
-        if (eTag.isNotEmpty()) {
-            headersBuilder.add("If-Match", eTag)
-        }
-        val headers = headersBuilder.build()
-
-        // Set timeout to 30 seconds
-        val timeout = 30.seconds
-        val client =
-            network.client
-                .newBuilder()
-                .connectTimeout(timeout)
-                .readTimeout(timeout)
-                .writeTimeout(timeout)
-                .build()
-
-        val byteArray = ProtoBuf.encodeToByteArray(Backup.serializer(), backup)
-        if (byteArray.isEmpty()) {
-            throw IllegalStateException("Empty backup error")
-        }
-        val body = byteArray.toRequestBody("application/octet-stream".toMediaType())
-
-        val uploadRequest =
-            PUT(
-                url = uploadUrl,
-                headers = headers,
-                body = body,
-            )
-
-        val response = client.newCall(uploadRequest).await()
-
-        if (response.isSuccessful) {
-            val newETag =
-                response.headers["ETag"]
-                    ?.takeIf { it.isNotEmpty() } ?: throw SyncYomiException("Missing ETag")
-            syncPreferences
-                .edit()
-                .putString("last_sync_etag", newETag)
-                .apply()
-            logger.debug { "SyncYomi sync completed" }
-        } else if (response.code == HttpStatus.PRECONDITION_FAILED.code) {
-            // other clients updated remote data, will try next time
-            logger.debug { "SyncYomi sync failed with 412" }
-        } else {
-            val responseBody = response.body.string()
-            logger.error { "SyncError: $responseBody" }
-        }
-    }
-
-    fun mergeSyncData(
-        localSyncData: SyncData,
-        remoteSyncData: SyncData,
-    ): SyncData {
-        val mergedCategoriesList =
-            mergeCategoriesLists(localSyncData.backup?.backupCategories, remoteSyncData.backup?.backupCategories)
-
-        val mergedMangaList =
-            mergeMangaLists(
-                localSyncData.backup?.backupManga,
-                remoteSyncData.backup?.backupManga,
-                localSyncData.backup?.backupCategories ?: emptyList(),
-                remoteSyncData.backup?.backupCategories ?: emptyList(),
-                mergedCategoriesList,
-            )
-
-        val mergedSourcesList =
-            mergeSourcesLists(localSyncData.backup?.backupSources, remoteSyncData.backup?.backupSources)
-
-        // Create the merged Backup object
-        val mergedBackup =
-            Backup(
-                backupManga = mergedMangaList,
-                backupCategories = mergedCategoriesList,
-                backupSources = mergedSourcesList,
-                meta = emptyMap(),
-                serverSettings = null,
-            )
-
-        // Create the merged SData object
-        return SyncData(
-            backup = mergedBackup,
-        )
-    }
-
-    private fun mergeMangaLists(
-        localMangaList: List<BackupManga>?,
-        remoteMangaList: List<BackupManga>?,
-        localCategories: List<BackupCategory>,
-        remoteCategories: List<BackupCategory>,
-        mergedCategories: List<BackupCategory>,
-    ): List<BackupManga> {
-        val localMangaListSafe = localMangaList.orEmpty()
-        val remoteMangaListSafe = remoteMangaList.orEmpty()
-
-        logger.debug { "Starting merge. Local list size: ${localMangaListSafe.size}, Remote list size: ${remoteMangaListSafe.size}" }
-
-        fun mangaCompositeKey(manga: BackupManga): String =
-            "${manga.source}|${manga.url}|${manga.title.lowercase().trim()}|${manga.author?.lowercase()?.trim()}"
-
-        // Create maps using composite keys
-        val localMangaMap = localMangaListSafe.associateBy { mangaCompositeKey(it) }
-        val remoteMangaMap = remoteMangaListSafe.associateBy { mangaCompositeKey(it) }
-
-        val localCategoriesMapByOrder = localCategories.associateBy { it.order }
-        val remoteCategoriesMapByOrder = remoteCategories.associateBy { it.order }
-        val mergedCategoriesMapByName = mergedCategories.associateBy { it.name }
-
-        fun updateCategories(
-            theManga: BackupManga,
-            theMap: Map<Int, BackupCategory>,
-        ): BackupManga =
-            theManga.copy(
-                categories =
-                    theManga.categories.mapNotNull {
-                        theMap[it]?.let { category ->
-                            mergedCategoriesMapByName[category.name]?.order
-                        }
-                    },
-            )
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0).milliseconds.inWholeSeconds
-
-        val mergedList =
-            (localMangaMap.keys + remoteMangaMap.keys).distinct().mapNotNull { compositeKey ->
-                val local = localMangaMap[compositeKey]
-                val remote = remoteMangaMap[compositeKey]
-
-                // New version comparison logic
-                when {
-                    local != null && remote == null -> {
-                        if (lastSyncTime == 0L || local.lastModifiedAt > lastSyncTime) {
-                            updateCategories(local, localCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping local manga deleted on remote: ${local.title}." }
-                            null
-                        }
-                    }
-
-                    local == null && remote != null -> {
-                        if (lastSyncTime == 0L || remote.lastModifiedAt > lastSyncTime) {
-                            updateCategories(remote, remoteCategoriesMapByOrder)
-                        } else {
-                            logger.debug { "Dropping deleted remote manga: ${remote.title}." }
-                            null
-                        }
-                    }
-
-                    local != null && remote != null -> {
-                        // Compare versions to decide which manga to keep
-                        if (local.version >= remote.version) {
-                            logger.debug { "Keeping local version of ${local.title} with merged chapters." }
-                            updateCategories(
-                                local.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                localCategoriesMapByOrder,
-                            )
-                        } else {
-                            logger.debug { "Keeping remote version of ${remote.title} with merged chapters." }
-                            updateCategories(
-                                remote.copy(
-                                    chapters =
-                                        mergeChapters(
-                                            local.chapters,
-                                            remote.chapters,
-                                            lastSyncTime,
-                                            serverConfig.syncDataChapters.value,
-                                        ),
-                                ),
-                                remoteCategoriesMapByOrder,
-                            )
-                        }
-                    }
-
-                    else -> {
-                        null
-                    } // No manga found for key
-                }
-            }
-
-        // Counting favorites and non-favorites
-        val (favorites, nonFavorites) = mergedList.partition { it.favorite }
-
-        logger.debug {
-            "Merge completed. Total merged manga: ${mergedList.size}, Favorites: ${favorites.size}, Non-Favorites: ${nonFavorites.size}"
-        }
-
-        return mergedList
-    }
-
-    private fun mergeChapters(
-        localChapters: List<BackupChapter>,
-        remoteChapters: List<BackupChapter>,
-        lastSyncTime: Long,
-        syncingChapters: Boolean,
-    ): List<BackupChapter> {
-        if (!syncingChapters) {
-            return remoteChapters // If not syncing chapters, keep remote untouched
-        }
-
-        fun chapterCompositeKey(chapter: BackupChapter): String = "${chapter.url}|${chapter.name}|${chapter.chapterNumber}"
-
-        val localChapterMap = localChapters.associateBy { chapterCompositeKey(it) }
-        val remoteChapterMap = remoteChapters.associateBy { chapterCompositeKey(it) }
-
-        logger.debug { "Starting chapter merge. Local chapters: ${localChapters.size}, Remote chapters: ${remoteChapters.size}" }
-
-        // Merge both chapter maps based on version numbers
-        val mergedChapters =
-            (localChapterMap.keys + remoteChapterMap.keys).distinct().mapNotNull { compositeKey ->
-                val localChapter = localChapterMap[compositeKey]
-                val remoteChapter = remoteChapterMap[compositeKey]
-
-                logger.debug {
-                    "Processing chapter key: $compositeKey. Local chapter: ${localChapter != null}, Remote chapter: ${remoteChapter != null}"
-                }
-
-                when {
-                    localChapter != null && remoteChapter == null -> {
-                        if (lastSyncTime == 0L || localChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Keeping local chapter: ${localChapter.name}." }
-                            localChapter
-                        } else {
-                            logger.debug { "Dropping local chapter deleted on remote: ${localChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter == null && remoteChapter != null -> {
-                        if (lastSyncTime == 0L || remoteChapter.lastModifiedAt > lastSyncTime) {
-                            logger.debug { "Taking remote chapter: ${remoteChapter.name}." }
-                            remoteChapter
-                        } else {
-                            logger.debug { "Dropping deleted remote chapter: ${remoteChapter.name}." }
-                            null
-                        }
-                    }
-
-                    localChapter != null && remoteChapter != null -> {
-                        // Use version number to decide which chapter to keep
-                        val chosenChapter =
-                            if (localChapter.version >= remoteChapter.version) {
-                                // If there are more chapter on remote, local sourceOrder will need to be updated to maintain correct source order.
-                                if (localChapters.size < remoteChapters.size) {
-                                    localChapter.copy(sourceOrder = remoteChapter.sourceOrder)
-                                } else {
-                                    localChapter
-                                }
-                            } else {
-                                remoteChapter
-                            }
-                        logger.debug {
-                            "Merging chapter: ${chosenChapter.name}. Chosen version from: ${if (localChapter.version >= remoteChapter.version) "Local" else "Remote"}, Local version: ${localChapter.version}, Remote version: ${remoteChapter.version}."
-                        }
-                        chosenChapter
-                    }
-
-                    else -> {
-                        logger.debug { "No chapter found for composite key: $compositeKey. Skipping." }
-                        null
-                    }
-                }
-            }
-
-        logger.debug { "Chapter merge completed. Total merged chapters: ${mergedChapters.size}" }
-
-        return mergedChapters
-    }
-
-    private fun mergeCategoriesLists(
-        localCategoriesList: List<BackupCategory>?,
-        remoteCategoriesList: List<BackupCategory>?,
-    ): List<BackupCategory> {
-        if (localCategoriesList == null) return remoteCategoriesList ?: emptyList()
-        if (remoteCategoriesList == null) return localCategoriesList
-        val result = mutableListOf<BackupCategory>()
-        val processedLocals = mutableSetOf<BackupCategory>()
-
-        val localMapByUid = localCategoriesList.filter { it.uid != 0L }.associateBy { it.uid }
-        val localMapByName = localCategoriesList.associateBy { it.name }
-
-        val lastSyncTime = syncPreferences.getLong("last_sync_timestamp", 0)
-
-        remoteCategoriesList.forEach { remote ->
-            var localMatch: BackupCategory? = null
-
-            // 1. Try match by UID
-            if (remote.uid != 0L) {
-                localMatch = localMapByUid[remote.uid]
-            }
-
-            // 2. Try match by Name (fallback)
-            if (localMatch == null) {
-                localMatch = localMapByName[remote.name]
-            }
-
-            if (localMatch != null) {
-                processedLocals.add(localMatch)
-                // Conflict resolution
-                if (localMatch.version >= remote.version) {
-                    logger.debug { "Keeping local category: ${localMatch.name} (UID: ${localMatch.uid})" }
-                    result.add(localMatch)
-                } else {
-                    logger.debug { "Keeping remote category: ${remote.name} (UID: ${remote.uid})" }
-                    // Preserve Local UID if Remote was 0
-                    if (remote.uid == 0L) {
-                        remote.uid = localMatch.uid
-                    }
-                    result.add(remote)
-                }
-            } else {
-                val remoteModifiedTimeMillis = remote.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || remoteModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Adding new remote category: ${remote.name} (UID: ${remote.uid})" }
-                    result.add(remote)
-                } else {
-                    logger.debug { "Dropping deleted remote category: ${remote.name} (UID: ${remote.uid})" }
-                }
-            }
-        }
-
-        // Add remaining Local Categories
-        localCategoriesList.forEach { local ->
-            if (local !in processedLocals) {
-                val localModifiedTimeMillis = local.lastModifiedAt.seconds.inWholeMilliseconds
-                if (lastSyncTime == 0L || localModifiedTimeMillis > lastSyncTime) {
-                    logger.debug { "Keeping local only category: ${local.name} (UID: ${local.uid})" }
-                    result.add(local)
-                } else {
-                    logger.debug { "Dropping local category deleted on remote: ${local.name} (UID: ${local.uid})" }
-                }
-            }
-        }
-
-        return result.sortedBy { it.order }
-    }
-
-    private fun mergeSourcesLists(
-        localSources: List<BackupSource>?,
-        remoteSources: List<BackupSource>?,
-    ): List<BackupSource> {
-        // Create maps using sourceId as key
-        val localSourceMap = localSources?.associateBy { it.sourceId } ?: emptyMap()
-        val remoteSourceMap = remoteSources?.associateBy { it.sourceId } ?: emptyMap()
-
-        logger.debug { "Starting source merge. Local sources: ${localSources?.size}, Remote sources: ${remoteSources?.size}" }
-
-        // Merge both source maps
-        val mergedSources =
-            (localSourceMap.keys + remoteSourceMap.keys).distinct().mapNotNull { sourceId ->
-                val localSource = localSourceMap[sourceId]
-                val remoteSource = remoteSourceMap[sourceId]
-
-                logger.debug {
-                    "Processing source ID: $sourceId. Local source: ${localSource != null}, Remote source: ${remoteSource != null}"
-                }
-
-                when {
-                    localSource != null && remoteSource == null -> {
-                        logger.debug { "Using local source: ${localSource.name}." }
-                        localSource
-                    }
-
-                    remoteSource != null && localSource == null -> {
-                        logger.debug { "Using remote source: ${remoteSource.name}." }
-                        remoteSource
-                    }
-
-                    else -> {
-                        logger.debug { "Remote and local have the same source ID: $sourceId. Keeping local." }
-                        localSource
-                    }
-                }
-            }
-
-        logger.debug { "Source merge completed. Total merged sources: ${mergedSources.size}" }
-
-        return mergedSources
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/global/model/table/GlobalMetaTable.kt

@@ -7,12 +7,12 @@ package suwayomi.tachidesk.global.model.table
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.dao.id.IntIdTable
 
 /**
  * Metadata storage for clients, server/global level.
  */
 object GlobalMetaTable : IntIdTable() {
-    val key = varchar("meta_key", 256)
+    val key = varchar("key", 256)
     val value = varchar("value", 4096)
 }

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

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

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

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

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

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.CategoryNodeList
 import suwayomi.tachidesk.graphql.types.CategoryNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.CategoryType

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

@@ -11,28 +11,24 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.core.count
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.count
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.inList
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.types.ChapterNodeList
 import suwayomi.tachidesk.graphql.types.ChapterNodeList.Companion.toNodeList
 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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -52,7 +48,7 @@ class ChaptersForMangaDataLoader : KotlinDataLoader<Int, ChapterNodeList> {
     override val dataLoaderName = "ChaptersForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterNodeList> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterNodeList> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -72,7 +68,7 @@ class DownloadedChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
     override val dataLoaderName = "DownloadedChapterCountForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -94,7 +90,7 @@ class UnreadChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
     override val dataLoaderName = "UnreadChapterCountForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -116,7 +112,7 @@ class BookmarkedChapterCountForMangaDataLoader : KotlinDataLoader<Int, Int> {
     override val dataLoaderName = "BookmarkedChapterCountForMangaDataLoader"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, Int> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, Int> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -161,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -181,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -201,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -221,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -241,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -261,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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Int, ChapterType?> =
-        DataLoaderFactory.newDataLoader { ids ->
+        DataLoaderFactory.newDataLoader<Int, ChapterType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)

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

@@ -11,19 +11,19 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType> {
+class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType?> {
     override val dataLoaderName = "ExtensionDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionType?> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {
@@ -40,10 +40,10 @@ class ExtensionDataLoader : KotlinDataLoader<String, ExtensionType> {
         }
 }
 
-class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType> {
+class ExtensionForSourceDataLoader : KotlinDataLoader<Long, ExtensionType?> {
     override val dataLoaderName = "ExtensionForSourceDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, ExtensionType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, ExtensionType?> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {

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

@@ -12,13 +12,11 @@ import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
 import org.dataloader.DataLoaderOptions
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.cache.CustomCacheMap
 import suwayomi.tachidesk.graphql.types.MangaNodeList
 import suwayomi.tachidesk.graphql.types.MangaNodeList.Companion.toNodeList
@@ -27,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 {
@@ -124,6 +122,6 @@ class MangaForIdsDataLoader : KotlinDataLoader<List<Int>, MangaNodeList> {
                     }
                 }
             },
-            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()).build(),
+            DataLoaderOptions.newOptions().setCacheMap(CustomCacheMap<List<Int>, MangaNodeList>()),
         )
 }

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

@@ -4,10 +4,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
@@ -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> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, GlobalMetaType?> =
-        DataLoaderFactory.newDataLoader<String, GlobalMetaType> { ids ->
+        DataLoaderFactory.newDataLoader<String, GlobalMetaType?> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)

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

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
@@ -22,10 +22,10 @@ import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 
-class SourceDataLoader : KotlinDataLoader<Long, SourceType> {
+class SourceDataLoader : KotlinDataLoader<Long, SourceType?> {
     override val dataLoaderName = "SourceDataLoader"
 
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, SourceType> =
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<Long, SourceType?> =
         DataLoaderFactory.newDataLoader { ids ->
             future {
                 transaction {

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

@@ -11,10 +11,10 @@ import com.expediagroup.graphql.dataloader.KotlinDataLoader
 import graphql.GraphQLContext
 import org.dataloader.DataLoader
 import org.dataloader.DataLoaderFactory
-import org.jetbrains.exposed.v1.core.Slf4jSqlDebugLogger
+import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.addLogger
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.types.TrackRecordNodeList
 import suwayomi.tachidesk.graphql.types.TrackRecordNodeList.Companion.toNodeList
 import suwayomi.tachidesk.graphql.types.TrackRecordType

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

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

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

@@ -1,23 +1,21 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.lessEq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.minus
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus
-import org.jetbrains.exposed.v1.core.minus
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.plus
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
+import suwayomi.tachidesk.graphql.asDataFetcherResult
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.CategoryMetaType
 import suwayomi.tachidesk.graphql.types.CategoryType
@@ -44,13 +42,14 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun setCategoryMeta(input: SetCategoryMetaInput): SetCategoryMetaPayload? {
+    fun setCategoryMeta(input: SetCategoryMetaInput): DataFetcherResult<SetCategoryMetaPayload?> =
-        val (clientMutationId, meta) = input
+        asDataFetcherResult {
+            val (clientMutationId, meta) = input
 
-        Category.modifyMeta(meta.categoryId, meta.key, meta.value)
+            Category.modifyMeta(meta.categoryId, meta.key, meta.value)
 
-        return SetCategoryMetaPayload(clientMutationId, meta)
+            SetCategoryMetaPayload(clientMutationId, meta)
-    }
+        }
 
     data class DeleteCategoryMetaInput(
         val clientMutationId: String? = null,
@@ -65,33 +64,34 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DeleteCategoryMetaPayload? {
+    fun deleteCategoryMeta(input: DeleteCategoryMetaInput): DataFetcherResult<DeleteCategoryMetaPayload?> =
-        val (clientMutationId, categoryId, key) = input
+        asDataFetcherResult {
+            val (clientMutationId, categoryId, key) = input
 
-        val (meta, category) =
+            val (meta, category) =
-            transaction {
+                transaction {
-                val meta =
+                    val meta =
-                    CategoryMetaTable
+                        CategoryMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
+                            .where { (CategoryMetaTable.ref eq categoryId) and (CategoryMetaTable.key eq key) }
-                        .firstOrNull()
+                            .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 =
+                    val category =
-                    transaction {
+                        transaction {
-                        CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq categoryId }.first())
+                            CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq categoryId }.first())
-                    }
+                        }
 
-                if (meta != null) {
+                    if (meta != null) {
-                    CategoryMetaType(meta)
+                        CategoryMetaType(meta)
-                } else {
+                    } else {
-                    null
+                        null
-                } to category
+                    } to category
-            }
+                }
 
-        return DeleteCategoryMetaPayload(clientMutationId, meta, category)
+            DeleteCategoryMetaPayload(clientMutationId, meta, category)
-    }
+        }
 
     data class SetCategoryMetasItem(
         val categoryIds: List<Int>,
@@ -110,42 +110,43 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun setCategoryMetas(input: SetCategoryMetasInput): SetCategoryMetasPayload? {
+    fun setCategoryMetas(input: SetCategoryMetasInput): DataFetcherResult<SetCategoryMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        val metaByCategoryId =
+            val metaByCategoryId =
-            items
+                items
-                .flatMap { item ->
+                    .flatMap { item ->
-                    val metaMap = item.metas.associate { it.key to it.value }
+                        val metaMap = item.metas.associate { it.key to it.value }
-                    item.categoryIds.map { categoryId -> categoryId to metaMap }
+                        item.categoryIds.map { categoryId -> categoryId to metaMap }
-                }.groupBy({ it.first }, { it.second })
+                    }.groupBy({ it.first }, { it.second })
-                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
 
-        Category.modifyCategoriesMetas(metaByCategoryId)
+            Category.modifyCategoriesMetas(metaByCategoryId)
 
-        val allCategoryIds = metaByCategoryId.keys
+            val allCategoryIds = metaByCategoryId.keys
-        val allMetaKeys = metaByCategoryId.values.flatMap { item -> item.keys }.distinct()
+            val allMetaKeys = metaByCategoryId.values.flatMap { item -> item.keys }.distinct()
 
-        val (updatedMetas, categories) =
+            val (updatedMetas, categories) =
-            transaction {
+                transaction {
-                val updatedMetas =
+                    val updatedMetas =
-                    CategoryMetaTable
+                        CategoryMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (CategoryMetaTable.ref inList allCategoryIds) and (CategoryMetaTable.key inList allMetaKeys) }
+                            .where { (CategoryMetaTable.ref inList allCategoryIds) and (CategoryMetaTable.key inList allMetaKeys) }
-                        .map { CategoryMetaType(it) }
+                            .map { CategoryMetaType(it) }
 
-                val categories =
+                    val categories =
-                    CategoryTable
+                        CategoryTable
-                        .selectAll()
+                            .selectAll()
-                        .where { CategoryTable.id inList allCategoryIds }
+                            .where { CategoryTable.id inList allCategoryIds }
-                        .map { CategoryType(it) }
+                            .map { CategoryType(it) }
-                        .distinctBy { it.id }
+                            .distinctBy { it.id }
 
-                updatedMetas to categories
+                    updatedMetas to categories
-            }
+                }
 
-        return SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
+            SetCategoryMetasPayload(clientMutationId, updatedMetas, categories)
-    }
+        }
 
     data class DeleteCategoryMetasItem(
         val categoryIds: List<Int>,
@@ -165,63 +166,64 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DeleteCategoryMetasPayload? {
+    fun deleteCategoryMetas(input: DeleteCategoryMetasInput): DataFetcherResult<DeleteCategoryMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        items.forEach { item ->
+            items.forEach { item ->
-            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
-                "Either 'keys' or 'prefixes' must be provided for each item"
+                    "Either 'keys' or 'prefixes' must be provided for each item"
+                }
             }
-        }
 
-        val (allDeletedMetas, allCategoryIds) =
+            val (allDeletedMetas, allCategoryIds) =
-            transaction {
+                transaction {
-                val deletedMetas = mutableListOf<CategoryMetaType>()
+                    val deletedMetas = mutableListOf<CategoryMetaType>()
-                val categoryIds = mutableSetOf<Int>()
+                    val categoryIds = mutableSetOf<Int>()
 
-                items.forEach { item ->
+                    items.forEach { item ->
-                    val keyCondition: Op<Boolean>? =
+                        val keyCondition: Op<Boolean>? =
-                        item.keys?.takeIf { it.isNotEmpty() }?.let { CategoryMetaTable.key inList it }
+                            item.keys?.takeIf { it.isNotEmpty() }?.let { CategoryMetaTable.key inList it }
 
-                    val prefixCondition: Op<Boolean>? =
+                        val prefixCondition: Op<Boolean>? =
-                        item.prefixes
+                            item.prefixes
-                            ?.filter { it.isNotEmpty() }
+                                ?.filter { it.isNotEmpty() }
-                            ?.map { (CategoryMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                                ?.map { (CategoryMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
+                                ?.reduceOrNull { acc, op -> acc or op }
 
-                    val metaKeyCondition =
+                        val metaKeyCondition =
-                        if (keyCondition != null && prefixCondition != null) {
+                            if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
+                                keyCondition or prefixCondition
-                        } else {
+                            } else {
-                            keyCondition ?: prefixCondition!!
+                                keyCondition ?: prefixCondition!!
-                        }
+                            }
 
-                    val condition = (CategoryMetaTable.ref inList item.categoryIds) and metaKeyCondition
+                        val condition = (CategoryMetaTable.ref inList item.categoryIds) and metaKeyCondition
 
-                    deletedMetas +=
+                        deletedMetas +=
-                        CategoryMetaTable
+                            CategoryMetaTable
-                            .selectAll()
+                                .selectAll()
-                            .where { condition }
+                                .where { condition }
-                            .map { CategoryMetaType(it) }
+                                .map { CategoryMetaType(it) }
 
-                    CategoryMetaTable.deleteWhere { condition }
+                        CategoryMetaTable.deleteWhere { condition }
-                    categoryIds += item.categoryIds
+                        categoryIds += item.categoryIds
+                    }
+
+                    deletedMetas to categoryIds
                 }
 
-                deletedMetas to categoryIds
+            val categories =
-            }
+                transaction {
+                    CategoryTable
+                        .selectAll()
+                        .where { CategoryTable.id inList allCategoryIds }
+                        .map { CategoryType(it) }
+                        .distinctBy { it.id }
+                }
 
-        val categories =
+            DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
-            transaction {
+        }
-                CategoryTable
-                    .selectAll()
-                    .where { CategoryTable.id inList allCategoryIds }
-                    .map { CategoryType(it) }
-                    .distinctBy { it.id }
-            }
-
-        return DeleteCategoryMetasPayload(clientMutationId, allDeletedMetas, categories)
-    }
 
     data class UpdateCategoryPatch(
         val name: String? = null,
@@ -289,38 +291,40 @@ class CategoryMutation {
     }
 
     @RequireAuth
-    fun updateCategory(input: UpdateCategoryInput): UpdateCategoryPayload? {
+    fun updateCategory(input: UpdateCategoryInput): DataFetcherResult<UpdateCategoryPayload?> =
-        val (clientMutationId, id, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, id, patch) = input
 
-        updateCategories(listOf(id), patch)
+            updateCategories(listOf(id), patch)
 
-        val category =
+            val category =
-            transaction {
+                transaction {
-                CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
+                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
-            }
+                }
 
-        return UpdateCategoryPayload(
+            UpdateCategoryPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            category = category,
+                category = category,
-        )
+            )
-    }
+        }
 
     @RequireAuth
-    fun updateCategories(input: UpdateCategoriesInput): UpdateCategoriesPayload? {
+    fun updateCategories(input: UpdateCategoriesInput): DataFetcherResult<UpdateCategoriesPayload?> =
-        val (clientMutationId, ids, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, ids, patch) = input
 
-        updateCategories(ids, patch)
+            updateCategories(ids, patch)
 
-        val categories =
+            val categories =
-            transaction {
+                transaction {
-                CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
+                    CategoryTable.selectAll().where { CategoryTable.id inList ids }.map { CategoryType(it) }
-            }
+                }
 
-        return UpdateCategoriesPayload(
+            UpdateCategoriesPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            categories = categories,
+                categories = categories,
-        )
+            )
-    }
+        }
 
     data class UpdateCategoryOrderPayload(
         val clientMutationId: String?,
@@ -334,48 +338,49 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun updateCategoryOrder(input: UpdateCategoryOrderInput): UpdateCategoryOrderPayload? {
+    fun updateCategoryOrder(input: UpdateCategoryOrderInput): DataFetcherResult<UpdateCategoryOrderPayload?> =
-        val (clientMutationId, categoryId, position) = input
+        asDataFetcherResult {
-        require(position > 0) {
+            val (clientMutationId, categoryId, position) = input
-            "'order' must not be <= 0"
+            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) }
+                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
+                    }
+                }
             }
 
-        return UpdateCategoryOrderPayload(
+            Category.normalizeCategories()
-            clientMutationId = clientMutationId,
+
-            categories = categories,
+            val categories =
-        )
+                transaction {
-    }
+                    CategoryTable.selectAll().orderBy(CategoryTable.order).map { CategoryType(it) }
+                }
+
+            UpdateCategoryOrderPayload(
+                clientMutationId = clientMutationId,
+                categories = categories,
+            )
+        }
 
     data class CreateCategoryInput(
         val clientMutationId: String? = null,
@@ -392,52 +397,53 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun createCategory(input: CreateCategoryInput): CreateCategoryPayload? {
+    fun createCategory(input: CreateCategoryInput): DataFetcherResult<CreateCategoryPayload?> =
-        val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
+        asDataFetcherResult {
-        transaction {
+            val (clientMutationId, name, order, default, includeInUpdate, includeInDownload) = input
-            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"
-            }
-        }
-
-        val category =
             transaction {
-                if (order != null) {
+                require(CategoryTable.selectAll().where { CategoryTable.name eq input.name }.isEmpty()) {
-                    CategoryTable.update({ CategoryTable.order greaterEq order }) {
+                    "'name' must be unique"
-                        it[CategoryTable.order] = CategoryTable.order + 1
+                }
+            }
+            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 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()
+
+                    CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
                 }
 
-                val id =
+            CreateCategoryPayload(clientMutationId, category)
-                    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()
-
-                CategoryType(CategoryTable.selectAll().where { CategoryTable.id eq id }.first())
-            }
-
-        return CreateCategoryPayload(clientMutationId, category)
-    }
 
     data class DeleteCategoryInput(
         val clientMutationId: String? = null,
@@ -451,45 +457,47 @@ class CategoryMutation {
     )
 
     @RequireAuth
-    fun deleteCategory(input: DeleteCategoryInput): DeleteCategoryPayload? {
+    fun deleteCategory(input: DeleteCategoryInput): DataFetcherResult<DeleteCategoryPayload?> {
-        val (clientMutationId, categoryId) = input
+        return asDataFetcherResult {
-        if (categoryId == 0) { // Don't delete default category
+            val (clientMutationId, categoryId) = input
-            return DeleteCategoryPayload(
+            if (categoryId == 0) { // Don't delete default category
-                clientMutationId,
+                return@asDataFetcherResult DeleteCategoryPayload(
-                null,
+                    clientMutationId,
-                emptyList(),
+                    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
             }
 
-        return DeleteCategoryPayload(clientMutationId, category, 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)
+        }
     }
 
     data class UpdateMangaCategoriesPatch(
@@ -539,36 +547,38 @@ class CategoryMutation {
     }
 
     @RequireAuth
-    fun updateMangaCategories(input: UpdateMangaCategoriesInput): UpdateMangaCategoriesPayload? {
+    fun updateMangaCategories(input: UpdateMangaCategoriesInput): DataFetcherResult<UpdateMangaCategoriesPayload?> =
-        val (clientMutationId, id, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, id, patch) = input
 
-        updateMangas(listOf(id), patch)
+            updateMangas(listOf(id), patch)
 
-        val manga =
+            val manga =
-            transaction {
+                transaction {
-                MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
+                    MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
-            }
+                }
 
-        return UpdateMangaCategoriesPayload(
+            UpdateMangaCategoriesPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            manga = manga,
+                manga = manga,
-        )
+            )
-    }
+        }
 
     @RequireAuth
-    fun updateMangasCategories(input: UpdateMangasCategoriesInput): UpdateMangasCategoriesPayload? {
+    fun updateMangasCategories(input: UpdateMangasCategoriesInput): DataFetcherResult<UpdateMangasCategoriesPayload?> =
-        val (clientMutationId, ids, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, ids, patch) = input
 
-        updateMangas(ids, patch)
+            updateMangas(ids, patch)
 
-        val mangas =
+            val mangas =
-            transaction {
+                transaction {
-                MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
+                    MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
-            }
+                }
 
-        return UpdateMangasCategoriesPayload(
+            UpdateMangasCategoriesPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            mangas = mangas,
+                mangas = mangas,
-        )
+            )
-    }
+        }
 }

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

@@ -1,24 +1,22 @@
-@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.v1.core.LikePattern
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.graphql.asDataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterMetaType
 import suwayomi.tachidesk.graphql.types.ChapterType
@@ -92,23 +90,22 @@ class ChapterMutation {
             if (patch.isRead != null || patch.isBookmarked != null || patch.lastPageRead != null) {
                 val now = Instant.now().epochSecond
 
-                BatchUpdateStatement(ChapterTable)
+                BatchUpdateStatement(ChapterTable).apply {
-                    .apply {
+                    ids.forEach { chapterId ->
-                        ids.forEach { chapterId ->
+                        addBatch(EntityID(chapterId, ChapterTable))
-                            addBatch(EntityID(chapterId, ChapterTable))
+                        patch.isRead?.also {
-                            patch.isRead?.also {
+                            this[ChapterTable.isRead] = it
-                                this[ChapterTable.isRead] = it
-                            }
-                            patch.isBookmarked?.also {
-                                this[ChapterTable.isBookmarked] = it
-                            }
-                            patch.lastPageRead?.also {
-                                this[ChapterTable.lastPageRead] = it.coerceAtMost(chapterIdToPageCount[chapterId] ?: 0).coerceAtLeast(0)
-                                this[ChapterTable.lastReadAt] = now
-                            }
                         }
-                    }.toExecutable()
+                        patch.isBookmarked?.also {
-                    .execute(this@transaction)
+                            this[ChapterTable.isBookmarked] = it
+                        }
+                        patch.lastPageRead?.also {
+                            this[ChapterTable.lastPageRead] = it.coerceAtMost(chapterIdToPageCount[chapterId] ?: 0).coerceAtLeast(0)
+                            this[ChapterTable.lastReadAt] = now
+                        }
+                    }
+                    execute(this@transaction)
+                }
             }
         }
 
@@ -123,38 +120,40 @@ class ChapterMutation {
     }
 
     @RequireAuth
-    fun updateChapter(input: UpdateChapterInput): UpdateChapterPayload? {
+    fun updateChapter(input: UpdateChapterInput): DataFetcherResult<UpdateChapterPayload?> =
-        val (clientMutationId, id, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, id, patch) = input
 
-        updateChapters(listOf(id), patch)
+            updateChapters(listOf(id), patch)
 
-        val chapter =
+            val chapter =
-            transaction {
+                transaction {
-                ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
+                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq id }.first())
-            }
+                }
 
-        return UpdateChapterPayload(
+            UpdateChapterPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapter = chapter,
+                chapter = chapter,
-        )
+            )
-    }
+        }
 
     @RequireAuth
-    fun updateChapters(input: UpdateChaptersInput): UpdateChaptersPayload? {
+    fun updateChapters(input: UpdateChaptersInput): DataFetcherResult<UpdateChaptersPayload?> =
-        val (clientMutationId, ids, patch) = input
+        asDataFetcherResult {
+            val (clientMutationId, ids, patch) = input
 
-        updateChapters(ids, patch)
+            updateChapters(ids, patch)
 
-        val chapters =
+            val chapters =
-            transaction {
+                transaction {
-                ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
+                    ChapterTable.selectAll().where { ChapterTable.id inList ids }.map { ChapterType(it) }
-            }
+                }
 
-        return UpdateChaptersPayload(
+            UpdateChaptersPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapters = chapters,
+                chapters = chapters,
-        )
+            )
-    }
+        }
 
     data class FetchChaptersInput(
         val clientMutationId: String? = null,
@@ -167,25 +166,27 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<FetchChaptersPayload?> {
+    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<DataFetcherResult<FetchChaptersPayload?>> {
         val (clientMutationId, mangaId) = input
 
         return future {
-            Chapter.fetchChapterList(mangaId)
+            asDataFetcherResult {
+                Chapter.fetchChapterList(mangaId)
 
-            val chapters =
+                val chapters =
-                transaction {
+                    transaction {
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.manga eq mangaId }
+                            .where { ChapterTable.manga eq mangaId }
-                        .orderBy(ChapterTable.sourceOrder)
+                            .orderBy(ChapterTable.sourceOrder)
-                        .map { ChapterType(it) }
+                            .map { ChapterType(it) }
-                }
+                    }
 
-            FetchChaptersPayload(
+                FetchChaptersPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                chapters = chapters,
+                    chapters = chapters,
-            )
+                )
+            }
         }
     }
 
@@ -200,13 +201,14 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun setChapterMeta(input: SetChapterMetaInput): SetChapterMetaPayload? {
+    fun setChapterMeta(input: SetChapterMetaInput): DataFetcherResult<SetChapterMetaPayload?> =
-        val (clientMutationId, meta) = input
+        asDataFetcherResult {
+            val (clientMutationId, meta) = input
 
-        Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
+            Chapter.modifyChapterMeta(meta.chapterId, meta.key, meta.value)
 
-        return SetChapterMetaPayload(clientMutationId, meta)
+            SetChapterMetaPayload(clientMutationId, meta)
-    }
+        }
 
     data class DeleteChapterMetaInput(
         val clientMutationId: String? = null,
@@ -221,33 +223,34 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun deleteChapterMeta(input: DeleteChapterMetaInput): DeleteChapterMetaPayload? {
+    fun deleteChapterMeta(input: DeleteChapterMetaInput): DataFetcherResult<DeleteChapterMetaPayload?> =
-        val (clientMutationId, chapterId, key) = input
+        asDataFetcherResult {
+            val (clientMutationId, chapterId, key) = input
 
-        val (meta, chapter) =
+            val (meta, chapter) =
-            transaction {
+                transaction {
-                val meta =
+                    val meta =
-                    ChapterMetaTable
+                        ChapterMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
+                            .where { (ChapterMetaTable.ref eq chapterId) and (ChapterMetaTable.key eq key) }
-                        .firstOrNull()
+                            .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 =
+                    val chapter =
-                    transaction {
+                        transaction {
-                        ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first())
+                            ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapterId }.first())
-                    }
+                        }
 
-                if (meta != null) {
+                    if (meta != null) {
-                    ChapterMetaType(meta)
+                        ChapterMetaType(meta)
-                } else {
+                    } else {
-                    null
+                        null
-                } to chapter
+                    } to chapter
-            }
+                }
 
-        return DeleteChapterMetaPayload(clientMutationId, meta, chapter)
+            DeleteChapterMetaPayload(clientMutationId, meta, chapter)
-    }
+        }
 
     data class SetChapterMetasItem(
         val chapterIds: List<Int>,
@@ -266,42 +269,43 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun setChapterMetas(input: SetChapterMetasInput): SetChapterMetasPayload? {
+    fun setChapterMetas(input: SetChapterMetasInput): DataFetcherResult<SetChapterMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        val metaByChapterId =
+            val metaByChapterId =
-            items
+                items
-                .flatMap { item ->
+                    .flatMap { item ->
-                    val metaMap = item.metas.associate { it.key to it.value }
+                        val metaMap = item.metas.associate { it.key to it.value }
-                    item.chapterIds.map { chapterId -> chapterId to metaMap }
+                        item.chapterIds.map { chapterId -> chapterId to metaMap }
-                }.groupBy({ it.first }, { it.second })
+                    }.groupBy({ it.first }, { it.second })
-                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
 
-        Chapter.modifyChaptersMetas(metaByChapterId)
+            Chapter.modifyChaptersMetas(metaByChapterId)
 
-        val allChapterIds = metaByChapterId.keys
+            val allChapterIds = metaByChapterId.keys
-        val allMetaKeys = metaByChapterId.values.flatMap { it.keys }.distinct()
+            val allMetaKeys = metaByChapterId.values.flatMap { it.keys }.distinct()
 
-        val (updatedMetas, chapters) =
+            val (updatedMetas, chapters) =
-            transaction {
+                transaction {
-                val updatedMetas =
+                    val updatedMetas =
-                    ChapterMetaTable
+                        ChapterMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (ChapterMetaTable.ref inList allChapterIds) and (ChapterMetaTable.key inList allMetaKeys) }
+                            .where { (ChapterMetaTable.ref inList allChapterIds) and (ChapterMetaTable.key inList allMetaKeys) }
-                        .map { ChapterMetaType(it) }
+                            .map { ChapterMetaType(it) }
 
-                val chapters =
+                    val chapters =
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.id inList allChapterIds }
+                            .where { ChapterTable.id inList allChapterIds }
-                        .map { ChapterType(it) }
+                            .map { ChapterType(it) }
-                        .distinctBy { it.id }
+                            .distinctBy { it.id }
 
-                updatedMetas to chapters
+                    updatedMetas to chapters
-            }
+                }
 
-        return SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
+            SetChapterMetasPayload(clientMutationId, updatedMetas, chapters)
-    }
+        }
 
     data class DeleteChapterMetasItem(
         val chapterIds: List<Int>,
@@ -321,63 +325,64 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun deleteChapterMetas(input: DeleteChapterMetasInput): DeleteChapterMetasPayload? {
+    fun deleteChapterMetas(input: DeleteChapterMetasInput): DataFetcherResult<DeleteChapterMetasPayload?> =
-        val (clientMutationId, items) = input
+        asDataFetcherResult {
+            val (clientMutationId, items) = input
 
-        items.forEach { item ->
+            items.forEach { item ->
-            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
-                "Either 'keys' or 'prefixes' must be provided for each item"
+                    "Either 'keys' or 'prefixes' must be provided for each item"
+                }
             }
-        }
 
-        val (allDeletedMetas, allChapterIds) =
+            val (allDeletedMetas, allChapterIds) =
-            transaction {
+                transaction {
-                val deletedMetas = mutableListOf<ChapterMetaType>()
+                    val deletedMetas = mutableListOf<ChapterMetaType>()
-                val chapterIds = mutableSetOf<Int>()
+                    val chapterIds = mutableSetOf<Int>()
 
-                items.forEach { item ->
+                    items.forEach { item ->
-                    val keyCondition: Op<Boolean>? =
+                        val keyCondition: Op<Boolean>? =
-                        item.keys?.takeIf { it.isNotEmpty() }?.let { ChapterMetaTable.key inList it }
+                            item.keys?.takeIf { it.isNotEmpty() }?.let { ChapterMetaTable.key inList it }
 
-                    val prefixCondition: Op<Boolean>? =
+                        val prefixCondition: Op<Boolean>? =
-                        item.prefixes
+                            item.prefixes
-                            ?.filter { it.isNotEmpty() }
+                                ?.filter { it.isNotEmpty() }
-                            ?.map { (ChapterMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                                ?.map { (ChapterMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
+                                ?.reduceOrNull { acc, op -> acc or op }
 
-                    val metaKeyCondition =
+                        val metaKeyCondition =
-                        if (keyCondition != null && prefixCondition != null) {
+                            if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
+                                keyCondition or prefixCondition
-                        } else {
+                            } else {
-                            keyCondition ?: prefixCondition!!
+                                keyCondition ?: prefixCondition!!
-                        }
+                            }
 
-                    val condition = (ChapterMetaTable.ref inList item.chapterIds) and metaKeyCondition
+                        val condition = (ChapterMetaTable.ref inList item.chapterIds) and metaKeyCondition
 
-                    deletedMetas +=
+                        deletedMetas +=
-                        ChapterMetaTable
+                            ChapterMetaTable
-                            .selectAll()
+                                .selectAll()
-                            .where { condition }
+                                .where { condition }
-                            .map { ChapterMetaType(it) }
+                                .map { ChapterMetaType(it) }
 
-                    ChapterMetaTable.deleteWhere { condition }
+                        ChapterMetaTable.deleteWhere { condition }
-                    chapterIds += item.chapterIds
+                        chapterIds += item.chapterIds
+                    }
+
+                    deletedMetas to chapterIds
                 }
 
-                deletedMetas to chapterIds
+            val chapters =
-            }
+                transaction {
+                    ChapterTable
+                        .selectAll()
+                        .where { ChapterTable.id inList allChapterIds }
+                        .map { ChapterType(it) }
+                        .distinctBy { it.id }
+                }
 
-        val chapters =
+            DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
-            transaction {
+        }
-                ChapterTable
-                    .selectAll()
-                    .where { ChapterTable.id inList allChapterIds }
-                    .map { ChapterType(it) }
-                    .distinctBy { it.id }
-            }
-
-        return DeleteChapterMetasPayload(clientMutationId, allDeletedMetas, chapters)
-    }
 
     data class FetchChapterPagesInput(
         val clientMutationId: String? = null,
@@ -400,65 +405,67 @@ class ChapterMutation {
     )
 
     @RequireAuth
-    fun fetchChapterPages(input: FetchChapterPagesInput): CompletableFuture<FetchChapterPagesPayload?> {
+    fun fetchChapterPages(input: FetchChapterPagesInput): CompletableFuture<DataFetcherResult<FetchChapterPagesPayload?>> {
         val (clientMutationId, chapterId) = input
         val paramsMap = input.toParams()
 
         return future {
-            var chapter = getChapterDownloadReadyById(chapterId)
+            asDataFetcherResult {
-            val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
+                var chapter = getChapterDownloadReadyById(chapterId)
-            var syncConflictInfo: SyncConflictInfoType? = null
+                val syncResult = KoreaderSyncService.checkAndPullProgress(chapter.id)
+                var syncConflictInfo: SyncConflictInfoType? = null
 
-            if (syncResult != null) {
+                if (syncResult != null) {
-                if (syncResult.isConflict) {
+                    if (syncResult.isConflict) {
-                    syncConflictInfo =
+                        syncConflictInfo =
-                        SyncConflictInfoType(
+                            SyncConflictInfoType(
-                            deviceName = syncResult.device,
+                                deviceName = syncResult.device,
-                            remotePage = syncResult.pageRead,
+                                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.shouldUpdate) {
+                val params =
-                    // Update DB for SILENT and RECEIVE
+                    buildString {
-                    transaction {
+                        if (paramsMap.isNotEmpty()) {
-                        ChapterTable.update({ ChapterTable.id eq chapter.id }) {
+                            append("?")
-                            it[lastPageRead] = syncResult.pageRead
+                            paramsMap.entries.forEach { entry ->
-                            it[lastReadAt] = syncResult.timestamp
+                                if (length > 1) {
-                        }
+                                    append("&")
-                    }
+                                }
-                }
+                                append(entry.key)
-                // For PROMPT, SILENT, and RECEIVE, return the remote progress
+                                append("=")
-                chapter =
+                                append(URLEncoder.encode(entry.value, Charsets.UTF_8))
-                    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(
+                FetchChapterPagesPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                pages =
+                    pages =
-                    List(chapter.pageCount) { index ->
+                        List(chapter.pageCount) { index ->
-                        "/api/v1/manga/${chapter.mangaId}/chapter/${chapter.index}/page/${index}$params"
+                            "/api/v1/manga/${chapter.mangaId}/chapter/${chapter.index}/page/${index}$params"
-                    },
+                        },
-                chapter = ChapterType(chapter),
+                    chapter = ChapterType(chapter),
-                syncConflict = syncConflictInfo,
+                    syncConflict = syncConflictInfo,
-            )
+                )
+            }
         }
     }
 }

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

@@ -1,13 +1,11 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
+import graphql.execution.DataFetcherResult
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withTimeout
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import suwayomi.tachidesk.graphql.asDataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.DownloadStatus
@@ -32,21 +30,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DeleteDownloadedChaptersPayload? {
+    fun deleteDownloadedChapters(input: DeleteDownloadedChaptersInput): DataFetcherResult<DeleteDownloadedChaptersPayload?> {
         val (clientMutationId, chapters) = input
 
-        Chapter.deleteChapters(chapters)
+        return asDataFetcherResult {
+            Chapter.deleteChapters(chapters)
 
-        return DeleteDownloadedChaptersPayload(
+            DeleteDownloadedChaptersPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapters =
+                chapters =
-                transaction {
+                    transaction {
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.id inList chapters }
+                            .where { ChapterTable.id inList chapters }
-                        .map { ChapterType(it) }
+                            .map { ChapterType(it) }
-                },
+                    },
-        )
+            )
+        }
     }
 
     data class DeleteDownloadedChapterInput(
@@ -60,18 +60,20 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DeleteDownloadedChapterPayload? {
+    fun deleteDownloadedChapter(input: DeleteDownloadedChapterInput): DataFetcherResult<DeleteDownloadedChapterPayload?> {
         val (clientMutationId, chapter) = input
 
-        Chapter.deleteChapters(listOf(chapter))
+        return asDataFetcherResult {
+            Chapter.deleteChapters(listOf(chapter))
 
-        return DeleteDownloadedChapterPayload(
+            DeleteDownloadedChapterPayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            chapters =
+                chapters =
-                transaction {
+                    transaction {
-                    ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapter }.first())
+                        ChapterType(ChapterTable.selectAll().where { ChapterTable.id eq chapter }.first())
-                },
+                    },
-        )
+            )
+        }
     }
 
     data class EnqueueChapterDownloadsInput(
@@ -85,24 +87,28 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun enqueueChapterDownloads(input: EnqueueChapterDownloadsInput): CompletableFuture<EnqueueChapterDownloadsPayload?> {
+    fun enqueueChapterDownloads(
+        input: EnqueueChapterDownloadsInput,
+    ): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadsPayload?>> {
         val (clientMutationId, chapters) = input
 
         return future {
-            DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))
+            asDataFetcherResult {
+                DownloadManager.enqueue(DownloadManager.EnqueueInput(chapters))
 
-            EnqueueChapterDownloadsPayload(
+                EnqueueChapterDownloadsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first {
+                                    .first {
-                                    DownloadManager.getStatus().queue.any { it.chapterId in chapters }
+                                        DownloadManager.getStatus().queue.any { it.chapterId in chapters }
-                                }.let { DownloadManager.getStatus() },
+                                    }.let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -117,23 +123,25 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<EnqueueChapterDownloadPayload?> {
+    fun enqueueChapterDownload(input: EnqueueChapterDownloadInput): CompletableFuture<DataFetcherResult<EnqueueChapterDownloadPayload?>> {
         val (clientMutationId, chapter) = input
 
         return future {
-            DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))
+            asDataFetcherResult {
+                DownloadManager.enqueue(DownloadManager.EnqueueInput(listOf(chapter)))
 
-            EnqueueChapterDownloadPayload(
+                EnqueueChapterDownloadPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.updates.any { it.downloadQueueItem.chapterId == chapter } }
+                                    .first { it.updates.any { it.downloadQueueItem.chapterId == chapter } }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -148,26 +156,30 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun dequeueChapterDownloads(input: DequeueChapterDownloadsInput): CompletableFuture<DequeueChapterDownloadsPayload?> {
+    fun dequeueChapterDownloads(
+        input: DequeueChapterDownloadsInput,
+    ): CompletableFuture<DataFetcherResult<DequeueChapterDownloadsPayload?>> {
         val (clientMutationId, chapters) = input
 
         return future {
-            DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))
+            asDataFetcherResult {
+                DownloadManager.dequeue(DownloadManager.EnqueueInput(chapters))
 
-            DequeueChapterDownloadsPayload(
+                DequeueChapterDownloadsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first {
+                                    .first {
-                                    it.updates.any {
+                                        it.updates.any {
-                                        it.downloadQueueItem.chapterId in chapters && it.type == DEQUEUED
+                                            it.downloadQueueItem.chapterId in chapters && it.type == DEQUEUED
-                                    }
+                                        }
-                                }.let { DownloadManager.getStatus() },
+                                    }.let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -182,26 +194,28 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DequeueChapterDownloadPayload?> {
+    fun dequeueChapterDownload(input: DequeueChapterDownloadInput): CompletableFuture<DataFetcherResult<DequeueChapterDownloadPayload?>> {
         val (clientMutationId, chapter) = input
 
         return future {
-            DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))
+            asDataFetcherResult {
+                DownloadManager.dequeue(DownloadManager.EnqueueInput(listOf(chapter)))
 
-            DequeueChapterDownloadPayload(
+                DequeueChapterDownloadPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first {
+                                    .first {
-                                    it.updates.any {
+                                        it.updates.any {
-                                        it.downloadQueueItem.chapterId == chapter && it.type == DEQUEUED
+                                            it.downloadQueueItem.chapterId == chapter && it.type == DEQUEUED
-                                    }
+                                        }
-                                }.let { DownloadManager.getStatus() },
+                                    }.let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 
@@ -215,21 +229,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun startDownloader(input: StartDownloaderInput): CompletableFuture<StartDownloaderPayload?> =
+    fun startDownloader(input: StartDownloaderInput): CompletableFuture<DataFetcherResult<StartDownloaderPayload?>> =
         future {
-            DownloadManager.start()
+            asDataFetcherResult {
+                DownloadManager.start()
 
-            StartDownloaderPayload(
+                StartDownloaderPayload(
-                input.clientMutationId,
+                    input.clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.status == Status.Started }
+                                    .first { it.status == Status.Started }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
 
     data class StopDownloaderInput(
@@ -242,21 +258,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<StopDownloaderPayload?> =
+    fun stopDownloader(input: StopDownloaderInput): CompletableFuture<DataFetcherResult<StopDownloaderPayload?>> =
         future {
-            DownloadManager.stop()
+            asDataFetcherResult {
+                DownloadManager.stop()
 
-            StopDownloaderPayload(
+                StopDownloaderPayload(
-                input.clientMutationId,
+                    input.clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.status == Status.Stopped }
+                                    .first { it.status == Status.Stopped }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
 
     data class ClearDownloaderInput(
@@ -269,21 +287,23 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<ClearDownloaderPayload?> =
+    fun clearDownloader(input: ClearDownloaderInput): CompletableFuture<DataFetcherResult<ClearDownloaderPayload?>> =
         future {
-            DownloadManager.clear()
+            asDataFetcherResult {
+                DownloadManager.clear()
 
-            ClearDownloaderPayload(
+                ClearDownloaderPayload(
-                input.clientMutationId,
+                    input.clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.status == Status.Stopped }
+                                    .first { it.status == Status.Stopped }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
 
     data class ReorderChapterDownloadInput(
@@ -298,23 +318,25 @@ class DownloadMutation {
     )
 
     @RequireAuth
-    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<ReorderChapterDownloadPayload?> {
+    fun reorderChapterDownload(input: ReorderChapterDownloadInput): CompletableFuture<DataFetcherResult<ReorderChapterDownloadPayload?>> {
         val (clientMutationId, chapter, to) = input
 
         return future {
-            DownloadManager.reorder(chapter, to)
+            asDataFetcherResult {
+                DownloadManager.reorder(chapter, to)
 
-            ReorderChapterDownloadPayload(
+                ReorderChapterDownloadPayload(
-                clientMutationId,
+                    clientMutationId,
-                downloadStatus =
+                    downloadStatus =
-                    withTimeout(30.seconds) {
+                        withTimeout(30.seconds) {
-                        DownloadStatus(
+                            DownloadStatus(
-                            DownloadManager.updates
+                                DownloadManager.updates
-                                .first { it.updates.indexOfFirst { it.downloadQueueItem.chapterId == chapter } <= to }
+                                    .first { it.updates.indexOfFirst { it.downloadQueueItem.chapterId == chapter } <= to }
-                                .let { DownloadManager.getStatus() },
+                                    .let { DownloadManager.getStatus() },
-                        )
+                            )
-                    },
+                        },
-            )
+                )
+            }
         }
     }
 }

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

@@ -1,14 +1,11 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
 import eu.kanade.tachiyomi.source.local.LocalSource
+import graphql.execution.DataFetcherResult
 import io.javalin.http.UploadedFile
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.neq
+import suwayomi.tachidesk.graphql.asDataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension
@@ -78,47 +75,51 @@ class ExtensionMutation {
     }
 
     @RequireAuth
-    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<UpdateExtensionPayload?> {
+    fun updateExtension(input: UpdateExtensionInput): CompletableFuture<DataFetcherResult<UpdateExtensionPayload?>> {
         val (clientMutationId, id, patch) = input
 
         return future {
-            updateExtensions(listOf(id), patch)
+            asDataFetcherResult {
+                updateExtensions(listOf(id), patch)
 
-            val extension =
+                val extension =
-                transaction {
+                    transaction {
-                    ExtensionTable
+                        ExtensionTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ExtensionTable.pkgName eq id }
+                            .where { ExtensionTable.pkgName eq id }
-                        .firstOrNull()
+                            .firstOrNull()
-                        ?.let { ExtensionType(it) }
+                            ?.let { ExtensionType(it) }
-                }
+                    }
 
-            UpdateExtensionPayload(
+                UpdateExtensionPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                extension = extension,
+                    extension = extension,
-            )
+                )
+            }
         }
     }
 
     @RequireAuth
-    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<UpdateExtensionsPayload?> {
+    fun updateExtensions(input: UpdateExtensionsInput): CompletableFuture<DataFetcherResult<UpdateExtensionsPayload?>> {
         val (clientMutationId, ids, patch) = input
 
         return future {
-            updateExtensions(ids, patch)
+            asDataFetcherResult {
+                updateExtensions(ids, patch)
 
-            val extensions =
+                val extensions =
-                transaction {
+                    transaction {
-                    ExtensionTable
+                        ExtensionTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ExtensionTable.pkgName inList ids }
+                            .where { ExtensionTable.pkgName inList ids }
-                        .map { ExtensionType(it) }
+                            .map { ExtensionType(it) }
-                }
+                    }
 
-            UpdateExtensionsPayload(
+                UpdateExtensionsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                extensions = extensions,
+                    extensions = extensions,
-            )
+                )
+            }
         }
     }
 
@@ -132,24 +133,26 @@ class ExtensionMutation {
     )
 
     @RequireAuth
-    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<FetchExtensionsPayload?> {
+    fun fetchExtensions(input: FetchExtensionsInput): CompletableFuture<DataFetcherResult<FetchExtensionsPayload?>> {
         val (clientMutationId) = input
 
         return future {
-            ExtensionsList.fetchExtensions()
+            asDataFetcherResult {
+                ExtensionsList.fetchExtensions()
 
-            val extensions =
+                val extensions =
-                transaction {
+                    transaction {
-                    ExtensionTable
+                        ExtensionTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
+                            .where { ExtensionTable.name neq LocalSource.EXTENSION_NAME }
-                        .map { ExtensionType(it) }
+                            .map { ExtensionType(it) }
-                }
+                    }
 
-            FetchExtensionsPayload(
+                FetchExtensionsPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                extensions = extensions,
+                    extensions = extensions,
-            )
+                )
+            }
         }
     }
 
@@ -164,19 +167,23 @@ class ExtensionMutation {
     )
 
     @RequireAuth
-    fun installExternalExtension(input: InstallExternalExtensionInput): CompletableFuture<InstallExternalExtensionPayload?> {
+    fun installExternalExtension(
+        input: InstallExternalExtensionInput,
+    ): CompletableFuture<DataFetcherResult<InstallExternalExtensionPayload?>> {
         val (clientMutationId, extensionFile) = input
 
         return future {
-            Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())
+            asDataFetcherResult {
+                Extension.installExternalExtension(extensionFile.content(), extensionFile.filename())
 
-            val dbExtension =
+                val dbExtension =
-                transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq extensionFile.filename() }.first() }
+                    transaction { ExtensionTable.selectAll().where { ExtensionTable.apkName eq extensionFile.filename() }.first() }
 
-            InstallExternalExtensionPayload(
+                InstallExternalExtensionPayload(
-                clientMutationId,
+                    clientMutationId,
-                extension = ExtensionType(dbExtension),
+                    extension = ExtensionType(dbExtension),
-            )
+                )
+            }
         }
     }
 }

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

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

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

@@ -1,9 +1,9 @@
-@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,51 +26,55 @@ class InfoMutation {
     )
 
     @RequireAuth
-    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<WebUIUpdatePayload?> {
+    fun updateWebUI(input: WebUIUpdateInput): CompletableFuture<DataFetcherResult<WebUIUpdatePayload?>> {
         return future {
-            withTimeout(30.seconds) {
+            asDataFetcherResult {
-                if (WebInterfaceManager.status.value.state === DOWNLOADING) {
+                withTimeout(30.seconds) {
-                    return@withTimeout WebUIUpdatePayload(input.clientMutationId, WebInterfaceManager.status.value)
+                    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) {
+                    if (!updateAvailable) {
-                    val didUpdateCheckFail = version.isEmpty()
+                        val didUpdateCheckFail = version.isEmpty()
 
-                    return@withTimeout WebUIUpdatePayload(
+                        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(
                         input.clientMutationId,
-                        WebInterfaceManager.getStatus(version, if (didUpdateCheckFail) ERROR else IDLE),
+                        updateStatus = WebInterfaceManager.status.first { it.state == DOWNLOADING },
                     )
                 }
-                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<WebUIUpdateStatus?> =
+    fun resetWebUIUpdateStatus(): CompletableFuture<DataFetcherResult<WebUIUpdateStatus?>> =
         future {
-            withTimeout(30.seconds) {
+            asDataFetcherResult {
-                val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
+                withTimeout(30.seconds) {
-                if (!isUpdateFinished) {
+                    val isUpdateFinished = WebInterfaceManager.status.value.state != DOWNLOADING
-                    throw Exception("Status reset is not allowed during status \"$DOWNLOADING\"")
+                    if (!isUpdateFinished) {
+                        throw Exception("Status reset is not allowed during status \"$DOWNLOADING\"")
+                    }
+
+                    WebInterfaceManager.resetStatus()
+
+                    WebInterfaceManager.status.first { it.state == IDLE }
                 }
-
-                WebInterfaceManager.resetStatus()
-
-                WebInterfaceManager.status.first { it.state == IDLE }
             }
         }
 }

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

@@ -1,11 +1,10 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.eq
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
+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
@@ -63,24 +62,26 @@ class KoreaderSyncMutation {
     )
 
     @RequireAuth
-    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<PushKoSyncProgressPayload?> =
+    fun pushKoSyncProgress(input: PushKoSyncProgressInput): CompletableFuture<DataFetcherResult<PushKoSyncProgressPayload?>> =
         future {
-            KoreaderSyncService.pushProgress(input.chapterId)
+            asDataFetcherResult {
+                KoreaderSyncService.pushProgress(input.chapterId)
 
-            val chapter =
+                val chapter =
-                transaction {
+                    transaction {
-                    ChapterTable
+                        ChapterTable
-                        .selectAll()
+                            .selectAll()
-                        .where { ChapterTable.id eq input.chapterId }
+                            .where { ChapterTable.id eq input.chapterId }
-                        .firstOrNull()
+                            .firstOrNull()
-                        ?.let { ChapterType(it) }
+                            ?.let { ChapterType(it) }
-                }
+                    }
 
-            PushKoSyncProgressPayload(
+                PushKoSyncProgressPayload(
-                clientMutationId = input.clientMutationId,
+                    clientMutationId = input.clientMutationId,
-                success = true,
+                    success = true,
-                chapter = chapter,
+                    chapter = chapter,
-            )
+                )
+            }
         }
 
     data class PullKoSyncProgressInput(
@@ -95,43 +96,45 @@ class KoreaderSyncMutation {
     )
 
     @RequireAuth
-    fun pullKoSyncProgress(input: PullKoSyncProgressInput): CompletableFuture<PullKoSyncProgressPayload?> =
+    fun pullKoSyncProgress(input: PullKoSyncProgressInput): CompletableFuture<DataFetcherResult<PullKoSyncProgressPayload?>> =
         future {
-            val syncResult = KoreaderSyncService.checkAndPullProgress(input.chapterId)
+            asDataFetcherResult {
-            var syncConflictInfo: SyncConflictInfoType? = null
+                val syncResult = KoreaderSyncService.checkAndPullProgress(input.chapterId)
+                var syncConflictInfo: SyncConflictInfoType? = null
 
-            if (syncResult != null) {
+                if (syncResult != null) {
-                if (syncResult.isConflict) {
+                    if (syncResult.isConflict) {
-                    syncConflictInfo =
+                        syncConflictInfo =
-                        SyncConflictInfoType(
+                            SyncConflictInfoType(
-                            deviceName = syncResult.device,
+                                deviceName = syncResult.device,
-                            remotePage = syncResult.pageRead,
+                                remotePage = syncResult.pageRead,
-                        )
+                            )
-                }
+                    }
 
-                if (syncResult.shouldUpdate) {
+                    if (syncResult.shouldUpdate) {
-                    transaction {
+                        transaction {
-                        ChapterTable.update({ ChapterTable.id eq input.chapterId }) {
+                            ChapterTable.update({ ChapterTable.id eq input.chapterId }) {
-                            it[lastPageRead] = syncResult.pageRead
+                                it[lastPageRead] = syncResult.pageRead
-                            it[lastReadAt] = syncResult.timestamp
+                                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,
-            )
         }
 }

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

@@ -1,18 +1,18 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.update
+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,40 +98,44 @@ class MangaMutation {
     }
 
     @RequireAuth
-    fun updateManga(input: UpdateMangaInput): CompletableFuture<UpdateMangaPayload?> {
+    fun updateManga(input: UpdateMangaInput): CompletableFuture<DataFetcherResult<UpdateMangaPayload?>> {
         val (clientMutationId, id, patch) = input
 
         return future {
-            updateMangas(listOf(id), patch)
+            asDataFetcherResult {
+                updateMangas(listOf(id), patch)
 
-            val manga =
+                val manga =
-                transaction {
+                    transaction {
-                    MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
+                        MangaType(MangaTable.selectAll().where { MangaTable.id eq id }.first())
-                }
+                    }
 
-            UpdateMangaPayload(
+                UpdateMangaPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                manga = manga,
+                    manga = manga,
-            )
+                )
+            }
         }
     }
 
     @RequireAuth
-    fun updateMangas(input: UpdateMangasInput): CompletableFuture<UpdateMangasPayload?> {
+    fun updateMangas(input: UpdateMangasInput): CompletableFuture<DataFetcherResult<UpdateMangasPayload?>> {
         val (clientMutationId, ids, patch) = input
 
         return future {
-            updateMangas(ids, patch)
+            asDataFetcherResult {
+                updateMangas(ids, patch)
 
-            val mangas =
+                val mangas =
-                transaction {
+                    transaction {
-                    MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
+                        MangaTable.selectAll().where { MangaTable.id inList ids }.map { MangaType(it) }
-                }
+                    }
 
-            UpdateMangasPayload(
+                UpdateMangasPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                mangas = mangas,
+                    mangas = mangas,
-            )
+                )
+            }
         }
     }
 
@@ -146,20 +150,22 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun fetchManga(input: FetchMangaInput): CompletableFuture<FetchMangaPayload?> {
+    fun fetchManga(input: FetchMangaInput): CompletableFuture<DataFetcherResult<FetchMangaPayload?>> {
         val (clientMutationId, id) = input
 
         return future {
-            Manga.fetchManga(id)
+            asDataFetcherResult {
+                Manga.fetchManga(id)
 
-            val manga =
+                val manga =
-                transaction {
+                    transaction {
-                    MangaTable.selectAll().where { MangaTable.id eq id }.first()
+                        MangaTable.selectAll().where { MangaTable.id eq id }.first()
-                }
+                    }
-            FetchMangaPayload(
+                FetchMangaPayload(
-                clientMutationId = clientMutationId,
+                    clientMutationId = clientMutationId,
-                manga = MangaType(manga),
+                    manga = MangaType(manga),
-            )
+                )
+            }
         }
     }
 
@@ -174,12 +180,14 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun setMangaMeta(input: SetMangaMetaInput): SetMangaMetaPayload? {
+    fun setMangaMeta(input: SetMangaMetaInput): DataFetcherResult<SetMangaMetaPayload?> {
         val (clientMutationId, meta) = input
 
-        Manga.modifyMangaMeta(meta.mangaId, meta.key, meta.value)
+        return asDataFetcherResult {
+            Manga.modifyMangaMeta(meta.mangaId, meta.key, meta.value)
 
-        return SetMangaMetaPayload(clientMutationId, meta)
+            SetMangaMetaPayload(clientMutationId, meta)
+        }
     }
 
     data class DeleteMangaMetaInput(
@@ -195,32 +203,34 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun deleteMangaMeta(input: DeleteMangaMetaInput): DeleteMangaMetaPayload? {
+    fun deleteMangaMeta(input: DeleteMangaMetaInput): DataFetcherResult<DeleteMangaMetaPayload?> {
         val (clientMutationId, mangaId, key) = input
 
-        val (meta, manga) =
+        return asDataFetcherResult {
-            transaction {
+            val (meta, manga) =
-                val meta =
+                transaction {
-                    MangaMetaTable
+                    val meta =
-                        .selectAll()
+                        MangaMetaTable
-                        .where { (MangaMetaTable.ref eq mangaId) and (MangaMetaTable.key eq key) }
+                            .selectAll()
-                        .firstOrNull()
+                            .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 =
+                    val manga =
-                    transaction {
+                        transaction {
-                        MangaType(MangaTable.selectAll().where { MangaTable.id eq mangaId }.first())
+                            MangaType(MangaTable.selectAll().where { MangaTable.id eq mangaId }.first())
-                    }
+                        }
 
-                if (meta != null) {
+                    if (meta != null) {
-                    MangaMetaType(meta)
+                        MangaMetaType(meta)
-                } else {
+                    } else {
-                    null
+                        null
-                } to manga
+                    } to manga
-            }
+                }
 
-        return DeleteMangaMetaPayload(clientMutationId, meta, manga)
+            DeleteMangaMetaPayload(clientMutationId, meta, manga)
+        }
     }
 
     data class SetMangaMetasItem(
@@ -240,41 +250,43 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun setMangaMetas(input: SetMangaMetasInput): SetMangaMetasPayload? {
+    fun setMangaMetas(input: SetMangaMetasInput): DataFetcherResult<SetMangaMetasPayload?> {
         val (clientMutationId, items) = input
 
-        val metaByMangaId =
+        return asDataFetcherResult {
-            items
+            val metaByMangaId =
-                .flatMap { item ->
+                items
-                    val metaMap = item.metas.associate { it.key to it.value }
+                    .flatMap { item ->
-                    item.mangaIds.map { mangaId -> mangaId to metaMap }
+                        val metaMap = item.metas.associate { it.key to it.value }
-                }.groupBy({ it.first }, { it.second })
+                        item.mangaIds.map { mangaId -> mangaId to metaMap }
-                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+                    }.groupBy({ it.first }, { it.second })
+                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
 
-        Manga.modifyMangasMetas(metaByMangaId)
+            Manga.modifyMangasMetas(metaByMangaId)
 
-        val allMangaIds = metaByMangaId.keys
+            val allMangaIds = metaByMangaId.keys
-        val allMetaKeys = metaByMangaId.values.flatMap { it.keys }.distinct()
+            val allMetaKeys = metaByMangaId.values.flatMap { it.keys }.distinct()
 
-        val (updatedMetas, mangas) =
+            val (updatedMetas, mangas) =
-            transaction {
+                transaction {
-                val updatedMetas =
+                    val updatedMetas =
-                    MangaMetaTable
+                        MangaMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (MangaMetaTable.ref inList allMangaIds) and (MangaMetaTable.key inList allMetaKeys) }
+                            .where { (MangaMetaTable.ref inList allMangaIds) and (MangaMetaTable.key inList allMetaKeys) }
-                        .map { MangaMetaType(it) }
+                            .map { MangaMetaType(it) }
 
-                val mangas =
+                    val mangas =
-                    MangaTable
+                        MangaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { MangaTable.id inList allMangaIds }
+                            .where { MangaTable.id inList allMangaIds }
-                        .map { MangaType(it) }
+                            .map { MangaType(it) }
-                        .distinctBy { it.id }
+                            .distinctBy { it.id }
 
-                updatedMetas to mangas
+                    updatedMetas to mangas
-            }
+                }
 
-        return SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
+            SetMangaMetasPayload(clientMutationId, updatedMetas, mangas)
+        }
     }
 
     data class DeleteMangaMetasItem(
@@ -295,61 +307,63 @@ class MangaMutation {
     )
 
     @RequireAuth
-    fun deleteMangaMetas(input: DeleteMangaMetasInput): DeleteMangaMetasPayload? {
+    fun deleteMangaMetas(input: DeleteMangaMetasInput): DataFetcherResult<DeleteMangaMetasPayload?> {
         val (clientMutationId, items) = input
 
-        items.forEach { item ->
+        return asDataFetcherResult {
-            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+            items.forEach { item ->
-                "Either 'keys' or 'prefixes' must be provided for each item"
+                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                    "Either 'keys' or 'prefixes' must be provided for each item"
+                }
             }
-        }
 
-        val (allDeletedMetas, allMangaIds) =
+            val (allDeletedMetas, allMangaIds) =
-            transaction {
+                transaction {
-                val deletedMetas = mutableListOf<MangaMetaType>()
+                    val deletedMetas = mutableListOf<MangaMetaType>()
-                val mangaIds = mutableSetOf<Int>()
+                    val mangaIds = mutableSetOf<Int>()
 
-                items.forEach { item ->
+                    items.forEach { item ->
-                    val keyCondition: Op<Boolean>? =
+                        val keyCondition: Op<Boolean>? =
-                        item.keys?.takeIf { it.isNotEmpty() }?.let { MangaMetaTable.key inList it }
+                            item.keys?.takeIf { it.isNotEmpty() }?.let { MangaMetaTable.key inList it }
 
-                    val prefixCondition: Op<Boolean>? =
+                        val prefixCondition: Op<Boolean>? =
-                        item.prefixes
+                            item.prefixes
-                            ?.filter { it.isNotEmpty() }
+                                ?.filter { it.isNotEmpty() }
-                            ?.map { (MangaMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                                ?.map { (MangaMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
+                                ?.reduceOrNull { acc, op -> acc or op }
 
-                    val metaKeyCondition =
+                        val metaKeyCondition =
-                        if (keyCondition != null && prefixCondition != null) {
+                            if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
+                                keyCondition or prefixCondition
-                        } else {
+                            } else {
-                            keyCondition ?: prefixCondition!!
+                                keyCondition ?: prefixCondition!!
-                        }
+                            }
 
-                    val condition = (MangaMetaTable.ref inList item.mangaIds) and metaKeyCondition
+                        val condition = (MangaMetaTable.ref inList item.mangaIds) and metaKeyCondition
 
-                    deletedMetas +=
+                        deletedMetas +=
-                        MangaMetaTable
+                            MangaMetaTable
-                            .selectAll()
+                                .selectAll()
-                            .where { condition }
+                                .where { condition }
-                            .map { MangaMetaType(it) }
+                                .map { MangaMetaType(it) }
 
-                    MangaMetaTable.deleteWhere { condition }
+                        MangaMetaTable.deleteWhere { condition }
-                    mangaIds += item.mangaIds
+                        mangaIds += item.mangaIds
+                    }
+
+                    deletedMetas to mangaIds
                 }
 
-                deletedMetas to mangaIds
+            val mangas =
-            }
+                transaction {
+                    MangaTable
+                        .selectAll()
+                        .where { MangaTable.id inList allMangaIds }
+                        .map { MangaType(it) }
+                        .distinctBy { it.id }
+                }
 
-        val mangas =
+            DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
-            transaction {
+        }
-                MangaTable
-                    .selectAll()
-                    .where { MangaTable.id inList allMangaIds }
-                    .map { MangaType(it) }
-                    .distinctBy { it.id }
-            }
-
-        return DeleteMangaMetasPayload(clientMutationId, allDeletedMetas, mangas)
     }
 }

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

@@ -1,18 +1,18 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+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,12 +29,14 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun setGlobalMeta(input: SetGlobalMetaInput): SetGlobalMetaPayload? {
+    fun setGlobalMeta(input: SetGlobalMetaInput): DataFetcherResult<SetGlobalMetaPayload?> {
         val (clientMutationId, meta) = input
 
-        GlobalMeta.modifyMeta(meta.key, meta.value)
+        return asDataFetcherResult {
+            GlobalMeta.modifyMeta(meta.key, meta.value)
 
-        return SetGlobalMetaPayload(clientMutationId, meta)
+            SetGlobalMetaPayload(clientMutationId, meta)
+        }
     }
 
     data class DeleteGlobalMetaInput(
@@ -48,27 +50,29 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun deleteGlobalMeta(input: DeleteGlobalMetaInput): DeleteGlobalMetaPayload? {
+    fun deleteGlobalMeta(input: DeleteGlobalMetaInput): DataFetcherResult<DeleteGlobalMetaPayload?> {
         val (clientMutationId, key) = input
 
-        val meta =
+        return asDataFetcherResult {
-            transaction {
+            val meta =
-                val meta =
+                transaction {
-                    GlobalMetaTable
+                    val meta =
-                        .selectAll()
+                        GlobalMetaTable
-                        .where { GlobalMetaTable.key eq key }
+                            .selectAll()
-                        .firstOrNull()
+                            .where { GlobalMetaTable.key eq key }
+                            .firstOrNull()
 
-                GlobalMetaTable.deleteWhere { GlobalMetaTable.key eq key }
+                    GlobalMetaTable.deleteWhere { GlobalMetaTable.key eq key }
 
-                if (meta != null) {
+                    if (meta != null) {
-                    GlobalMetaType(meta)
+                        GlobalMetaType(meta)
-                } else {
+                    } else {
-                    null
+                        null
+                    }
                 }
-            }
 
-        return DeleteGlobalMetaPayload(clientMutationId, meta)
+            DeleteGlobalMetaPayload(clientMutationId, meta)
+        }
     }
 
     data class SetGlobalMetasInput(
@@ -82,21 +86,23 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun setGlobalMetas(input: SetGlobalMetasInput): SetGlobalMetasPayload? {
+    fun setGlobalMetas(input: SetGlobalMetasInput): DataFetcherResult<SetGlobalMetasPayload?> {
         val (clientMutationId, metas) = input
 
-        val metaMap = metas.associate { it.key to it.value }
+        return asDataFetcherResult {
-        GlobalMeta.modifyMetas(metaMap)
+            val metaMap = metas.associate { it.key to it.value }
+            GlobalMeta.modifyMetas(metaMap)
 
-        val updatedMetas =
+            val updatedMetas =
-            transaction {
+                transaction {
-                GlobalMetaTable
+                    GlobalMetaTable
-                    .selectAll()
+                        .selectAll()
-                    .where { GlobalMetaTable.key inList metaMap.keys }
+                        .where { GlobalMetaTable.key inList metaMap.keys }
-                    .map { GlobalMetaType(it) }
+                        .map { GlobalMetaType(it) }
-            }
+                }
 
-        return SetGlobalMetasPayload(clientMutationId, updatedMetas)
+            SetGlobalMetasPayload(clientMutationId, updatedMetas)
+        }
     }
 
     data class DeleteGlobalMetasInput(
@@ -111,41 +117,43 @@ class MetaMutation {
     )
 
     @RequireAuth
-    fun deleteGlobalMetas(input: DeleteGlobalMetasInput): DeleteGlobalMetasPayload? {
+    fun deleteGlobalMetas(input: DeleteGlobalMetasInput): DataFetcherResult<DeleteGlobalMetasPayload?> {
         val (clientMutationId, keys, prefixes) = input
 
-        require(!keys.isNullOrEmpty() || !prefixes.isNullOrEmpty()) {
+        return asDataFetcherResult {
-            "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
             }
 
-        return DeleteGlobalMetasPayload(clientMutationId, 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)
+        }
     }
 }

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

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

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

@@ -1,5 +1,3 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
 import androidx.preference.CheckBoxPreference
@@ -7,16 +5,18 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.SwitchPreferenceCompat
-import org.jetbrains.exposed.v1.core.LikePattern
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.like
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.like
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+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,12 +47,14 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun setSourceMeta(input: SetSourceMetaInput): SetSourceMetaPayload? {
+    fun setSourceMeta(input: SetSourceMetaInput): DataFetcherResult<SetSourceMetaPayload?> {
         val (clientMutationId, meta) = input
 
-        Source.modifyMeta(meta.sourceId, meta.key, meta.value)
+        return asDataFetcherResult {
+            Source.modifyMeta(meta.sourceId, meta.key, meta.value)
 
-        return SetSourceMetaPayload(clientMutationId, meta)
+            SetSourceMetaPayload(clientMutationId, meta)
+        }
     }
 
     data class DeleteSourceMetaInput(
@@ -68,36 +70,38 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun deleteSourceMeta(input: DeleteSourceMetaInput): DeleteSourceMetaPayload? {
+    fun deleteSourceMeta(input: DeleteSourceMetaInput): DataFetcherResult<DeleteSourceMetaPayload?> {
         val (clientMutationId, sourceId, key) = input
 
-        val (meta, source) =
+        return asDataFetcherResult {
-            transaction {
+            val (meta, source) =
-                val meta =
+                transaction {
-                    SourceMetaTable
+                    val meta =
-                        .selectAll()
+                        SourceMetaTable
-                        .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 { SourceTable.id eq sourceId }
+                            .where { (SourceMetaTable.ref eq sourceId) and (SourceMetaTable.key eq key) }
                             .firstOrNull()
-                            ?.let { SourceType(it) }
-                    }
 
-                if (meta != null) {
+                    SourceMetaTable.deleteWhere { (SourceMetaTable.ref eq sourceId) and (SourceMetaTable.key eq key) }
-                    SourceMetaType(meta)
-                } else {
-                    null
-                } to source
-            }
 
-        return DeleteSourceMetaPayload(clientMutationId, meta, 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)
+        }
     }
 
     data class SetSourceMetasItem(
@@ -117,41 +121,43 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun setSourceMetas(input: SetSourceMetasInput): SetSourceMetasPayload? {
+    fun setSourceMetas(input: SetSourceMetasInput): DataFetcherResult<SetSourceMetasPayload?> {
         val (clientMutationId, items) = input
 
-        val metaBySourceId =
+        return asDataFetcherResult {
-            items
+            val metaBySourceId =
-                .flatMap { item ->
+                items
-                    val metaMap = item.metas.associate { it.key to it.value }
+                    .flatMap { item ->
-                    item.sourceIds.map { sourceId -> sourceId to metaMap }
+                        val metaMap = item.metas.associate { it.key to it.value }
-                }.groupBy({ it.first }, { it.second })
+                        item.sourceIds.map { sourceId -> sourceId to metaMap }
-                .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
+                    }.groupBy({ it.first }, { it.second })
+                    .mapValues { (_, maps) -> maps.reduce { acc, map -> acc + map } }
 
-        Source.modifySourceMetas(metaBySourceId)
+            Source.modifySourceMetas(metaBySourceId)
 
-        val allSourceIds = metaBySourceId.keys
+            val allSourceIds = metaBySourceId.keys
-        val allMetaKeys = metaBySourceId.values.flatMap { it.keys }.distinct()
+            val allMetaKeys = metaBySourceId.values.flatMap { it.keys }.distinct()
 
-        val (updatedMetas, sources) =
+            val (updatedMetas, sources) =
-            transaction {
+                transaction {
-                val updatedMetas =
+                    val updatedMetas =
-                    SourceMetaTable
+                        SourceMetaTable
-                        .selectAll()
+                            .selectAll()
-                        .where { (SourceMetaTable.ref inList allSourceIds) and (SourceMetaTable.key inList allMetaKeys) }
+                            .where { (SourceMetaTable.ref inList allSourceIds) and (SourceMetaTable.key inList allMetaKeys) }
-                        .map { SourceMetaType(it) }
+                            .map { SourceMetaType(it) }
 
-                val sources =
+                    val sources =
-                    SourceTable
+                        SourceTable
-                        .selectAll()
+                            .selectAll()
-                        .where { SourceTable.id inList allSourceIds }
+                            .where { SourceTable.id inList allSourceIds }
-                        .mapNotNull { SourceType(it) }
+                            .mapNotNull { SourceType(it) }
-                        .distinctBy { it.id }
+                            .distinctBy { it.id }
 
-                updatedMetas to sources
+                    updatedMetas to sources
-            }
+                }
 
-        return SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
+            SetSourceMetasPayload(clientMutationId, updatedMetas, sources)
+        }
     }
 
     data class DeleteSourceMetasItem(
@@ -172,62 +178,64 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun deleteSourceMetas(input: DeleteSourceMetasInput): DeleteSourceMetasPayload? {
+    fun deleteSourceMetas(input: DeleteSourceMetasInput): DataFetcherResult<DeleteSourceMetasPayload?> {
         val (clientMutationId, items) = input
 
-        items.forEach { item ->
+        return asDataFetcherResult {
-            require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+            items.forEach { item ->
-                "Either 'keys' or 'prefixes' must be provided for each item"
+                require(!item.keys.isNullOrEmpty() || !item.prefixes.isNullOrEmpty()) {
+                    "Either 'keys' or 'prefixes' must be provided for each item"
+                }
             }
-        }
 
-        val (allDeletedMetas, allSourceIds) =
+            val (allDeletedMetas, allSourceIds) =
-            transaction {
+                transaction {
-                val deletedMetas = mutableListOf<SourceMetaType>()
+                    val deletedMetas = mutableListOf<SourceMetaType>()
-                val sourceIds = mutableSetOf<Long>()
+                    val sourceIds = mutableSetOf<Long>()
 
-                items.forEach { item ->
+                    items.forEach { item ->
-                    val keyCondition: Op<Boolean>? =
+                        val keyCondition: Op<Boolean>? =
-                        item.keys?.takeIf { it.isNotEmpty() }?.let { SourceMetaTable.key inList it }
+                            item.keys?.takeIf { it.isNotEmpty() }?.let { SourceMetaTable.key inList it }
 
-                    val prefixCondition: Op<Boolean>? =
+                        val prefixCondition: Op<Boolean>? =
-                        item.prefixes
+                            item.prefixes
-                            ?.filter { it.isNotEmpty() }
+                                ?.filter { it.isNotEmpty() }
-                            ?.map { (SourceMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
+                                ?.map { (SourceMetaTable.key like LikePattern("$it%")) as Op<Boolean> }
-                            ?.reduceOrNull { acc, op -> acc or op }
+                                ?.reduceOrNull { acc, op -> acc or op }
 
-                    val metaKeyCondition =
+                        val metaKeyCondition =
-                        if (keyCondition != null && prefixCondition != null) {
+                            if (keyCondition != null && prefixCondition != null) {
-                            keyCondition or prefixCondition
+                                keyCondition or prefixCondition
-                        } else {
+                            } else {
-                            keyCondition ?: prefixCondition!!
+                                keyCondition ?: prefixCondition!!
-                        }
+                            }
 
-                    val condition = (SourceMetaTable.ref inList item.sourceIds) and metaKeyCondition
+                        val condition = (SourceMetaTable.ref inList item.sourceIds) and metaKeyCondition
 
-                    deletedMetas +=
+                        deletedMetas +=
-                        SourceMetaTable
+                            SourceMetaTable
-                            .selectAll()
+                                .selectAll()
-                            .where { condition }
+                                .where { condition }
-                            .map { SourceMetaType(it) }
+                                .map { SourceMetaType(it) }
 
-                    SourceMetaTable.deleteWhere { condition }
+                        SourceMetaTable.deleteWhere { condition }
-                    sourceIds += item.sourceIds
+                        sourceIds += item.sourceIds
+                    }
+
+                    deletedMetas to sourceIds
                 }
 
-                deletedMetas to sourceIds
+            val sources =
-            }
+                transaction {
+                    SourceTable
+                        .selectAll()
+                        .where { SourceTable.id inList allSourceIds }
+                        .mapNotNull { SourceType(it) }
+                        .distinctBy { it.id }
+                }
 
-        val sources =
+            DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
-            transaction {
+        }
-                SourceTable
-                    .selectAll()
-                    .where { SourceTable.id inList allSourceIds }
-                    .mapNotNull { SourceType(it) }
-                    .distinctBy { it.id }
-            }
-
-        return DeleteSourceMetasPayload(clientMutationId, allDeletedMetas, sources)
     }
 
     enum class FetchSourceMangaType {
@@ -252,48 +260,50 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun fetchSourceManga(input: FetchSourceMangaInput): CompletableFuture<FetchSourceMangaPayload?> {
+    fun fetchSourceManga(input: FetchSourceMangaInput): CompletableFuture<DataFetcherResult<FetchSourceMangaPayload?>> {
         val (clientMutationId, sourceId, type, page, query, filters) = input
 
         return future {
-            val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
+            asDataFetcherResult {
-            val mangasPage =
+                val source = GetCatalogueSource.getCatalogueSourceOrNull(sourceId)!!
-                when (type) {
+                val mangasPage =
-                    FetchSourceMangaType.SEARCH -> {
+                    when (type) {
-                        source.getSearchManga(
+                        FetchSourceMangaType.SEARCH -> {
-                            page = page,
+                            source.getSearchManga(
-                            query = query.orEmpty(),
+                                page = page,
-                            filters = updateFilterList(source, filters),
+                                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)
+                        }
                     }
 
-                    FetchSourceMangaType.POPULAR -> {
+                val mangaIds = mangasPage.insertOrUpdate(sourceId)
-                        source.getPopularManga(page)
+
+                val mangas =
+                    transaction {
+                        MangaTable
+                            .selectAll()
+                            .where { MangaTable.id inList mangaIds }
+                            .map { MangaType(it) }
+                    }.sortedBy {
+                        mangaIds.indexOf(it.id)
                     }
 
-                    FetchSourceMangaType.LATEST -> {
+                FetchSourceMangaPayload(
-                        if (!source.supportsLatest) throw Exception("Source does not support latest")
+                    clientMutationId = clientMutationId,
-                        source.getLatestUpdates(page)
+                    mangas = mangas,
-                    }
+                    hasNextPage = mangasPage.hasNextPage,
-                }
+                )
-
+            }
-            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,
-            )
         }
     }
 
@@ -319,27 +329,29 @@ class SourceMutation {
     )
 
     @RequireAuth
-    fun updateSourcePreference(input: UpdateSourcePreferenceInput): UpdateSourcePreferencePayload? {
+    fun updateSourcePreference(input: UpdateSourcePreferenceInput): DataFetcherResult<UpdateSourcePreferencePayload?> {
         val (clientMutationId, sourceId, change) = input
 
-        Source.setSourcePreference(sourceId, change.position, "") { preference ->
+        return asDataFetcherResult {
-            when (preference) {
+            Source.setSourcePreference(sourceId, change.position, "") { preference ->
-                is SwitchPreferenceCompat -> change.switchState
+                when (preference) {
-                is CheckBoxPreference -> change.checkBoxState
+                    is SwitchPreferenceCompat -> change.switchState
-                is EditTextPreference -> change.editTextState
+                    is CheckBoxPreference -> change.checkBoxState
-                is ListPreference -> change.listState
+                    is EditTextPreference -> change.editTextState
-                is MultiSelectListPreference -> change.multiSelectState?.toSet()
+                    is ListPreference -> change.listState
-                else -> throw RuntimeException("sealed class cannot have more subtypes!")
+                    is MultiSelectListPreference -> change.multiSelectState?.toSet()
-            } ?: throw Exception("Expected change to ${preference::class.simpleName}")
+                    else -> throw RuntimeException("sealed class cannot have more subtypes!")
-        }
+                } ?: throw Exception("Expected change to ${preference::class.simpleName}")
+            }
 
-        return UpdateSourcePreferencePayload(
+            UpdateSourcePreferencePayload(
-            clientMutationId = clientMutationId,
+                clientMutationId = clientMutationId,
-            preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) },
+                preferences = Source.getSourcePreferencesRaw(sourceId).map { preferenceOf(it) },
-            source =
+                source =
-                transaction {
+                    transaction {
-                    SourceType(SourceTable.selectAll().where { SourceTable.id eq sourceId }.first())!!
+                        SourceType(SourceTable.selectAll().where { SourceTable.id eq sourceId }.first())!!
-                },
+                    },
-        )
+            )
+        }
     }
 }

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

@@ -1,28 +0,0 @@
-package suwayomi.tachidesk.graphql.mutations
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.StartSyncResult
-
-class SyncMutation {
-    data class StartSyncInput(
-        val clientMutationId: String? = null,
-    )
-
-    data class StartSyncPayload(
-        val clientMutationId: String? = null,
-        val result: StartSyncResult,
-    )
-
-    @RequireAuth
-    fun startSync(input: StartSyncInput): StartSyncPayload {
-        val (clientMutationId) = input
-
-        val result = SyncManager.startSync()
-
-        return StartSyncPayload(
-            clientMutationId = clientMutationId,
-            result = result,
-        )
-    }
-}

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

@@ -1,13 +1,12 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.generator.annotations.GraphQLDescription
-import org.jetbrains.exposed.v1.core.and
+import graphql.execution.DataFetcherResult
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+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
@@ -223,22 +222,24 @@ class TrackMutation {
     )
 
     @RequireAuth
-    fun trackProgress(input: TrackProgressInput): CompletableFuture<TrackProgressPayload?> {
+    fun trackProgress(input: TrackProgressInput): CompletableFuture<DataFetcherResult<TrackProgressPayload?>> {
         val (clientMutationId, mangaId) = input
 
         return future {
-            Track.trackChapter(mangaId)
+            asDataFetcherResult {
-            val trackRecords =
+                Track.trackChapter(mangaId)
-                transaction {
+                val trackRecords =
-                    TrackRecordTable
+                    transaction {
-                        .selectAll()
+                        TrackRecordTable
-                        .where { TrackRecordTable.mangaId eq mangaId }
+                            .selectAll()
-                        .toList()
+                            .where { TrackRecordTable.mangaId eq mangaId }
-                }
+                            .toList()
-            TrackProgressPayload(
+                    }
-                clientMutationId,
+                TrackProgressPayload(
-                trackRecords.map { TrackRecordType(it) },
+                    clientMutationId,
-            )
+                    trackRecords.map { TrackRecordType(it) },
+                )
+            }
         }
     }
 

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

@@ -1,9 +1,9 @@
-@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 +28,7 @@ class UpdateMutation {
     )
 
     @RequireAuth
-    fun updateLibrary(input: UpdateLibraryInput): CompletableFuture<UpdateLibraryPayload?> {
+    fun updateLibrary(input: UpdateLibraryInput): CompletableFuture<DataFetcherResult<UpdateLibraryPayload?>> {
         updater.addCategoriesToUpdateQueue(
             Category.getCategoryList().filter { input.categories?.contains(it.id) ?: true },
             clear = true,
@@ -36,15 +36,17 @@ class UpdateMutation {
         )
 
         return future {
-            UpdateLibraryPayload(
+            asDataFetcherResult {
-                input.clientMutationId,
+                UpdateLibraryPayload(
-                updateStatus =
+                    input.clientMutationId,
-                    withTimeout(30.seconds) {
+                    updateStatus =
-                        LibraryUpdateStatus(
+                        withTimeout(30.seconds) {
-                            updater.updates.first(),
+                            LibraryUpdateStatus(
-                        )
+                                updater.updates.first(),
-                    },
+                            )
-            )
+                        },
+                )
+            }
         }
     }
 
@@ -58,7 +60,7 @@ class UpdateMutation {
     )
 
     @RequireAuth
-    fun updateLibraryManga(input: UpdateLibraryMangaInput): CompletableFuture<UpdateLibraryMangaPayload?> {
+    fun updateLibraryManga(input: UpdateLibraryMangaInput): CompletableFuture<DataFetcherResult<UpdateLibraryMangaPayload?>> {
         updateLibrary(
             UpdateLibraryInput(
                 clientMutationId = input.clientMutationId,
@@ -67,13 +69,15 @@ class UpdateMutation {
         )
 
         return future {
-            UpdateLibraryMangaPayload(
+            asDataFetcherResult {
-                input.clientMutationId,
+                UpdateLibraryMangaPayload(
-                updateStatus =
+                    input.clientMutationId,
-                    withTimeout(30.seconds) {
+                    updateStatus =
-                        UpdateStatus(updater.status.first())
+                        withTimeout(30.seconds) {
-                    },
+                            UpdateStatus(updater.status.first())
-            )
+                        },
+                )
+            }
         }
     }
 
@@ -88,7 +92,7 @@ class UpdateMutation {
     )
 
     @RequireAuth
-    fun updateCategoryManga(input: UpdateCategoryMangaInput): CompletableFuture<UpdateCategoryMangaPayload?> {
+    fun updateCategoryManga(input: UpdateCategoryMangaInput): CompletableFuture<DataFetcherResult<UpdateCategoryMangaPayload?>> {
         updateLibrary(
             UpdateLibraryInput(
                 clientMutationId = input.clientMutationId,
@@ -97,13 +101,15 @@ class UpdateMutation {
         )
 
         return future {
-            UpdateCategoryMangaPayload(
+            asDataFetcherResult {
-                input.clientMutationId,
+                UpdateCategoryMangaPayload(
-                updateStatus =
+                    input.clientMutationId,
-                    withTimeout(30.seconds) {
+                    updateStatus =
-                        UpdateStatus(updater.status.first())
+                        withTimeout(30.seconds) {
-                    },
+                            UpdateStatus(updater.status.first())
-            )
+                        },
+                )
+            }
         }
     }
 

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

@@ -1,9 +1,8 @@
-@file:Suppress("RedundantNullableReturnType", "unused")
-
 package suwayomi.tachidesk.graphql.mutations
 
 import graphql.schema.DataFetchingEnvironment
 import suwayomi.tachidesk.global.impl.util.Jwt
+import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.server.getAttribute
 import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.serverConfig

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/CategoryQuery.kt

@@ -10,13 +10,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ChapterQuery.kt

@@ -10,14 +10,14 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.DoubleFilter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt

@@ -11,14 +11,14 @@ import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import eu.kanade.tachiyomi.source.local.LocalSource
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.neq
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MangaQuery.kt

@@ -10,17 +10,12 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.core.inSubQuery
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.less
-import org.jetbrains.exposed.v1.core.like
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.ComparableScalarFilter
@@ -245,16 +240,13 @@ class MangaQuery {
     ): MangaNodeList {
         val queryResults =
             transaction {
-                val mangaIdsQuery =
+                val res =
                     MangaTable
                         .leftJoin(CategoryMangaTable)
-                        .select(MangaTable.id)
+                        .select(MangaTable.columns)
-                        .withDistinct()
+                        .withDistinctOn(MangaTable.id)
 
-                mangaIdsQuery.applyOps(condition, filter)
+                res.applyOps(condition, filter)
-
-                val res =
-                    MangaTable.selectAll().where { MangaTable.id inSubQuery mangaIdsQuery }
 
                 if (order != null || orderBy != null || (last != null || before != null)) {
                     val baseSort = listOf(MangaOrder(MangaOrderBy.ID, SortOrder.ASC))

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/MetaQuery.kt

@@ -10,13 +10,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt

@@ -10,13 +10,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SyncQuery.kt

@@ -1,11 +0,0 @@
-package suwayomi.tachidesk.graphql.queries
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.SyncStatus
-import suwayomi.tachidesk.graphql.types.toStatus
-
-class SyncQuery {
-    @RequireAuth
-    fun lastSyncStatus(): SyncStatus? = SyncManager.lastSyncState.value?.toStatus()
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/TrackQuery.kt

@@ -3,13 +3,13 @@ package suwayomi.tachidesk.graphql.queries
 import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
 import suwayomi.tachidesk.graphql.queries.filter.DoubleFilter

server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt

@@ -1,33 +1,21 @@
 package suwayomi.tachidesk.graphql.queries.filter
 
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.ComparisonOp
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.Expression
+import org.jetbrains.exposed.sql.ComparisonOp
-import org.jetbrains.exposed.v1.core.ExpressionWithColumnType
+import org.jetbrains.exposed.sql.Expression
-import org.jetbrains.exposed.v1.core.LikePattern
+import org.jetbrains.exposed.sql.ExpressionWithColumnType
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.LikePattern
-import org.jetbrains.exposed.v1.core.QueryBuilder
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Query
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.QueryBuilder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.greaterEq
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.not
-import org.jetbrains.exposed.v1.core.isNotNull
+import org.jetbrains.exposed.sql.or
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.stringParam
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.upperCase
-import org.jetbrains.exposed.v1.core.lessEq
-import org.jetbrains.exposed.v1.core.like
-import org.jetbrains.exposed.v1.core.neq
-import org.jetbrains.exposed.v1.core.not
-import org.jetbrains.exposed.v1.core.notInList
-import org.jetbrains.exposed.v1.core.notLike
-import org.jetbrains.exposed.v1.core.or
-import org.jetbrains.exposed.v1.core.stringParam
-import org.jetbrains.exposed.v1.core.upperCase
-import org.jetbrains.exposed.v1.core.wrap
-import org.jetbrains.exposed.v1.jdbc.Query
-import org.jetbrains.exposed.v1.jdbc.andWhere
 
 class ILikeEscapeOp(
     expr1: Expression<*>,
@@ -100,7 +88,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 false,
             )
 
@@ -110,7 +100,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 true,
             )
 
@@ -120,7 +112,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 false,
             )
 
@@ -130,7 +124,9 @@ class DistinctFromOp(
         ): DistinctFromOp =
             DistinctFromOp(
                 expression,
-                expression.wrap(t),
+                with(SqlExpressionBuilder) {
+                    expression.wrap(t)
+                },
                 true,
             )
     }
@@ -435,7 +431,7 @@ fun <T : String, S : T?> andFilterWithCompareString(
 
     opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
     opAnd.andWhere(filter.equalTo) { column eq it as S }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
+    opAnd.andWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
     opAnd.andWhere(
         filter.distinctFrom,
         filter.distinctFromAll,
@@ -455,36 +451,36 @@ fun <T : String, S : T?> andFilterWithCompareString(
     opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it }
 
     opAnd.andWhere(filter.includes, filter.includesAll, filter.includesAny) { column like "%$it%" }
-    opAnd.andNotWhere(filter.notIncludes, filter.notIncludesAll, filter.notIncludesAny) { column notLike "%$it%" }
+    opAnd.andWhere(filter.notIncludes, filter.notIncludesAll, filter.notIncludesAny) { column notLike "%$it%" }
     opAnd.andWhere(filter.includesInsensitive, filter.includesInsensitiveAll, filter.includesInsensitiveAny) {
         ILikeEscapeOp.iLike(column, "%$it%")
     }
-    opAnd.andNotWhere(filter.notIncludesInsensitive, filter.notIncludesInsensitiveAll, filter.notIncludesInsensitiveAny) {
+    opAnd.andWhere(filter.notIncludesInsensitive, filter.notIncludesInsensitiveAll, filter.notIncludesInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, "%$it%")
     }
 
     opAnd.andWhere(filter.startsWith, filter.startsWithAll, filter.startsWithAny) { column like "$it%" }
-    opAnd.andNotWhere(filter.notStartsWith, filter.notStartsWithAll, filter.notStartsWithAny) { column notLike "$it%" }
+    opAnd.andWhere(filter.notStartsWith, filter.notStartsWithAll, filter.notStartsWithAny) { column notLike "$it%" }
     opAnd.andWhere(filter.startsWithInsensitive, filter.startsWithInsensitiveAll, filter.startsWithInsensitiveAny) {
         ILikeEscapeOp.iLike(column, "$it%")
     }
-    opAnd.andNotWhere(filter.notStartsWithInsensitive, filter.notStartsWithInsensitiveAll, filter.notStartsWithInsensitiveAny) {
+    opAnd.andWhere(filter.notStartsWithInsensitive, filter.notStartsWithInsensitiveAll, filter.notStartsWithInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, "$it%")
     }
 
     opAnd.andWhere(filter.endsWith, filter.endsWithAll, filter.endsWithAny) { column like "%$it" }
-    opAnd.andNotWhere(filter.notEndsWith, filter.notEndsWithAll, filter.notEndsWithAny) { column notLike "%$it" }
+    opAnd.andWhere(filter.notEndsWith, filter.notEndsWithAll, filter.notEndsWithAny) { column notLike "%$it" }
     opAnd.andWhere(filter.endsWithInsensitive, filter.endsWithInsensitiveAll, filter.endsWithInsensitiveAny) {
         ILikeEscapeOp.iLike(column, "%$it")
     }
-    opAnd.andNotWhere(filter.notEndsWithInsensitive, filter.notEndsWithInsensitiveAll, filter.notEndsWithInsensitiveAny) {
+    opAnd.andWhere(filter.notEndsWithInsensitive, filter.notEndsWithInsensitiveAll, filter.notEndsWithInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, "%$it")
     }
 
     opAnd.andWhere(filter.like, filter.likeAll, filter.likeAny) { column like it }
-    opAnd.andNotWhere(filter.notLike, filter.notLikeAll, filter.notLikeAny) { column notLike it }
+    opAnd.andWhere(filter.notLike, filter.notLikeAll, filter.notLikeAny) { column notLike it }
     opAnd.andWhere(filter.likeInsensitive, filter.likeInsensitiveAll, filter.likeInsensitiveAny) { ILikeEscapeOp.iLike(column, it) }
-    opAnd.andNotWhere(filter.notLikeInsensitive, filter.notLikeInsensitiveAll, filter.notLikeInsensitiveAny) {
+    opAnd.andWhere(filter.notLikeInsensitive, filter.notLikeInsensitiveAll, filter.notLikeInsensitiveAny) {
         ILikeEscapeOp.iNotLike(column, it)
     }
 
@@ -509,75 +505,48 @@ class OpAnd(
 ) {
     fun <T> andWhere(
         value: T?,
-        andPart: (T & Any) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T & Any) -> Op<Boolean>,
     ) {
         value ?: return
-        val expr = andPart(value)
+        val expr = Op.build { andPart(value) }
         op = if (op == null) expr else (op!! and expr)
     }
 
     fun <T : Any> andWhere(
         values: List<T>?,
-        andPart: (List<T>) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(List<T>) -> Op<Boolean>,
     ) {
         @Suppress("UNCHECKED_CAST")
-        return andWhere(values as T?, andPart as (Any) -> Op<Boolean>)
+        return andWhere(values as T?, andPart as SqlExpressionBuilder.(Any) -> Op<Boolean>)
     }
 
     fun <T : Any> andWhere(
         valueDefault: T?,
         valueAll: List<T>?,
         valueAny: List<T>?,
-        expr: (T) -> Op<Boolean>,
+        expr: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         andWhere(valueDefault, expr)
         andWhereAll(valueAll, expr)
         andWhereAny(valueAny, expr)
     }
 
-    fun <T : Any> andNotWhere(
-        valueDefault: T?,
-        valueAll: List<T>?,
-        valueAny: List<T>?,
-        expr: (T) -> Op<Boolean>,
-    ) {
-        andWhere(valueDefault, expr)
-        andNotWhereAll(valueAll, expr)
-        andNotWhereAny(valueAny, expr)
-    }
-
     fun <T : Any> andWhereAll(
         values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         values?.map { andWhere(it, andPart) }
     }
 
-    fun <T : Any> andNotWhereAll(
-        values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
-    ) {
-        // Inversed all equals any
-        andWhereAny(values, andPart)
-    }
-
     fun <T : Any> andWhereAny(
         values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         values ?: return
-        val expr = values.map { andPart(it) }.reduceOrNull { acc, op -> acc or op } ?: return
+        val expr = values.map { Op.build { andPart(it) } }.reduce { acc, op -> acc or op }
         op = if (op == null) expr else (op!! and expr)
     }
 
-    fun <T : Any> andNotWhereAny(
-        values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
-    ) {
-        // Inversed any equals all
-        andWhereAll(values, andPart)
-    }
-
     fun <T> eq(
         value: T?,
         column: Column<T>,
@@ -605,7 +574,7 @@ fun <T : Comparable<T>, S : T?> andFilterWithCompare(
     opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
 
     opAnd.andWhere(filter.equalTo) { column eq it as S }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
+    opAnd.andWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it as S }
     opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it as S) }
     opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it as S) }
     if (!filter.`in`.isNullOrEmpty()) {
@@ -633,7 +602,7 @@ fun <T : Comparable<T>> andFilterWithCompareEntity(
     opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
 
     opAnd.andWhere(filter.equalTo) { column eq it }
-    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it }
+    opAnd.andWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it }
     opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it) }
     opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it) }
     if (!filter.`in`.isNullOrEmpty()) {

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

@@ -11,20 +11,15 @@ 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.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 (
@@ -34,17 +29,17 @@ class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
                     context.formParam("operations")
                         ?: throw IllegalArgumentException("Cannot find 'operations' body")
                 } else {
-                    return context.bodyInputStream().use { jsonMapper.fromJsonStream<GraphQLServerRequest>(it) }
+                    return context.bodyAsClass(GraphQLServerRequest::class.java)
                 }
 
             val request =
-                jsonMapper.fromJsonString<GraphQLServerRequest>(formParam)
+                context.jsonMapper().fromJsonString<GraphQLServerRequest>(formParam)
 
             val map =
                 context
                     .formParam("map")
                     ?.let {
-                        jsonMapper.fromJsonString<Map<String, List<String>>>(it)
+                        context.jsonMapper().fromJsonString<Map<String, List<String>>>(it)
                     }.orEmpty()
 
             val mapItems =
@@ -78,8 +73,7 @@ class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
                     )
                 }
             }
-        } catch (e: IOException) {
+        } catch (_: IOException) {
-            logger.error(e) { "Error when parsing request" }
             null
         }
     }

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

@@ -27,7 +27,6 @@ import suwayomi.tachidesk.graphql.mutations.MangaMutation
 import suwayomi.tachidesk.graphql.mutations.MetaMutation
 import suwayomi.tachidesk.graphql.mutations.SettingsMutation
 import suwayomi.tachidesk.graphql.mutations.SourceMutation
-import suwayomi.tachidesk.graphql.mutations.SyncMutation
 import suwayomi.tachidesk.graphql.mutations.TrackMutation
 import suwayomi.tachidesk.graphql.mutations.UpdateMutation
 import suwayomi.tachidesk.graphql.mutations.UserMutation
@@ -42,7 +41,6 @@ import suwayomi.tachidesk.graphql.queries.MangaQuery
 import suwayomi.tachidesk.graphql.queries.MetaQuery
 import suwayomi.tachidesk.graphql.queries.SettingsQuery
 import suwayomi.tachidesk.graphql.queries.SourceQuery
-import suwayomi.tachidesk.graphql.queries.SyncQuery
 import suwayomi.tachidesk.graphql.queries.TrackQuery
 import suwayomi.tachidesk.graphql.queries.UpdateQuery
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -52,7 +50,6 @@ import suwayomi.tachidesk.graphql.server.primitives.GraphQLLongAsString
 import suwayomi.tachidesk.graphql.server.primitives.GraphQLUpload
 import suwayomi.tachidesk.graphql.subscriptions.DownloadSubscription
 import suwayomi.tachidesk.graphql.subscriptions.InfoSubscription
-import suwayomi.tachidesk.graphql.subscriptions.SyncSubscription
 import suwayomi.tachidesk.graphql.subscriptions.UpdateSubscription
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
@@ -101,7 +98,6 @@ val schema =
                 TopLevelObject(MetaQuery()),
                 TopLevelObject(SettingsQuery()),
                 TopLevelObject(SourceQuery()),
-                TopLevelObject(SyncQuery()),
                 TopLevelObject(TrackQuery()),
                 TopLevelObject(UpdateQuery()),
             ),
@@ -118,7 +114,6 @@ val schema =
                 TopLevelObject(MangaMutation()),
                 TopLevelObject(MetaMutation()),
                 TopLevelObject(SettingsMutation()),
-                TopLevelObject(SyncMutation()),
                 TopLevelObject(SourceMutation()),
                 TopLevelObject(TrackMutation()),
                 TopLevelObject(UpdateMutation()),
@@ -128,7 +123,6 @@ val schema =
             listOf(
                 TopLevelObject(DownloadSubscription()),
                 TopLevelObject(InfoSubscription()),
-                TopLevelObject(SyncSubscription()),
                 TopLevelObject(UpdateSubscription()),
             ),
     )

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

@@ -10,11 +10,13 @@ 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
 import graphql.execution.DataFetcherExceptionHandler
 import graphql.execution.DataFetcherExceptionHandlerResult
+import graphql.schema.idl.RuntimeWiring
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.websocket.WsCloseContext
@@ -25,7 +27,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import suwayomi.tachidesk.graphql.server.subscriptions.ApolloSubscriptionProtocolHandler
 import suwayomi.tachidesk.server.JavalinSetup.future
-import tools.jackson.module.kotlin.jacksonObjectMapper
 
 class TachideskGraphQLServer(
     requestParser: JavalinGraphQLRequestParser,

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

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

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

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

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

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

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

@@ -1,16 +1,16 @@
 package suwayomi.tachidesk.graphql.server.primitives
 
-import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.sql.Column
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Query
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.less
-import org.jetbrains.exposed.v1.core.or
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.jdbc.Query
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.or
 
 interface OrderBy<T> {
     val column: Column<*>

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

@@ -1,6 +1,6 @@
 package suwayomi.tachidesk.graphql.server.primitives
 
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 
 data class QueryResults<T>(
     val total: Long,

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

@@ -9,6 +9,9 @@ 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
@@ -23,7 +26,7 @@ import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.job
 import kotlinx.coroutines.runBlocking
-import org.eclipse.jetty.websocket.core.CloseStatus
+import org.eclipse.jetty.websocket.api.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
@@ -38,9 +41,6 @@ import suwayomi.tachidesk.server.JavalinSetup.Attribute
 import suwayomi.tachidesk.server.JavalinSetup.getAttributeOrSet
 import suwayomi.tachidesk.server.user.UserType
 import suwayomi.tachidesk.server.user.getUserFromToken
-import tools.jackson.databind.ObjectMapper
-import tools.jackson.module.kotlin.convertValue
-import tools.jackson.module.kotlin.readValue
 
 /**
  * Implementation of the `graphql-transport-ws` protocol defined by Denis Badurina

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

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

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

@@ -1,17 +0,0 @@
-package suwayomi.tachidesk.graphql.subscriptions
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-import suwayomi.tachidesk.graphql.directives.RequireAuth
-import suwayomi.tachidesk.graphql.types.SyncStatus
-import suwayomi.tachidesk.graphql.types.toStatus
-
-class SyncSubscription {
-    @RequireAuth
-    fun syncStatusChanged(): Flow<SyncStatus> =
-        SyncManager.lastSyncState
-            .filterNotNull()
-            .map { it.toStatus() }
-}

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/CategoryType.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ChapterType.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt

@@ -9,7 +9,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/MangaType.kt

@@ -10,7 +10,7 @@ package suwayomi.tachidesk.graphql.types
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.cache.CustomCacheMap
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/MetaType.kt

@@ -2,7 +2,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.global.model.table.GlobalMetaTable
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt

@@ -13,9 +13,8 @@ import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.HttpSource
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SyncType.kt

@@ -1,91 +0,0 @@
-package suwayomi.tachidesk.graphql.types
-
-import suwayomi.tachidesk.global.impl.sync.SyncManager
-
-enum class StartSyncResult {
-    SUCCESS,
-    SYNC_IN_PROGRESS,
-    SYNC_DISABLED,
-}
-
-enum class SyncState {
-    STARTED,
-    CREATING_BACKUP,
-    DOWNLOADING,
-    MERGING,
-    UPLOADING,
-    RESTORING,
-    SUCCESS,
-    ERROR,
-}
-
-data class SyncStatus(
-    val state: SyncState,
-    val startDate: Long,
-    val endDate: Long? = null,
-    val backupRestoreId: String? = null,
-    val errorMessage: String? = null,
-)
-
-fun SyncManager.SyncState.toStatus(): SyncStatus =
-    when (this) {
-        is SyncManager.SyncState.Started -> {
-            SyncStatus(
-                state = SyncState.STARTED,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.CreatingBackup -> {
-            SyncStatus(
-                state = SyncState.CREATING_BACKUP,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Downloading -> {
-            SyncStatus(
-                state = SyncState.DOWNLOADING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Merging -> {
-            SyncStatus(
-                state = SyncState.MERGING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Uploading -> {
-            SyncStatus(
-                state = SyncState.UPLOADING,
-                startDate = startDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Restoring -> {
-            SyncStatus(
-                state = SyncState.RESTORING,
-                startDate = startDate.toEpochMilliseconds(),
-                backupRestoreId = restoreId,
-            )
-        }
-
-        is SyncManager.SyncState.Success -> {
-            SyncStatus(
-                state = SyncState.SUCCESS,
-                startDate = startDate.toEpochMilliseconds(),
-                endDate = endDate.toEpochMilliseconds(),
-            )
-        }
-
-        is SyncManager.SyncState.Error -> {
-            SyncStatus(
-                state = SyncState.ERROR,
-                startDate = startDate.toEpochMilliseconds(),
-                endDate = endDate.toEpochMilliseconds(),
-                errorMessage = message,
-            )
-        }
-    }

server/src/main/kotlin/suwayomi/tachidesk/graphql/types/TrackType.kt

@@ -2,7 +2,7 @@ package suwayomi.tachidesk.graphql.types
 
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
 import suwayomi.tachidesk.graphql.server.primitives.Edge
 import suwayomi.tachidesk.graphql.server.primitives.Node

server/src/main/kotlin/suwayomi/tachidesk/manga/controller/MangaController.kt

@@ -12,9 +12,8 @@ import io.javalin.http.HttpStatus
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.CategoryManga
 import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.ChapterDownloadHelper

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Category.kt

@@ -7,27 +7,25 @@ package suwayomi.tachidesk.manga.impl
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.andWhere
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.andWhere
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryMetaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
+import kotlin.collections.component1
+import kotlin.collections.orEmpty
 
 object Category {
     /**
@@ -250,14 +248,13 @@ object Category {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(CategoryMetaTable)
+                BatchUpdateStatement(CategoryMetaTable).apply {
-                    .apply {
+                    existingMetaByMetaId.forEach { (metaId, entry) ->
-                        existingMetaByMetaId.forEach { (metaId, entry) ->
+                        addBatch(EntityID(metaId, CategoryMetaTable))
-                            addBatch(EntityID(metaId, CategoryMetaTable))
+                        this[CategoryMetaTable.value] = entry.value
-                            this[CategoryMetaTable.value] = entry.value
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
 
             if (newMetaByCategoryId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt

@@ -7,22 +7,19 @@ package suwayomi.tachidesk.manga.impl
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.alias
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.alias
-import org.jetbrains.exposed.v1.core.count
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.count
-import org.jetbrains.exposed.v1.core.isNull
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.leftJoin
+import org.jetbrains.exposed.sql.leftJoin
-import org.jetbrains.exposed.v1.core.max
+import org.jetbrains.exposed.sql.max
-import org.jetbrains.exposed.v1.core.wrapAsExpression
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.wrapAsExpression
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.Category.DEFAULT_CATEGORY_ID
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass
@@ -85,12 +82,6 @@ object CategoryManga {
         }
     }
 
-    fun removeMangaFromAllCategories(mangaId: Int) {
-        transaction {
-            CategoryMangaTable.deleteWhere { CategoryMangaTable.manga eq mangaId }
-        }
-    }
-
     /**
      * list of mangas that belong to a category
      */
@@ -117,14 +108,12 @@ object CategoryManga {
 
         val transform: (ResultRow) -> MangaDataClass = {
             // Map the data from the result row to the MangaDataClass
-            MangaTable
+            val dataClass = MangaTable.toDataClass(it)
-                .toDataClass(it)
+            dataClass.lastReadAt = it[lastReadAt]
-                .copy(
+            dataClass.unreadCount = it[unreadCount]
-                    lastReadAt = it[lastReadAt],
+            dataClass.downloadCount = it[downloadedCount]
-                    unreadCount = it[unreadCount],
+            dataClass.chapterCount = it[chapterCount]
-                    downloadCount = it[downloadedCount],
+            dataClass
-                    chapterCount = it[chapterCount],
-                )
         }
 
         return transaction {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt

@@ -17,21 +17,17 @@ import io.github.reactivecircus.cache4k.Cache
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.serialization.Serializable
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.Op
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.less
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.Manga.getManga
 import suwayomi.tachidesk.manga.impl.download.DownloadManager
 import suwayomi.tachidesk.manga.impl.download.DownloadManager.EnqueueInput
@@ -104,6 +100,9 @@ object Chapter {
                     .associateBy({ it[ChapterTable.url] }, { it })
             }
 
+        val chapterIds = chapterList.map { dbChapterMap.getValue(it.url)[ChapterTable.id] }
+        val chapterMetas = getChaptersMetaMaps(chapterIds.map { it.value })
+
         return chapterList.mapIndexed { index, it ->
 
             val dbChapter = dbChapterMap.getValue(it.url)
@@ -125,8 +124,8 @@ object Chapter {
                 realUrl = dbChapter[ChapterTable.realUrl],
                 downloaded = dbChapter[ChapterTable.isDownloaded],
                 pageCount = dbChapter[ChapterTable.pageCount],
-                lastModifiedAt = dbChapter[ChapterTable.lastModifiedAt],
+                chapterCount = chapterList.size,
-                version = dbChapter[ChapterTable.version],
+                meta = chapterMetas.getValue(dbChapter[ChapterTable.id].value),
             )
         }
     }
@@ -189,7 +188,7 @@ object Chapter {
                     }
 
                 // new chapters after they have been added to the database for auto downloads
-                val insertedChapterIds = mutableListOf<Int>()
+                val insertedChapters = mutableListOf<ChapterDataClass>()
 
                 val chaptersToInsert = mutableListOf<ChapterDataClass>() // do not yet have an ID from the database
                 val chaptersToUpdate = mutableListOf<ChapterDataClass>()
@@ -233,7 +232,7 @@ object Chapter {
                 val deletedChapterNumbers = TreeSet<Float>()
                 val deletedReadChapterNumbers = TreeSet<Float>()
                 val deletedBookmarkedChapterNumbers = TreeSet<Float>()
-                val deletedDownloadedChapterNumberToChapter = mutableMapOf<Float, ChapterDataClass>()
+                val deletedDownloadedChapterNumberInfoMap = mutableMapOf<Float, MutableMap<String?, Int>>()
                 val deletedChapterNumberDateFetchMap = mutableMapOf<Float, Long>()
 
                 // clear any orphaned/duplicate chapters that are in the db but not in `chapterList`
@@ -244,7 +243,13 @@ object Chapter {
                         if (!chapterUrls.contains(dbChapter.url)) {
                             if (dbChapter.read) deletedReadChapterNumbers.add(dbChapter.chapterNumber)
                             if (dbChapter.bookmarked) deletedBookmarkedChapterNumbers.add(dbChapter.chapterNumber)
-                            if (dbChapter.downloaded) deletedDownloadedChapterNumberToChapter[dbChapter.chapterNumber] = dbChapter
+                            if (dbChapter.downloaded) {
+                                val pageCountByScanlator =
+                                    deletedDownloadedChapterNumberInfoMap.getOrPut(
+                                        dbChapter.chapterNumber,
+                                    ) { mutableMapOf() }
+                                pageCountByScanlator[dbChapter.scanlator] = dbChapter.pageCount
+                            }
                             deletedChapterNumbers.add(dbChapter.chapterNumber)
                             deletedChapterNumberDateFetchMap[dbChapter.chapterNumber] = dbChapter.fetchedAt
                             dbChapter.id
@@ -253,14 +258,16 @@ object Chapter {
                         }
                     }
 
-                transaction {
+                // we got some clean up due
-                    // we got some clean up due
+                if (chaptersIdsToDelete.isNotEmpty()) {
-                    if (chaptersIdsToDelete.isNotEmpty()) {
+                    DownloadManager.dequeue(chaptersIdsToDelete)
-                        DownloadManager.dequeue(chaptersIdsToDelete)
+                    transaction {
                         PageTable.deleteWhere { chapter inList chaptersIdsToDelete }
                         ChapterTable.deleteWhere { id inList chaptersIdsToDelete }
                     }
+                }
 
+                transaction {
                     if (chaptersToInsert.isNotEmpty()) {
                         ChapterTable
                             .batchInsert(chaptersToInsert) { chapter ->
@@ -276,71 +283,41 @@ object Chapter {
                                 this[ChapterTable.isRead] = false
                                 this[ChapterTable.isBookmarked] = false
                                 this[ChapterTable.isDownloaded] = false
-                                this[ChapterTable.lastModifiedAt] = chapter.lastModifiedAt
-                                this[ChapterTable.version] = chapter.version
-                                this[ChapterTable.pageCount] = -1
 
                                 // is recognized chapter number
                                 if (chapter.chapterNumber >= 0f && chapter.chapterNumber in deletedChapterNumbers) {
                                     this[ChapterTable.isRead] = chapter.chapterNumber in deletedReadChapterNumbers
                                     this[ChapterTable.isBookmarked] = chapter.chapterNumber in deletedBookmarkedChapterNumbers
 
+                                    // only preserve download status for chapters of the same scanlator, otherwise,
+                                    // the downloaded files won't be found anyway
+                                    val downloadedChapterInfo = deletedDownloadedChapterNumberInfoMap[chapter.chapterNumber]
+                                    val pageCount = downloadedChapterInfo?.get(chapter.scanlator)
+                                    if (pageCount != null) {
+                                        this[ChapterTable.isDownloaded] = true
+                                        this[ChapterTable.pageCount] = pageCount
+                                    }
                                     // Try to use the fetch date of the original entry to not pollute 'Updates' tab
                                     deletedChapterNumberDateFetchMap[chapter.chapterNumber]?.let {
                                         this[ChapterTable.fetchedAt] = it
                                     }
-
-                                    deletedDownloadedChapterNumberToChapter[chapter.chapterNumber]?.let {
-                                        val hasDownloadedPages = it.pageCount > 0
-                                        val isSameName = it.name == chapter.name
-                                        val isSameScanlator = it.scanlator == chapter.scanlator
-
-                                        // Only preserve download status for chapters with the same name and of the same scanlator; otherwise,
-                                        // the downloaded files won't be found anyway
-                                        val isDownloadPreservable = hasDownloadedPages && isSameName && isSameScanlator
-                                        if (isDownloadPreservable) {
-                                            this[ChapterTable.isDownloaded] = true
-                                            this[ChapterTable.pageCount] = it.pageCount
-                                        }
-                                    }
                                 }
-                            }.forEach { insertedChapterIds.add(it[ChapterTable.id].value) }
+                            }.forEach { insertedChapters.add(ChapterTable.toDataClass(it)) }
                     }
 
                     if (chaptersToUpdate.isNotEmpty()) {
-                        BatchUpdateStatement(ChapterTable)
+                        BatchUpdateStatement(ChapterTable).apply {
-                            .apply {
+                            chaptersToUpdate.forEach {
-                                chaptersToUpdate.forEach {
+                                addBatch(EntityID(it.id, ChapterTable))
-                                    addBatch(EntityID(it.id, ChapterTable))
+                                this[ChapterTable.name] = it.name
-
+                                this[ChapterTable.date_upload] = it.uploadDate
-                                    val currentChapter = chaptersInDb.find { dbChapter -> dbChapter.id == it.id }!!
+                                this[ChapterTable.chapter_number] = it.chapterNumber
-
+                                this[ChapterTable.scanlator] = it.scanlator
-                                    this[ChapterTable.name] = it.name
+                                this[ChapterTable.sourceOrder] = it.index
-                                    this[ChapterTable.date_upload] = it.uploadDate
+                                this[ChapterTable.realUrl] = it.realUrl
-                                    this[ChapterTable.chapter_number] = it.chapterNumber
+                            }
-                                    this[ChapterTable.scanlator] = it.scanlator
+                            execute(this@transaction)
-                                    this[ChapterTable.sourceOrder] = it.index
+                        }
-                                    this[ChapterTable.realUrl] = it.realUrl
-                                    this[ChapterTable.lastModifiedAt] = it.lastModifiedAt
-                                    this[ChapterTable.version] = it.version
-                                    this[ChapterTable.isDownloaded] = currentChapter.downloaded
-                                    this[ChapterTable.pageCount] = currentChapter.pageCount
-
-                                    if (!currentChapter.downloaded) {
-                                        return@forEach
-                                    }
-
-                                    val isSameScanlator = currentChapter.scanlator == it.scanlator
-                                    val isSameName = currentChapter.name == it.name
-
-                                    val isDownloadPreservable = isSameName && isSameScanlator
-                                    if (!isDownloadPreservable) {
-                                        this[ChapterTable.isDownloaded] = false
-                                        this[ChapterTable.pageCount] = -1
-                                    }
-                                }
-                            }.toExecutable()
-                            .execute(this@transaction)
                     }
 
                     MangaTable.update({ MangaTable.id eq mangaId }) {
@@ -349,13 +326,6 @@ object Chapter {
                 }
 
                 if (manga.inLibrary) {
-                    // We have to query the inserted chapters to get the up-to-date data. I.e. "last_modified_at" is not returned by the insert statement, due to being set by a DB trigger
-                    val insertedChapters =
-                        transaction {
-                            ChapterTable.selectAll().where { ChapterTable.id inList insertedChapterIds }.map(
-                                ChapterTable::toDataClass,
-                            )
-                        }
                     downloadNewChapters(mangaId, currentLatestChapterNumber, numberOfCurrentChapters, insertedChapters)
                 }
 
@@ -547,11 +517,11 @@ object Chapter {
                     // mangaId is not null, scope query under manga
                     when {
                         input.chapterIds != null -> {
-                            (ChapterTable.manga eq mangaId) and (ChapterTable.id inList input.chapterIds)
+                            Op.build { (ChapterTable.manga eq mangaId) and (ChapterTable.id inList input.chapterIds) }
                         }
 
                         input.chapterIndexes != null -> {
-                            (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder inList input.chapterIndexes)
+                            Op.build { (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder inList input.chapterIndexes) }
                         }
 
                         else -> {
@@ -564,7 +534,7 @@ object Chapter {
                     // mangaId is null, only chapterIndexes is valid for this case
                     when {
                         input.chapterIds != null -> {
-                            (ChapterTable.id inList input.chapterIds)
+                            Op.build { (ChapterTable.id inList input.chapterIds) }
                         }
 
                         else -> {
@@ -613,7 +583,7 @@ object Chapter {
                 .withDefault { emptyMap() }
         }
 
-    fun getChapterMetaMap(chapter: Int): Map<String, String> =
+    fun getChapterMetaMap(chapter: EntityID<Int>): Map<String, String> =
         transaction {
             ChapterMetaTable
                 .selectAll()
@@ -680,14 +650,13 @@ object Chapter {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(ChapterMetaTable)
+                BatchUpdateStatement(ChapterMetaTable).apply {
-                    .apply {
+                    existingMetaByMetaId.forEach { (metaId, entry) ->
-                        existingMetaByMetaId.forEach { (metaId, entry) ->
+                        addBatch(EntityID(metaId, ChapterMetaTable))
-                            addBatch(EntityID(metaId, ChapterMetaTable))
+                        this[ChapterMetaTable.value] = entry.value
-                            this[ChapterMetaTable.value] = entry.value
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
 
             if (newMetaByChapterId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/ChapterDownloadHelper.kt

@@ -1,9 +1,7 @@
 package suwayomi.tachidesk.manga.impl
 
 import kotlinx.coroutines.CoroutineScope
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReady
 import suwayomi.tachidesk.manga.impl.download.fileProvider.ChaptersFilesProvider
 import suwayomi.tachidesk.manga.impl.download.fileProvider.impl.ArchiveProvider
@@ -64,11 +62,6 @@ object ChapterDownloadHelper {
         chapterId: Int,
     ): Pair<InputStream, Long> = provider(mangaId, chapterId).getAsArchiveStream()
 
-    fun getChapterArchiveSize(
-        mangaId: Int,
-        chapterId: Int,
-    ): Long = provider(mangaId, chapterId).getArchiveSize()
-
     private fun getChapterWithCbzFileName(chapterId: Int): Pair<ChapterDataClass, String> =
         transaction {
             val row =

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Library.kt

@@ -12,14 +12,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.insert
-import org.jetbrains.exposed.v1.core.neq
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.select
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.selectAll
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.Manga.getManga
 import suwayomi.tachidesk.manga.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Manga.kt

@@ -20,18 +20,15 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.HttpStatus
 import okhttp3.CacheControl
 import okhttp3.Response
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.sql.SortOrder
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.update
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.impl.Source.getSource
 import suwayomi.tachidesk.manga.impl.download.fileProvider.impl.MissingThumbnailException
@@ -92,14 +89,13 @@ object Manga {
                 inLibrary = mangaEntry[MangaTable.inLibrary],
                 inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
                 source = getSource(mangaEntry[MangaTable.sourceReference]),
+                meta = getMangaMetaMap(mangaId),
                 realUrl = mangaEntry[MangaTable.realUrl],
                 lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
                 chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
                 updateStrategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy]),
                 freshData = true,
                 trackers = Track.getTrackRecordsByMangaId(mangaId),
-                lastModifiedAt = mangaEntry[MangaTable.lastModifiedAt],
-                version = mangaEntry[MangaTable.version],
             )
         }
     }
@@ -134,7 +130,7 @@ object Manga {
                         ""
                     }
                 if (remoteTitle.isNotEmpty() && remoteTitle != mangaEntry[MangaTable.title]) {
-                    val canUpdateTitle = updateMangaDownloadDir(mangaEntry[MangaTable.title], source.toString(), remoteTitle)
+                    val canUpdateTitle = updateMangaDownloadDir(mangaId, remoteTitle)
 
                     if (canUpdateTitle) {
                         it[MangaTable.title] = remoteTitle
@@ -212,12 +208,12 @@ object Manga {
                     .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
                     .firstOrNull { it[ChapterTable.isRead] }
 
-            mangaDaaClass.copy(
+            mangaDaaClass.unreadCount = unreadCount
-                unreadCount = unreadCount,
+            mangaDaaClass.downloadCount = downloadCount
-                downloadCount = downloadCount,
+            mangaDaaClass.chapterCount = chapterCount
-                chapterCount = chapterCount,
+            mangaDaaClass.lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) }
-                lastChapterRead = lastChapterRead?.let { ChapterTable.toDataClass(it) },
+
-            )
+            mangaDaaClass
         }
     }
 
@@ -240,14 +236,13 @@ object Manga {
         inLibrary = mangaEntry[MangaTable.inLibrary],
         inLibraryAt = mangaEntry[MangaTable.inLibraryAt],
         source = getSource(mangaEntry[MangaTable.sourceReference]),
+        meta = getMangaMetaMap(mangaId),
         realUrl = mangaEntry[MangaTable.realUrl],
         lastFetchedAt = mangaEntry[MangaTable.lastFetchedAt],
         chaptersLastFetchedAt = mangaEntry[MangaTable.chaptersLastFetchedAt],
         updateStrategy = UpdateStrategy.valueOf(mangaEntry[MangaTable.updateStrategy]),
         freshData = false,
         trackers = Track.getTrackRecordsByMangaId(mangaId),
-        lastModifiedAt = mangaEntry[MangaTable.lastModifiedAt],
-        version = mangaEntry[MangaTable.version],
     )
 
     fun getMangaMetaMap(mangaId: Int): Map<String, String> =
@@ -300,14 +295,13 @@ object Manga {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(MangaMetaTable)
+                BatchUpdateStatement(MangaMetaTable).apply {
-                    .apply {
+                    existingMetaByMetaId.forEach { (metaId, entry) ->
-                        existingMetaByMetaId.forEach { (metaId, entry) ->
+                        addBatch(EntityID(metaId, MangaMetaTable))
-                            addBatch(EntityID(metaId, MangaMetaTable))
+                        this[MangaMetaTable.value] = entry.value
-                            this[MangaMetaTable.value] = entry.value
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
 
             if (newMetaByMangaId.isNotEmpty()) {