Import fix

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/KcefWebViewProvider.kt

@@ -55,6 +55,7 @@ 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.CefSettings
 import org.cef.browser.CefBrowser
@@ -87,6 +88,7 @@ import java.io.BufferedWriter
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.Executor
+import kotlin.collections.Map
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.declaredMemberFunctions

CHANGELOG.md

@@ -10,13 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - .
 
 ### Changed
-- (Database/H2) Use the latest H2 database engine
+- .
 
 ### Fixed
-- (CloudFlareInterceptor) Don't send the `cf_clearance` cookie back to Flaresolverr
 - (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
 
 ## [v2.2.2100] + [WebUI: v20260508.01] - 2026-05-08
 

gradle/libs.versions.toml

@@ -6,13 +6,13 @@ jvmTarget = "21"
 okhttp = "5.3.2" # Major version is locked by Tachiyomi extensions
 javalin = "7.2.0"
 jte = "3.2.4"
-jackson = "3.1.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
+jackson = "3.1.2" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
-exposed = "1.2.0"
+exposed = "0.61.0"
 dex2jar = "2.4.36"
 polyglot = "25.0.3"
 settings = "1.3.0"
 twelvemonkeys = "3.13.1"
-graphqlkotlin = "10.0.0-alpha.3"
+graphqlkotlin = "8.9.0"
 xmlserialization = "0.91.3"
 ktlint = "1.8.0"
 koin = "4.2.1"
@@ -54,7 +54,7 @@ javalin-openapi = { module = "io.javalin:javalin-openapi", version.ref = "javali
 javalin-rendering = { module = "io.javalin:javalin-rendering-jte", version.ref = "javalin" }
 jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-kotlin = { module = "tools.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
-jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.21"
+jackson-annotations = "com.fasterxml.jackson.core:jackson-annotations:2.20"
 jte = { module = "gg.jte:jte", version.ref = "jte" }
 kte = { module = "gg.jte:jte-kotlin", version.ref = "jte" }
 
@@ -68,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.11"
-h2 = "com.h2database:h2:2.4.240"
+h2 = "com.h2database:h2:1.4.200" # current database driver, can't update to h2 v2 without sql migration
 hikaricp = "com.zaxxer:HikariCP:7.0.2"
 
 # 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" }
@@ -243,7 +242,6 @@ exposed = [
     "exposed-dao",
     "exposed-jdbc",
     "exposed-javatime",
-    "exposed-kotlintime",
 ]
 systemtray = [
     "systemtray-core",

server/build.gradle.kts

@@ -171,7 +171,6 @@ tasks {
                 "Implementation-Vendor" to "The Suwayomi Project",
                 "Specification-Version" to getTachideskVersion(),
                 "Implementation-Version" to getTachideskRevision(),
-                "Multi-Release" to true, // needed for polyglot
             )
         }
         archiveBaseName.set(rootProject.name)

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

@@ -25,7 +25,7 @@ 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
@@ -56,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)
 
@@ -580,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(

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
 
 /**

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/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/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,15 +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.less
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.core.like
-import org.jetbrains.exposed.v1.jdbc.select
-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

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/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,
             )
     }
@@ -509,26 +505,26 @@ 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)
@@ -537,17 +533,17 @@ class OpAnd(
 
     fun <T : Any> andWhereAll(
         values: List<T>?,
-        andPart: (T) -> Op<Boolean>,
+        andPart: SqlExpressionBuilder.(T) -> Op<Boolean>,
     ) {
         values?.map { andWhere(it, 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) }.reduce { acc, op -> acc or op }
+        val expr = values.map { Op.build { andPart(it) } }.reduce { acc, op -> acc or op }
         op = if (op == null) expr else (op!! and expr)
     }
 

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

@@ -11,20 +11,19 @@ import com.expediagroup.graphql.server.execution.GraphQLRequestParser
 import com.expediagroup.graphql.server.types.GraphQLBatchRequest
 import com.expediagroup.graphql.server.types.GraphQLRequest
 import com.expediagroup.graphql.server.types.GraphQLServerRequest
-import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.http.Context
 import io.javalin.http.UploadedFile
+import io.javalin.json.JavalinJackson
 import io.javalin.json.fromJsonStream
 import io.javalin.json.fromJsonString
 import java.io.IOException
 
 class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
-    private val logger = KotlinLogging.logger {}
+    val jsonMapper = JavalinJackson()
 
     @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 (
@@ -78,8 +77,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/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
@@ -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/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/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

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
@@ -310,19 +306,18 @@ object Chapter {
                     }
 
                     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.name] = it.name
+                                this[ChapterTable.date_upload] = it.uploadDate
-                                    this[ChapterTable.date_upload] = it.uploadDate
+                                this[ChapterTable.chapter_number] = it.chapterNumber
-                                    this[ChapterTable.chapter_number] = it.chapterNumber
+                                this[ChapterTable.scanlator] = it.scanlator
-                                    this[ChapterTable.scanlator] = it.scanlator
+                                this[ChapterTable.sourceOrder] = it.index
-                                    this[ChapterTable.sourceOrder] = it.index
+                                this[ChapterTable.realUrl] = it.realUrl
-                                    this[ChapterTable.realUrl] = it.realUrl
+                            }
-                                }
+                            execute(this@transaction)
-                            }.toExecutable()
+                        }
-                            .execute(this@transaction)
                     }
 
                     MangaTable.update({ MangaTable.id eq mangaId }) {
@@ -522,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 -> {
@@ -539,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 -> {
@@ -655,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

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
@@ -298,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()) {

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

@@ -9,15 +9,12 @@ package suwayomi.tachidesk.manga.impl
 
 import eu.kanade.tachiyomi.source.local.LocalSource
 import eu.kanade.tachiyomi.source.model.MangasPage
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.dao.id.EntityID
-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.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.PagedMangaListDataClass
 import suwayomi.tachidesk.manga.model.table.MangaTable
@@ -91,28 +88,27 @@ object MangaList {
                     }
 
             if (mangaToUpdate.isNotEmpty()) {
-                BatchUpdateStatement(MangaTable)
+                BatchUpdateStatement(MangaTable).apply {
-                    .apply {
+                    mangaToUpdate.forEach { (sManga, manga) ->
-                        mangaToUpdate.forEach { (sManga, manga) ->
+                        addBatch(EntityID(manga[MangaTable.id].value, MangaTable))
-                            addBatch(EntityID(manga[MangaTable.id].value, MangaTable))
+                        this[MangaTable.title] = sManga.title
-                            this[MangaTable.title] = sManga.title
+                        this[MangaTable.artist] = sManga.artist ?: manga[MangaTable.artist]
-                            this[MangaTable.artist] = sManga.artist ?: manga[MangaTable.artist]
+                        this[MangaTable.author] = sManga.author ?: manga[MangaTable.author]
-                            this[MangaTable.author] = sManga.author ?: manga[MangaTable.author]
+                        this[MangaTable.description] = sManga.description ?: manga[MangaTable.description]
-                            this[MangaTable.description] = sManga.description ?: manga[MangaTable.description]
+                        this[MangaTable.genre] = sManga.genre ?: manga[MangaTable.genre]
-                            this[MangaTable.genre] = sManga.genre ?: manga[MangaTable.genre]
+                        this[MangaTable.status] = sManga.status
-                            this[MangaTable.status] = sManga.status
+                        this[MangaTable.thumbnail_url] = sManga.thumbnail_url ?: manga[MangaTable.thumbnail_url]
-                            this[MangaTable.thumbnail_url] = sManga.thumbnail_url ?: manga[MangaTable.thumbnail_url]
+                        this[MangaTable.updateStrategy] = sManga.update_strategy.name
-                            this[MangaTable.updateStrategy] = sManga.update_strategy.name
+                        if (!sManga.thumbnail_url.isNullOrEmpty() && manga[MangaTable.thumbnail_url] != sManga.thumbnail_url) {
-                            if (!sManga.thumbnail_url.isNullOrEmpty() && manga[MangaTable.thumbnail_url] != sManga.thumbnail_url) {
+                            this[MangaTable.thumbnailUrlLastFetched] = Instant.now().epochSecond
-                                this[MangaTable.thumbnailUrlLastFetched] = Instant.now().epochSecond
+                            Manga.clearThumbnail(manga[MangaTable.id].value)
-                                Manga.clearThumbnail(manga[MangaTable.id].value)
+                        } else {
-                            } else {
+                            this[MangaTable.thumbnailUrlLastFetched] =
-                                this[MangaTable.thumbnailUrlLastFetched] =
+                                manga[MangaTable.thumbnailUrlLastFetched]
-                                    manga[MangaTable.thumbnailUrlLastFetched]
-                            }
                         }
-                    }.toExecutable()
+                    }
-                    .execute(this@transaction)
+                    execute(this@transaction)
+                }
             }
 
             val mangaUrlsToId =

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

@@ -13,12 +13,11 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.flow.StateFlow
 import libcore.net.MimeUtils
-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.and
-import org.jetbrains.exposed.v1.core.eq
+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.types.DownloadConversion
 import suwayomi.tachidesk.manga.impl.util.getChapterCachePath
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub

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

@@ -15,16 +15,12 @@ import eu.kanade.tachiyomi.source.sourcePreferences
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.javalin.json.JsonMapper
 import io.javalin.json.fromJsonString
-import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.dao.id.EntityID
-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.v1.jdbc.statements.toExecutable
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import suwayomi.tachidesk.manga.impl.Source.preferenceScreenMap
 import suwayomi.tachidesk.manga.impl.extension.Extension.getExtensionIconUrl
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrNull
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
@@ -214,14 +210,13 @@ object Source {
                 }
 
             if (existingMetaByMetaId.isNotEmpty()) {
-                BatchUpdateStatement(SourceMetaTable)
+                BatchUpdateStatement(SourceMetaTable).apply {
-                    .apply {
+                    existingMetaByMetaId.forEach { (metaId, entry) ->
-                        existingMetaByMetaId.forEach { (metaId, entry) ->
+                        addBatch(EntityID(metaId, SourceMetaTable))
-                            addBatch(EntityID(metaId, SourceMetaTable))
+                        this[SourceMetaTable.value] = entry.value
-                            this[SourceMetaTable.value] = entry.value
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
 
             if (newMetaBySourceId.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt

@@ -19,7 +19,7 @@ import okio.Buffer
 import okio.Sink
 import okio.buffer
 import okio.gzip
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupGlobalMetaHandler

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt

@@ -11,9 +11,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore
 import okio.buffer
 import okio.gzip
 import okio.source
-import org.jetbrains.exposed.v1.core.eq
+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.backup.proto.models.Backup
 import suwayomi.tachidesk.manga.impl.track.tracker.TrackerManager
 import suwayomi.tachidesk.manga.model.table.SourceTable

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupCategoryHandler.kt

@@ -7,8 +7,8 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
  * 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.sql.SortOrder
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.selectAll
 import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.impl.Category.modifyCategoriesMetas
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupMangaHandler.kt

@@ -8,18 +8,16 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
-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.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.insertAndGetId
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.insertAndGetId
+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 org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.manga.impl.CategoryManga
 import suwayomi.tachidesk.manga.impl.Chapter
 import suwayomi.tachidesk.manga.impl.Chapter.modifyChaptersMetas
@@ -345,25 +343,24 @@ object BackupMangaHandler {
             }
 
         if (chaptersToUpdateToDbChapter.isNotEmpty()) {
-            BatchUpdateStatement(ChapterTable)
+            BatchUpdateStatement(ChapterTable).apply {
-                .apply {
+                chaptersToUpdateToDbChapter.forEach { (backupChapter, dbChapter) ->
-                    chaptersToUpdateToDbChapter.forEach { (backupChapter, dbChapter) ->
+                    addBatch(EntityID(dbChapter[ChapterTable.id].value, ChapterTable))
-                        addBatch(EntityID(dbChapter[ChapterTable.id].value, ChapterTable))
+                    if (flags.includeChapters) {
-                        if (flags.includeChapters) {
+                        this[ChapterTable.isRead] = backupChapter.read || dbChapter[ChapterTable.isRead]
-                            this[ChapterTable.isRead] = backupChapter.read || dbChapter[ChapterTable.isRead]
+                        this[ChapterTable.lastPageRead] =
-                            this[ChapterTable.lastPageRead] =
+                            max(backupChapter.lastPageRead, dbChapter[ChapterTable.lastPageRead]).coerceAtLeast(0)
-                                max(backupChapter.lastPageRead, dbChapter[ChapterTable.lastPageRead]).coerceAtLeast(0)
+                        this[ChapterTable.isBookmarked] = backupChapter.bookmark || dbChapter[ChapterTable.isBookmarked]
-                            this[ChapterTable.isBookmarked] = backupChapter.bookmark || dbChapter[ChapterTable.isBookmarked]
-                        }
-
-                        if (flags.includeHistory) {
-                            this[ChapterTable.lastReadAt] =
-                                (historyByChapter[backupChapter.url]?.maxOrNull()?.milliseconds?.inWholeSeconds ?: 0)
-                                    .coerceAtLeast(dbChapter[ChapterTable.lastReadAt])
-                        }
                     }
-                }.toExecutable()
+
-                .execute(this@dbTransaction)
+                    if (flags.includeHistory) {
+                        this[ChapterTable.lastReadAt] =
+                            (historyByChapter[backupChapter.url]?.maxOrNull()?.milliseconds?.inWholeSeconds ?: 0)
+                                .coerceAtLeast(dbChapter[ChapterTable.lastReadAt])
+                    }
+                }
+                execute(this@dbTransaction)
+            }
         }
 
         if (flags.includeClientData) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/handlers/BackupSourceHandler.kt

@@ -7,8 +7,7 @@ package suwayomi.tachidesk.manga.impl.backup.proto.handlers
  * 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.inList
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
 import suwayomi.tachidesk.manga.impl.Source
 import suwayomi.tachidesk.manga.impl.Source.modifySourceMetas
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/chapter/ChapterForDownload.kt

@@ -14,14 +14,14 @@ import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.reactivecircus.cache4k.Cache
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.and
+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.jdbc.batchInsert
+import org.jetbrains.exposed.sql.batchInsert
-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.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.manga.impl.ChapterDownloadHelper
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/DownloadManager.kt

@@ -27,12 +27,9 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-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.selectAll
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.transactions.transaction
-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.download.model.DownloadChapter
 import suwayomi.tachidesk.manga.impl.download.model.DownloadQueueItem
 import suwayomi.tachidesk.manga.impl.download.model.DownloadState.Error
@@ -346,7 +343,7 @@ object DownloadManager {
             transaction {
                 ChapterTable
                     .select(ChapterTable.id)
-                    .where { (ChapterTable.manga eq mangaId) and (ChapterTable.sourceOrder eq chapterIndex) }
+                    .where { ChapterTable.manga.eq(mangaId) and ChapterTable.sourceOrder.eq(chapterIndex) }
                     .first()
             }
         enqueue(EnqueueInput(chapterIds = listOf(chapter[ChapterTable.id].value)))

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/Downloader.kt

@@ -17,9 +17,8 @@ import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-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.ChapterDownloadHelper
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReadyById
 import suwayomi.tachidesk.manga.impl.download.model.DownloadQueueItem

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/ChaptersFilesProvider.kt

@@ -11,10 +11,10 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.sample
 import libcore.net.MimeUtils
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
-import org.jetbrains.exposed.v1.core.eq
+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.types.DownloadConversion
 import suwayomi.tachidesk.manga.impl.Page
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReady
 import suwayomi.tachidesk.manga.impl.download.model.DownloadQueueItem
@@ -26,8 +26,14 @@ import suwayomi.tachidesk.manga.impl.util.getChapterDownloadPath
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
+import suwayomi.tachidesk.server.serverConfig
+import suwayomi.tachidesk.util.ConversionUtil
 import java.io.File
 import java.io.InputStream
+import javax.imageio.IIOImage
+import javax.imageio.ImageIO
+import javax.imageio.ImageWriteParam
+import javax.imageio.ImageWriter
 
 sealed class FileType {
     data class RegularFile(

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/impl/ArchiveProvider.kt

@@ -6,9 +6,8 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
 import org.apache.commons.compress.archivers.zip.ZipFile
-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.download.fileProvider.ChaptersFilesProvider
 import suwayomi.tachidesk.manga.impl.download.fileProvider.FileType
 import suwayomi.tachidesk.manga.impl.util.getChapterCachePath

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/download/fileProvider/impl/FolderProvider.kt

@@ -2,9 +2,8 @@ package suwayomi.tachidesk.manga.impl.download.fileProvider.impl
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream
-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.download.fileProvider.ChaptersFilesProvider
 import suwayomi.tachidesk.manga.impl.download.fileProvider.FileType.RegularFile
 import suwayomi.tachidesk.manga.impl.util.getChapterCachePath

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

@@ -20,12 +20,12 @@ import okhttp3.CacheControl
 import okio.buffer
 import okio.sink
 import okio.source
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.insert
+import org.jetbrains.exposed.sql.insert
-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.manga.impl.extension.ExtensionsList.extensionTableAsDataClass
 import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
 import suwayomi.tachidesk.manga.impl.util.PackageTools
@@ -55,6 +55,7 @@ import java.util.zip.ZipOutputStream
 import kotlin.io.path.Path
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.outputStream
+import kotlin.io.path.relativeTo
 
 object Extension {
     private val logger = KotlinLogging.logger {}

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

@@ -11,16 +11,15 @@ import eu.kanade.tachiyomi.source.local.LocalSource
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.sql.ResultRow
-import org.jetbrains.exposed.v1.core.inList
+import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
+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.extension.Extension.getExtensionIconUrl
 import suwayomi.tachidesk.manga.impl.extension.github.ExtensionGithubApi
 import suwayomi.tachidesk.manga.impl.extension.github.OnlineExtension
@@ -126,59 +125,57 @@ object ExtensionsList {
                             .groupBy { it.second[ExtensionTable.isInstalled] }
                     val installedExtensionsToUpdate = extensionsInstalled[true].orEmpty()
                     if (installedExtensionsToUpdate.isNotEmpty()) {
-                        BatchUpdateStatement(ExtensionTable)
+                        BatchUpdateStatement(ExtensionTable).apply {
-                            .apply {
+                            installedExtensionsToUpdate.forEach { (foundExtension, extensionRecord) ->
-                                installedExtensionsToUpdate.forEach { (foundExtension, extensionRecord) ->
+                                addBatch(EntityID(extensionRecord[ExtensionTable.id].value, ExtensionTable))
-                                    addBatch(EntityID(extensionRecord[ExtensionTable.id].value, ExtensionTable))
+                                // Always update icon url and repo
-                                    // Always update icon url and repo
+                                this[ExtensionTable.iconUrl] = foundExtension.iconUrl
-                                    this[ExtensionTable.iconUrl] = foundExtension.iconUrl
+                                this[ExtensionTable.repo] = foundExtension.repo
-                                    this[ExtensionTable.repo] = foundExtension.repo
 
-                                    // add these because batch updates need matching columns
+                                // add these because batch updates need matching columns
-                                    this[ExtensionTable.hasUpdate] = extensionRecord[ExtensionTable.hasUpdate]
+                                this[ExtensionTable.hasUpdate] = extensionRecord[ExtensionTable.hasUpdate]
-                                    this[ExtensionTable.isObsolete] = extensionRecord[ExtensionTable.isObsolete]
+                                this[ExtensionTable.isObsolete] = extensionRecord[ExtensionTable.isObsolete]
 
-                                    // a previously removed extension is now available again
+                                // a previously removed extension is now available again
-                                    if (extensionRecord[ExtensionTable.isObsolete] &&
+                                if (extensionRecord[ExtensionTable.isObsolete] &&
-                                        foundExtension.versionCode >= extensionRecord[ExtensionTable.versionCode]
+                                    foundExtension.versionCode >= extensionRecord[ExtensionTable.versionCode]
-                                    ) {
+                                ) {
-                                        this[ExtensionTable.isObsolete] = false
+                                    this[ExtensionTable.isObsolete] = false
+                                }
+
+                                when {
+                                    foundExtension.versionCode > extensionRecord[ExtensionTable.versionCode] -> {
+                                        // there is an update
+                                        this[ExtensionTable.hasUpdate] = true
+                                        updateMap.putIfAbsent(foundExtension.pkgName, foundExtension)
                                     }
 
-                                    when {
+                                    foundExtension.versionCode < extensionRecord[ExtensionTable.versionCode] -> {
-                                        foundExtension.versionCode > extensionRecord[ExtensionTable.versionCode] -> {
+                                        // somehow the user installed an invalid version
-                                            // there is an update
+                                        this[ExtensionTable.isObsolete] = true
-                                            this[ExtensionTable.hasUpdate] = true
-                                            updateMap.putIfAbsent(foundExtension.pkgName, foundExtension)
-                                        }
-
-                                        foundExtension.versionCode < extensionRecord[ExtensionTable.versionCode] -> {
-                                            // somehow the user installed an invalid version
-                                            this[ExtensionTable.isObsolete] = true
-                                        }
                                     }
                                 }
-                            }.toExecutable()
+                            }
-                            .execute(this@transaction)
+                            execute(this@transaction)
+                        }
                     }
                     val extensionsToFullyUpdate = extensionsInstalled[false].orEmpty()
                     if (extensionsToFullyUpdate.isNotEmpty()) {
-                        BatchUpdateStatement(ExtensionTable)
+                        BatchUpdateStatement(ExtensionTable).apply {
-                            .apply {
+                            extensionsToFullyUpdate.forEach { (foundExtension, extensionRecord) ->
-                                extensionsToFullyUpdate.forEach { (foundExtension, extensionRecord) ->
+                                addBatch(EntityID(extensionRecord[ExtensionTable.id].value, ExtensionTable))
-                                    addBatch(EntityID(extensionRecord[ExtensionTable.id].value, ExtensionTable))
+                                // extension is not installed, so we can overwrite the data without a care
-                                    // extension is not installed, so we can overwrite the data without a care
+                                this[ExtensionTable.repo] = foundExtension.repo
-                                    this[ExtensionTable.repo] = foundExtension.repo
+                                this[ExtensionTable.name] = foundExtension.name
-                                    this[ExtensionTable.name] = foundExtension.name
+                                this[ExtensionTable.versionName] = foundExtension.versionName
-                                    this[ExtensionTable.versionName] = foundExtension.versionName
+                                this[ExtensionTable.versionCode] = foundExtension.versionCode
-                                    this[ExtensionTable.versionCode] = foundExtension.versionCode
+                                this[ExtensionTable.lang] = foundExtension.lang
-                                    this[ExtensionTable.lang] = foundExtension.lang
+                                this[ExtensionTable.isNsfw] = foundExtension.isNsfw
-                                    this[ExtensionTable.isNsfw] = foundExtension.isNsfw
+                                this[ExtensionTable.apkName] = foundExtension.apkName
-                                    this[ExtensionTable.apkName] = foundExtension.apkName
+                                this[ExtensionTable.iconUrl] = foundExtension.iconUrl
-                                    this[ExtensionTable.iconUrl] = foundExtension.iconUrl
+                            }
-                                }
+                            execute(this@transaction)
-                            }.toExecutable()
+                        }
-                            .execute(this@transaction)
                     }
                 }
                 if (extensionsToInsert.isNotEmpty()) {

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/sync/KoreaderSyncService.kt

@@ -14,10 +14,8 @@ import kotlinx.serialization.json.put
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
-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.sql.update
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.types.KoSyncStatusPayload
 import suwayomi.tachidesk.graphql.types.KoreaderSyncChecksumMethod
 import suwayomi.tachidesk.graphql.types.KoreaderSyncConflictStrategy

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/Track.kt

@@ -6,17 +6,16 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-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.SqlExpressionBuilder.eq
-import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.sql.and
-import org.jetbrains.exposed.v1.core.statements.BatchUpdateStatement
+import org.jetbrains.exposed.sql.batchInsert
-import org.jetbrains.exposed.v1.jdbc.batchInsert
+import org.jetbrains.exposed.sql.deleteWhere
-import org.jetbrains.exposed.v1.jdbc.deleteWhere
+import org.jetbrains.exposed.sql.selectAll
-import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.sql.statements.BatchUpdateStatement
-import org.jetbrains.exposed.v1.jdbc.statements.toExecutable
+import org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jsoup.Jsoup
 import suwayomi.tachidesk.manga.impl.track.tracker.DeletableTracker
 import suwayomi.tachidesk.manga.impl.track.tracker.TrackerManager
@@ -428,24 +427,23 @@ object Track {
     fun updateTrackRecords(tracks: List<Track>) =
         transaction {
             if (tracks.isNotEmpty()) {
-                BatchUpdateStatement(TrackRecordTable)
+                BatchUpdateStatement(TrackRecordTable).apply {
-                    .apply {
+                    tracks.forEach {
-                        tracks.forEach {
+                        addBatch(EntityID(it.id!!, TrackRecordTable))
-                            addBatch(EntityID(it.id!!, TrackRecordTable))
+                        this[remoteId] = it.remote_id
-                            this[remoteId] = it.remote_id
+                        this[libraryId] = it.library_id
-                            this[libraryId] = it.library_id
+                        this[title] = it.title
-                            this[title] = it.title
+                        this[lastChapterRead] = it.last_chapter_read
-                            this[lastChapterRead] = it.last_chapter_read
+                        this[totalChapters] = it.total_chapters
-                            this[totalChapters] = it.total_chapters
+                        this[status] = it.status
-                            this[status] = it.status
+                        this[score] = it.score
-                            this[score] = it.score
+                        this[remoteUrl] = it.tracking_url
-                            this[remoteUrl] = it.tracking_url
+                        this[startDate] = it.started_reading_date
-                            this[startDate] = it.started_reading_date
+                        this[finishDate] = it.finished_reading_date
-                            this[finishDate] = it.finished_reading_date
+                        this[private] = it.private
-                            this[private] = it.private
+                    }
-                        }
+                    execute(this@transaction)
-                    }.toExecutable()
+                }
-                    .execute(this@transaction)
             }
         }
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/track/tracker/model/TrackConvertor.kt

@@ -1,9 +1,11 @@
 package suwayomi.tachidesk.manga.impl.track.tracker.model
 
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.impl.backup.proto.models.BackupTracking
 import suwayomi.tachidesk.manga.model.dataclass.TrackRecordDataClass
 import suwayomi.tachidesk.manga.model.table.TrackRecordTable
+import suwayomi.tachidesk.manga.model.table.TrackRecordTable.lastChapterRead
+import suwayomi.tachidesk.manga.model.table.TrackRecordTable.remoteUrl
 import suwayomi.tachidesk.manga.model.table.TrackSearchTable
 
 fun ResultRow.toTrackRecordDataClass(): TrackRecordDataClass =

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

@@ -7,10 +7,10 @@ package suwayomi.tachidesk.manga.impl.util
  * 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 io.github.oshai.kotlinlogging.KLogger
 import io.github.oshai.kotlinlogging.KotlinLogging
-import org.jetbrains.exposed.v1.core.eq
+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
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable

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

@@ -4,11 +4,10 @@ import eu.kanade.tachiyomi.source.local.metadata.COMIC_INFO_FILE
 import eu.kanade.tachiyomi.source.local.metadata.ComicInfo
 import eu.kanade.tachiyomi.source.local.metadata.ComicInfoPublishingStatus
 import nl.adaptivity.xmlutil.serialization.XML
-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.eq
+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.model.table.CategoryMangaTable
 import suwayomi.tachidesk.manga.model.table.CategoryTable
 import suwayomi.tachidesk.manga.model.table.ChapterTable

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/lang/ExposedExtensions.kt

@@ -7,7 +7,7 @@ package suwayomi.tachidesk.manga.impl.util.lang
  * 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.jdbc.Query
+import org.jetbrains.exposed.sql.Query
 
 fun Query.isEmpty() = this.empty()
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/util/source/GetCatalogueSource.kt

@@ -12,9 +12,8 @@ import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
 import io.github.oshai.kotlinlogging.KotlinLogging
-import org.jetbrains.exposed.v1.core.eq
+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.PackageTools.loadExtensionSources
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryMangaTable.kt

@@ -7,8 +7,8 @@ package suwayomi.tachidesk.manga.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.ReferenceOption
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ReferenceOption
 
 object CategoryMangaTable : IntIdTable() {
     val category = reference("category", CategoryTable, ReferenceOption.CASCADE)

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryMetaTable.kt

@@ -7,15 +7,15 @@ package suwayomi.tachidesk.manga.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.ReferenceOption
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ReferenceOption
 import suwayomi.tachidesk.manga.model.table.CategoryMetaTable.ref
 
 /**
  * Metadata storage for clients, about Category with id == [ref].
  */
 object CategoryMetaTable : IntIdTable() {
-    val key = varchar("meta_key", 256)
+    val key = varchar("key", 256)
     val value = varchar("value", 4096)
     val ref = reference("category_ref", CategoryTable, ReferenceOption.CASCADE)
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/CategoryTable.kt

@@ -7,8 +7,8 @@ package suwayomi.tachidesk.manga.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.ResultRow
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
 import suwayomi.tachidesk.manga.model.dataclass.IncludeOrExclude

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterMetaTable.kt

@@ -7,8 +7,8 @@ package suwayomi.tachidesk.manga.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.ReferenceOption
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ReferenceOption
 import suwayomi.tachidesk.manga.model.table.ChapterMetaTable.ref
 
 /**
@@ -26,7 +26,7 @@ import suwayomi.tachidesk.manga.model.table.ChapterMetaTable.ref
  * }
  */
 object ChapterMetaTable : IntIdTable() {
-    val key = varchar("meta_key", 256)
+    val key = varchar("key", 256)
     val value = varchar("value", 4096)
     val ref = reference("chapter_ref", ChapterTable, ReferenceOption.CASCADE)
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ChapterTable.kt

@@ -7,12 +7,11 @@ package suwayomi.tachidesk.manga.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.ReferenceOption
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.sql.ReferenceOption
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+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 org.jetbrains.exposed.sql.transactions.transaction
-import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.manga.impl.Chapter.getChapterMetaMap
 import suwayomi.tachidesk.manga.model.dataclass.ChapterDataClass
 import suwayomi.tachidesk.manga.model.table.columns.truncatingVarchar

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/ExtensionTable.kt

@@ -7,7 +7,7 @@ package suwayomi.tachidesk.manga.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
 
 object ExtensionTable : IntIdTable() {
     val apkName = varchar("apk_name", 1024)

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaMetaTable.kt

@@ -7,8 +7,8 @@ package suwayomi.tachidesk.manga.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.ReferenceOption
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ReferenceOption
 import suwayomi.tachidesk.manga.model.table.MangaMetaTable.ref
 
 /**
@@ -26,7 +26,7 @@ import suwayomi.tachidesk.manga.model.table.MangaMetaTable.ref
  * }
  */
 object MangaMetaTable : IntIdTable() {
-    val key = varchar("meta_key", 256)
+    val key = varchar("key", 256)
     val value = varchar("value", 4096)
     val ref = reference("manga_ref", MangaTable, ReferenceOption.CASCADE)
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/model/table/MangaTable.kt

@@ -9,8 +9,8 @@ package suwayomi.tachidesk.manga.model.table
 
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
-import org.jetbrains.exposed.v1.core.ResultRow
+import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
+import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.impl.Manga.getMangaMetaMap
 import suwayomi.tachidesk.manga.impl.MangaList.proxyThumbnailUrl
 import suwayomi.tachidesk.manga.model.dataclass.MangaDataClass