Add ExtenionStores to the fetchExtensions result since its possible for the stores to change.

This commit is contained in:
Syer10
2026-06-17 21:17:55 -04:00
parent 5b2613dad3
commit 6c8a024b0f
2 changed files with 12 additions and 1 deletions

View File

@@ -10,9 +10,11 @@ import org.jetbrains.exposed.v1.core.neq
import org.jetbrains.exposed.v1.jdbc.selectAll import org.jetbrains.exposed.v1.jdbc.selectAll
import org.jetbrains.exposed.v1.jdbc.transactions.transaction import org.jetbrains.exposed.v1.jdbc.transactions.transaction
import suwayomi.tachidesk.graphql.directives.RequireAuth import suwayomi.tachidesk.graphql.directives.RequireAuth
import suwayomi.tachidesk.graphql.types.ExtensionStoreType
import suwayomi.tachidesk.graphql.types.ExtensionType import suwayomi.tachidesk.graphql.types.ExtensionType
import suwayomi.tachidesk.manga.impl.extension.Extension import suwayomi.tachidesk.manga.impl.extension.Extension
import suwayomi.tachidesk.manga.impl.extension.ExtensionsList import suwayomi.tachidesk.manga.impl.extension.ExtensionsList
import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
import suwayomi.tachidesk.manga.model.table.ExtensionTable import suwayomi.tachidesk.manga.model.table.ExtensionTable
import suwayomi.tachidesk.server.JavalinSetup.future import suwayomi.tachidesk.server.JavalinSetup.future
import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture
@@ -129,6 +131,7 @@ class ExtensionMutation {
data class FetchExtensionsPayload( data class FetchExtensionsPayload(
val clientMutationId: String?, val clientMutationId: String?,
val extensions: List<ExtensionType>, val extensions: List<ExtensionType>,
val extensionStores: List<ExtensionStoreType>,
) )
@RequireAuth @RequireAuth
@@ -146,9 +149,17 @@ class ExtensionMutation {
.map { ExtensionType(it) } .map { ExtensionType(it) }
} }
val extensionStores =
transaction {
ExtensionStoreTable
.selectAll()
.map { ExtensionStoreType(it) }
}
FetchExtensionsPayload( FetchExtensionsPayload(
clientMutationId = clientMutationId, clientMutationId = clientMutationId,
extensions = extensions, extensions = extensions,
extensionStores = extensionStores,
) )
} }
} }

View File

@@ -37,7 +37,7 @@ class ExtensionStoreType(
isLegacy = row[ExtensionStoreTable.isLegacy], isLegacy = row[ExtensionStoreTable.isLegacy],
) )
fun extension(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionNodeList> = fun extensions(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionNodeList> =
dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionNodeList>("ExtensionForExtensionStore", indexUrl) dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionNodeList>("ExtensionForExtensionStore", indexUrl)
} }