Remove asDataFetcherResult

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

@@ -1,27 +0,0 @@
-package suwayomi.tachidesk.graphql
-
-import com.expediagroup.graphql.server.extensions.toGraphQLError
-import graphql.execution.DataFetcherResult
-import io.github.oshai.kotlinlogging.KotlinLogging
-
-val logger = KotlinLogging.logger { }
-
-inline fun <T : Any> 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/mutations/BackupMutation.kt

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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