Extension API 1.6 (#2120)

* Non-Extension Index changes for 1.6 * Changelog * Minor fixes * Implement extension store * Test build fix * Docs * Simplify fetching manga and chapters * Use EMPTY JsonObject * Update docs/Configuring-Suwayomi‐Server.md Co-authored-by: Constantin Piber <59023762+cpiber@users.noreply.github.com> * Improve Fetch Extension Store * Fixes * Simplify deprecated isNsfw in SourceQuery * Simplify ContentRating in Source.kt * Simplify isNsfw in SourceType * No magic numbers for ContentRating, improves safety for future versions of extension api * Fix SearchTest * Lint * Lint * Optimize imports and fix unchecked cast warning * Proper extension store queries * Optimize import fixes * Add ContentRatingFilter * Improve extension store sync * fix: re-sync (#2121) * Lint * Add ExtenionStores to the fetchExtensions result since its possible for the stores to change. * Use a single version of ContentRating * Exclude ServerConfig.extensionStores from GraphQL * Use syncDbToPrefs in ExtensionStoreMutation * Optimize Imports * Update server/server-config/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt Co-authored-by: Constantin Piber <59023762+cpiber@users.noreply.github.com> * Remove replaceWith and add specific description for GQL APIs * Include OkHttp ZSTD * Update to latest Mihon extension lib * Fix latest Mihon Extension Lib * Lint * Optimize imports * Lint * Review fixes * Add a index to extesnion table store url * Lint --------- Co-authored-by: Constantin Piber <59023762+cpiber@users.noreply.github.com>
2026-07-04 19:34:35 -05:00 · 2026-06-27 13:39:28 -04:00
parent c8f5d83e9c
commit 2d535b44d8
84 changed files with 2576 additions and 1007 deletions
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionStoreDataLoader.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/dataLoaders/ExtensionStoreDataLoader.kt
@@ -0,0 +1,57 @@
+package suwayomi.tachidesk.graphql.dataLoaders
+
+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.v1.core.inList
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.graphql.types.ExtensionNodeList
+import suwayomi.tachidesk.graphql.types.ExtensionNodeList.Companion.toNodeList
+import suwayomi.tachidesk.graphql.types.ExtensionStoreType
+import suwayomi.tachidesk.graphql.types.ExtensionType
+import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
+import suwayomi.tachidesk.manga.model.table.ExtensionTable
+import suwayomi.tachidesk.server.JavalinSetup.future
+
+class ExtensionStoreDataLoader : KotlinDataLoader<String, ExtensionStoreType> {
+    override val dataLoaderName = "ExtensionStoreDataLoader"
+
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionStoreType> =
+        DataLoaderFactory.newDataLoader { ids ->
+            future {
+                transaction {
+                    addLogger(Slf4jSqlDebugLogger)
+                    val extensionStoreByIndexUrl =
+                        ExtensionStoreTable
+                            .selectAll()
+                            .where { ExtensionStoreTable.indexUrl inList ids }
+                            .map { ExtensionStoreType(it) }
+                            .associateBy { it.indexUrl }
+                    ids.map { extensionStoreByIndexUrl[it] }
+                }
+            }
+        }
+}
+
+class ExtensionsForExtensionStore : KotlinDataLoader<String, ExtensionNodeList> {
+    override val dataLoaderName = "ExtensionsForExtensionStore"
+
+    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionNodeList> =
+        DataLoaderFactory.newDataLoader<String, ExtensionNodeList> { ids ->
+            future {
+                transaction {
+                    addLogger(Slf4jSqlDebugLogger)
+                    val extensionByIndexUrl =
+                        ExtensionTable
+                            .selectAll()
+                            .where { ExtensionTable.storeIndexUrl inList ids }
+                            .map { ExtensionType(it) }
+                            .groupBy { it.storeIndexUrl }
+                    ids.map { (extensionByIndexUrl[it] ?: emptyList()).toNodeList() }
+                }
+            }
+        }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ChapterMutation.kt
@@ -2,6 +2,7 @@

 package suwayomi.tachidesk.graphql.mutations

+import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.jetbrains.exposed.v1.core.LikePattern
@@ -25,6 +26,7 @@ import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.MetaInput
 import suwayomi.tachidesk.graphql.types.SyncConflictInfoType
 import suwayomi.tachidesk.manga.impl.Chapter
+import suwayomi.tachidesk.manga.impl.Manga
 import suwayomi.tachidesk.manga.impl.chapter.getChapterDownloadReadyById
 import suwayomi.tachidesk.manga.impl.sync.KoreaderSyncService
 import suwayomi.tachidesk.manga.model.table.ChapterMetaTable
@@ -167,11 +169,12 @@ class ChapterMutation {
    )

    @RequireAuth
+    @GraphQLDeprecated("Deprecated in Tachiyomix 1.6", ReplaceWith("fetchMangaAndChapters"))
    fun fetchChapters(input: FetchChaptersInput): CompletableFuture<FetchChaptersPayload?> {
        val (clientMutationId, mangaId) = input

        return future {
-            Chapter.fetchChapterList(mangaId)
+            Manga.updateMangaAndChapters(mangaId, updateManga = false)

            val chapters =
                transaction {
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionMutation.kt
@@ -10,9 +10,11 @@ import org.jetbrains.exposed.v1.core.neq
 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.ExtensionStoreType
 import suwayomi.tachidesk.graphql.types.ExtensionType
 import suwayomi.tachidesk.manga.impl.extension.Extension
 import suwayomi.tachidesk.manga.impl.extension.ExtensionsList
+import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.server.JavalinSetup.future
 import java.util.concurrent.CompletableFuture
@@ -129,6 +131,7 @@ class ExtensionMutation {
    data class FetchExtensionsPayload(
        val clientMutationId: String?,
        val extensions: List<ExtensionType>,
+        val extensionStores: List<ExtensionStoreType>,
    )

    @RequireAuth
@@ -146,9 +149,17 @@ class ExtensionMutation {
                        .map { ExtensionType(it) }
                }

+            val extensionStores =
+                transaction {
+                    ExtensionStoreTable
+                        .selectAll()
+                        .map { ExtensionStoreType(it) }
+                }
+
            FetchExtensionsPayload(
                clientMutationId = clientMutationId,
                extensions = extensions,
+                extensionStores = extensionStores,
            )
        }
    }
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionStoreMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/ExtensionStoreMutation.kt
@@ -0,0 +1,104 @@
+package suwayomi.tachidesk.graphql.mutations
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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.eq
+import org.jetbrains.exposed.v1.jdbc.deleteWhere
+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.ExtensionStoreType
+import suwayomi.tachidesk.manga.impl.extension.ExtensionStoreService
+import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
+import suwayomi.tachidesk.server.JavalinSetup.future
+import java.util.concurrent.CompletableFuture
+
+class ExtensionStoreMutation {
+    data class AddExtensionStoreInput(
+        val clientMutationId: String? = null,
+        val indexUrl: String,
+    )
+
+    data class AddExtensionStorePayload(
+        val clientMutationId: String?,
+        val extensionStore: ExtensionStoreType,
+    )
+
+    @RequireAuth
+    fun addExtensionStore(input: AddExtensionStoreInput): CompletableFuture<AddExtensionStorePayload?> {
+        val (clientMutationId, indexUrl) = input
+        return future {
+            val store = ExtensionStoreService.fetch(indexUrl)
+
+            ExtensionStoreService.upsert(store)
+            ExtensionStoreService.syncDbToPrefs()
+            val row =
+                transaction {
+                    ExtensionStoreTable
+                        .selectAll()
+                        .where { ExtensionStoreTable.indexUrl eq store.indexUrl }
+                        .first()
+                }
+
+            AddExtensionStorePayload(
+                clientMutationId = clientMutationId,
+                extensionStore = ExtensionStoreType(row),
+            )
+        }
+    }
+
+    data class RemoveExtensionStoreInput(
+        val clientMutationId: String? = null,
+        val indexUrl: String,
+    )
+
+    data class RemoveExtensionStorePayload(
+        val clientMutationId: String?,
+        val extensionStore: ExtensionStoreType?,
+    )
+
+    @RequireAuth
+    fun removeExtensionStore(input: RemoveExtensionStoreInput): CompletableFuture<RemoveExtensionStorePayload?> {
+        val (clientMutationId, indexUrl) = input
+        return future {
+            val store =
+                transaction {
+                    ExtensionStoreTable
+                        .selectAll()
+                        .where { ExtensionStoreTable.indexUrl eq indexUrl }
+                        .firstOrNull()
+                        ?.let { ExtensionStoreType(it) }
+                }
+
+            store?.let {
+                transaction {
+                    ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq indexUrl }
+                }
+            }
+
+            ExtensionStoreService.syncDbToPrefs()
+
+            RemoveExtensionStorePayload(
+                clientMutationId = clientMutationId,
+                extensionStore =
+                    store?.let {
+                        ExtensionStoreType(
+                            name = it.name,
+                            badgeLabel = it.badgeLabel,
+                            signingKey = it.signingKey,
+                            contactWebsite = it.contactWebsite,
+                            contactDiscord = it.contactDiscord,
+                            indexUrl = it.indexUrl,
+                            isLegacy = it.isLegacy,
+                            extensionListUrl = it.extensionListUrl,
+                        )
+                    },
+            )
+        }
+    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/MangaMutation.kt
@@ -2,6 +2,7 @@

 package suwayomi.tachidesk.graphql.mutations

+import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import org.jetbrains.exposed.v1.core.LikePattern
 import org.jetbrains.exposed.v1.core.Op
 import org.jetbrains.exposed.v1.core.and
@@ -14,12 +15,14 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import org.jetbrains.exposed.v1.jdbc.update
 import suwayomi.tachidesk.graphql.directives.RequireAuth
+import suwayomi.tachidesk.graphql.types.ChapterType
 import suwayomi.tachidesk.graphql.types.MangaMetaType
 import suwayomi.tachidesk.graphql.types.MangaType
 import suwayomi.tachidesk.graphql.types.MetaInput
 import suwayomi.tachidesk.manga.impl.Library
 import suwayomi.tachidesk.manga.impl.Manga
 import suwayomi.tachidesk.manga.impl.update.IUpdater
+import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaMetaTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.toDataClass
@@ -146,11 +149,12 @@ class MangaMutation {
    )

    @RequireAuth
+    @GraphQLDeprecated("Deprecated in Tachiyomix 1.6", ReplaceWith("fetchMangaAndChapters"))
    fun fetchManga(input: FetchMangaInput): CompletableFuture<FetchMangaPayload?> {
        val (clientMutationId, id) = input

        return future {
-            Manga.fetchManga(id)
+            Manga.updateMangaAndChapters(id, updateChapters = false)

            val manga =
                transaction {
@@ -163,6 +167,49 @@ class MangaMutation {
        }
    }

+    data class FetchMangaAndChaptersInput(
+        val clientMutationId: String? = null,
+        val id: Int,
+        val fetchManga: Boolean,
+        val fetchChapters: Boolean,
+    )
+
+    data class FetchMangaAndChaptersPayload(
+        val clientMutationId: String?,
+        val manga: MangaType,
+        val chapters: List<ChapterType>,
+    )
+
+    @RequireAuth
+    fun fetchMangaAndChapters(input: FetchMangaAndChaptersInput): CompletableFuture<FetchMangaAndChaptersPayload?> {
+        val (clientMutationId, id, fetchManga, fetchChapters) = input
+
+        return future {
+            Manga.updateMangaAndChapters(
+                mangaId = id,
+                updateManga = fetchManga,
+                updateChapters = fetchChapters,
+            )
+
+            val (manga, chapters) =
+                transaction {
+                    Pair(
+                        MangaTable.selectAll().where { MangaTable.id eq id }.first(),
+                        ChapterTable
+                            .selectAll()
+                            .where { ChapterTable.manga eq id }
+                            .orderBy(ChapterTable.sourceOrder)
+                            .map { ChapterType(it) },
+                    )
+                }
+            FetchMangaAndChaptersPayload(
+                clientMutationId = clientMutationId,
+                manga = MangaType(manga),
+                chapters = chapters,
+            )
+        }
+    }
+
    data class SetMangaMetaInput(
        val clientMutationId: String? = null,
        val meta: MangaMetaType,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionQuery.kt
@@ -21,12 +21,15 @@ import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
+import suwayomi.tachidesk.graphql.queries.filter.ContentWarningFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.IntFilter
+import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
+import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEnum
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -40,6 +43,7 @@ import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.ExtensionNodeList
 import suwayomi.tachidesk.graphql.types.ExtensionType
+import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import java.util.concurrent.CompletableFuture

@@ -55,21 +59,23 @@ class ExtensionQuery {
    ) : OrderBy<ExtensionType> {
        PKG_NAME(ExtensionTable.pkgName),
        NAME(ExtensionTable.name),
-        APK_NAME(ExtensionTable.apkName),
+
+        @GraphQLDeprecated("")
+        APK_NAME(ExtensionTable.pkgName),
        ;

        override fun greater(cursor: Cursor): Op<Boolean> =
            when (this) {
                PKG_NAME -> ExtensionTable.pkgName greater cursor.value
                NAME -> greaterNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> greaterNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
+                APK_NAME -> ExtensionTable.pkgName greater cursor.value
            }

        override fun less(cursor: Cursor): Op<Boolean> =
            when (this) {
                PKG_NAME -> ExtensionTable.pkgName less cursor.value
                NAME -> lessNotUnique(ExtensionTable.name, ExtensionTable.pkgName, cursor, String::toString)
-                APK_NAME -> lessNotUnique(ExtensionTable.apkName, ExtensionTable.pkgName, cursor, String::toString)
+                APK_NAME -> ExtensionTable.pkgName less cursor.value
            }

        override fun asCursor(type: ExtensionType): Cursor {
@@ -89,29 +95,44 @@ class ExtensionQuery {
    ) : Order<ExtensionOrderBy>

    data class ExtensionCondition(
+        val storeIndexUrl: String? = null,
+        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val repo: String? = null,
        val apkName: String? = null,
        val iconUrl: String? = null,
        val name: String? = null,
        val pkgName: String? = null,
+        val apkUrl: String? = null,
+        val extensionLib: String? = null,
        val versionName: String? = null,
        val versionCode: Int? = null,
+        val versionCodeLong: Long? = null,
        val lang: String? = null,
+        @GraphQLDeprecated("", ReplaceWith("contentWarning"))
        val isNsfw: Boolean? = null,
+        val contentWarning: ContentWarning? = null,
        val isInstalled: Boolean? = null,
        val hasUpdate: Boolean? = null,
        val isObsolete: Boolean? = null,
    ) : HasGetOp {
        override fun getOp(): Op<Boolean>? {
            val opAnd = OpAnd()
-            opAnd.eq(repo, ExtensionTable.repo)
+            opAnd.eq(storeIndexUrl, ExtensionTable.storeIndexUrl)
+            opAnd.eq(repo, ExtensionTable.storeIndexUrl)
            opAnd.eq(apkName, ExtensionTable.apkName)
            opAnd.eq(iconUrl, ExtensionTable.iconUrl)
+            opAnd.eq(apkUrl, ExtensionTable.apkUrl)
            opAnd.eq(name, ExtensionTable.name)
+            opAnd.eq(extensionLib, ExtensionTable.extensionLib)
            opAnd.eq(versionName, ExtensionTable.versionName)
-            opAnd.eq(versionCode, ExtensionTable.versionCode)
+            opAnd.eq(versionCode?.toLong(), ExtensionTable.versionCode)
+            opAnd.eq(versionCodeLong, ExtensionTable.versionCode)
            opAnd.eq(lang, ExtensionTable.lang)
-            opAnd.eq(isNsfw, ExtensionTable.isNsfw)
+            opAnd.eq(
+                isNsfw?.let { if (it) ContentWarning.MIXED.ordinal else ContentWarning.SAFE.ordinal },
+                ExtensionTable.contentWarning,
+            )
+            opAnd.eq(contentWarning?.ordinal, ExtensionTable.contentWarning)
            opAnd.eq(isInstalled, ExtensionTable.isInstalled)
            opAnd.eq(hasUpdate, ExtensionTable.hasUpdate)
            opAnd.eq(isObsolete, ExtensionTable.isObsolete)
@@ -121,15 +142,23 @@ class ExtensionQuery {
    }

    data class ExtensionFilter(
+        val storeIndexUrl: StringFilter? = null,
+        @GraphQLDeprecated("", ReplaceWith("storeIndexUrl"))
        val repo: StringFilter? = null,
        val apkName: StringFilter? = null,
        val iconUrl: StringFilter? = null,
        val name: StringFilter? = null,
        val pkgName: StringFilter? = null,
+        val apkUrl: StringFilter? = null,
        val versionName: StringFilter? = null,
+        val extensionLib: StringFilter? = null,
+        @GraphQLDeprecated("", ReplaceWith("versionCodeLong"))
        val versionCode: IntFilter? = null,
+        val versionCodeLong: LongFilter? = null,
        val lang: StringFilter? = null,
+        @GraphQLDeprecated("", ReplaceWith("contentWarning"))
        val isNsfw: BooleanFilter? = null,
+        val contentWarning: ContentWarningFilter? = null,
        val isInstalled: BooleanFilter? = null,
        val hasUpdate: BooleanFilter? = null,
        val isObsolete: BooleanFilter? = null,
@@ -139,15 +168,18 @@ class ExtensionQuery {
    ) : Filter<ExtensionFilter> {
        override fun getOpList(): List<Op<Boolean>> =
            listOfNotNull(
-                andFilterWithCompareString(ExtensionTable.repo, repo),
+                andFilterWithCompareString(ExtensionTable.storeIndexUrl, storeIndexUrl),
+                andFilterWithCompareString(ExtensionTable.storeIndexUrl, repo),
                andFilterWithCompareString(ExtensionTable.apkName, apkName),
                andFilterWithCompareString(ExtensionTable.iconUrl, iconUrl),
                andFilterWithCompareString(ExtensionTable.name, name),
                andFilterWithCompareString(ExtensionTable.pkgName, pkgName),
+                andFilterWithCompareString(ExtensionTable.apkUrl, apkUrl),
+                andFilterWithCompareString(ExtensionTable.extensionLib, extensionLib),
                andFilterWithCompareString(ExtensionTable.versionName, versionName),
-                andFilterWithCompare(ExtensionTable.versionCode, versionCode),
+                andFilterWithCompare(ExtensionTable.versionCode, versionCodeLong),
                andFilterWithCompareString(ExtensionTable.lang, lang),
-                andFilterWithCompare(ExtensionTable.isNsfw, isNsfw),
+                andFilterWithCompareEnum(ExtensionTable.contentWarning, contentWarning),
                andFilterWithCompare(ExtensionTable.isInstalled, isInstalled),
                andFilterWithCompare(ExtensionTable.hasUpdate, hasUpdate),
                andFilterWithCompare(ExtensionTable.isObsolete, isObsolete),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionStoreQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/ExtensionStoreQuery.kt
@@ -0,0 +1,190 @@
+package suwayomi.tachidesk.graphql.queries
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 com.expediagroup.graphql.server.extensions.getValueFromDataLoader
+import graphql.schema.DataFetchingEnvironment
+import org.jetbrains.exposed.v1.core.Column
+import org.jetbrains.exposed.v1.core.Op
+import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.jdbc.selectAll
+import org.jetbrains.exposed.v1.jdbc.transactions.transaction
+import suwayomi.tachidesk.graphql.directives.RequireAuth
+import suwayomi.tachidesk.graphql.queries.filter.Filter
+import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
+import suwayomi.tachidesk.graphql.queries.filter.OpAnd
+import suwayomi.tachidesk.graphql.queries.filter.StringFilter
+import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
+import suwayomi.tachidesk.graphql.queries.filter.applyOps
+import suwayomi.tachidesk.graphql.server.primitives.Cursor
+import suwayomi.tachidesk.graphql.server.primitives.Order
+import suwayomi.tachidesk.graphql.server.primitives.OrderBy
+import suwayomi.tachidesk.graphql.server.primitives.PageInfo
+import suwayomi.tachidesk.graphql.server.primitives.QueryResults
+import suwayomi.tachidesk.graphql.server.primitives.applyBeforeAfter
+import suwayomi.tachidesk.graphql.server.primitives.greaterNotUnique
+import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
+import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
+import suwayomi.tachidesk.graphql.types.ExtensionStoreNodeList
+import suwayomi.tachidesk.graphql.types.ExtensionStoreType
+import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
+import java.util.concurrent.CompletableFuture
+
+class ExtensionStoreQuery {
+    @RequireAuth
+    fun extensionStore(
+        dataFetchingEnvironment: DataFetchingEnvironment,
+        indexUrl: String,
+    ): CompletableFuture<ExtensionStoreType> = dataFetchingEnvironment.getValueFromDataLoader("ExtensionStoreDataLoader", indexUrl)
+
+    enum class ExtensionStoreOrderBy(
+        override val column: Column<*>,
+    ) : OrderBy<ExtensionStoreType> {
+        NAME(ExtensionStoreTable.name),
+        INDEX_URL(ExtensionStoreTable.indexUrl),
+        ;
+
+        override fun greater(cursor: Cursor): Op<Boolean> =
+            when (this) {
+                NAME -> greaterNotUnique(ExtensionStoreTable.name, ExtensionStoreTable.id, cursor, String::toString)
+                INDEX_URL -> greaterNotUnique(ExtensionStoreTable.indexUrl, ExtensionStoreTable.id, cursor, String::toString)
+            }
+
+        override fun less(cursor: Cursor): Op<Boolean> =
+            when (this) {
+                NAME -> lessNotUnique(ExtensionStoreTable.name, ExtensionStoreTable.id, cursor, String::toString)
+                INDEX_URL -> lessNotUnique(ExtensionStoreTable.indexUrl, ExtensionStoreTable.id, cursor, String::toString)
+            }
+
+        override fun asCursor(type: ExtensionStoreType): Cursor {
+            val value =
+                when (this) {
+                    INDEX_URL -> type.indexUrl
+                    NAME -> type.indexUrl + "-" + type.name
+                }
+            return Cursor(value)
+        }
+    }
+
+    data class ExtensionStoreOrder(
+        override val by: ExtensionStoreOrderBy,
+        override val byType: SortOrder? = null,
+    ) : Order<ExtensionStoreOrderBy>
+
+    data class ExtensionStoreCondition(
+        val id: Int? = null,
+        val indexUrl: String? = null,
+        val name: String? = null,
+    ) : HasGetOp {
+        override fun getOp(): Op<Boolean>? {
+            val opAnd = OpAnd()
+            opAnd.eq(id, ExtensionStoreTable.id)
+            opAnd.eq(indexUrl, ExtensionStoreTable.indexUrl)
+            opAnd.eq(name, ExtensionStoreTable.name)
+
+            return opAnd.op
+        }
+    }
+
+    data class ExtensionStoreFilter(
+        val indexUrl: StringFilter? = null,
+        val name: StringFilter? = null,
+        override val and: List<ExtensionStoreFilter>? = null,
+        override val or: List<ExtensionStoreFilter>? = null,
+        override val not: ExtensionStoreFilter? = null,
+    ) : Filter<ExtensionStoreFilter> {
+        override fun getOpList(): List<Op<Boolean>> =
+            listOfNotNull(
+                andFilterWithCompareString(ExtensionStoreTable.indexUrl, indexUrl),
+                andFilterWithCompareString(ExtensionStoreTable.name, name),
+            )
+    }
+
+    @RequireAuth
+    fun extensionStores(
+        condition: ExtensionStoreCondition? = null,
+        filter: ExtensionStoreFilter? = null,
+        order: List<ExtensionStoreOrder>? = null,
+        before: Cursor? = null,
+        after: Cursor? = null,
+        first: Int? = null,
+        last: Int? = null,
+        offset: Int? = null,
+    ): ExtensionStoreNodeList {
+        val queryResults =
+            transaction {
+                val res = ExtensionStoreTable.selectAll()
+
+                res.applyOps(condition, filter)
+
+                if (order != null || (last != null || before != null)) {
+                    val baseSort = listOf(ExtensionStoreOrder(ExtensionStoreOrderBy.INDEX_URL, SortOrder.ASC))
+                    val actualSort = (order.orEmpty() + baseSort)
+                    actualSort.forEach { (orderBy, orderByType) ->
+                        val orderByColumn = orderBy.column
+                        val orderType = orderByType.maybeSwap(last ?: before)
+
+                        res.orderBy(orderByColumn to orderType)
+                    }
+                }
+
+                val total = res.count()
+                val firstResult = res.firstOrNull()?.get(ExtensionStoreTable.indexUrl)
+                val lastResult = res.lastOrNull()?.get(ExtensionStoreTable.indexUrl)
+
+                res.applyBeforeAfter(
+                    before = before,
+                    after = after,
+                    orderBy = order?.firstOrNull()?.by ?: ExtensionStoreOrderBy.INDEX_URL,
+                    orderByType = order?.firstOrNull()?.byType,
+                )
+
+                if (first != null) {
+                    res.limit(first).offset(offset?.toLong() ?: 0)
+                } else if (last != null) {
+                    res.limit(last)
+                }
+
+                QueryResults(total, firstResult, lastResult, res.toList())
+            }
+
+        val getAsCursor: (ExtensionStoreType) -> Cursor = (order?.firstOrNull()?.by ?: ExtensionStoreOrderBy.INDEX_URL)::asCursor
+
+        val resultsAsType = queryResults.results.map { ExtensionStoreType(it) }
+
+        return ExtensionStoreNodeList(
+            resultsAsType,
+            if (resultsAsType.isEmpty()) {
+                emptyList()
+            } else {
+                listOfNotNull(
+                    resultsAsType.firstOrNull()?.let {
+                        ExtensionStoreNodeList.ExtensionStoreEdge(
+                            getAsCursor(it),
+                            it,
+                        )
+                    },
+                    resultsAsType.lastOrNull()?.let {
+                        ExtensionStoreNodeList.ExtensionStoreEdge(
+                            getAsCursor(it),
+                            it,
+                        )
+                    },
+                )
+            },
+            pageInfo =
+                PageInfo(
+                    hasNextPage = queryResults.lastKey != resultsAsType.lastOrNull()?.indexUrl,
+                    hasPreviousPage = queryResults.firstKey != resultsAsType.firstOrNull()?.indexUrl,
+                    startCursor = resultsAsType.firstOrNull()?.let { getAsCursor(it) },
+                    endCursor = resultsAsType.lastOrNull()?.let { getAsCursor(it) },
+                ),
+            totalCount = queryResults.total.toInt(),
+        )
+    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/SourceQuery.kt
@@ -13,19 +13,22 @@ import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.v1.core.Column
 import org.jetbrains.exposed.v1.core.Op
 import org.jetbrains.exposed.v1.core.SortOrder
+import org.jetbrains.exposed.v1.core.eq
 import org.jetbrains.exposed.v1.core.greater
+import org.jetbrains.exposed.v1.core.greaterEq
 import org.jetbrains.exposed.v1.core.less
 import org.jetbrains.exposed.v1.jdbc.selectAll
 import org.jetbrains.exposed.v1.jdbc.transactions.transaction
 import suwayomi.tachidesk.graphql.directives.RequireAuth
 import suwayomi.tachidesk.graphql.queries.filter.BooleanFilter
+import suwayomi.tachidesk.graphql.queries.filter.ContentWarningFilter
 import suwayomi.tachidesk.graphql.queries.filter.Filter
 import suwayomi.tachidesk.graphql.queries.filter.HasGetOp
 import suwayomi.tachidesk.graphql.queries.filter.LongFilter
 import suwayomi.tachidesk.graphql.queries.filter.OpAnd
 import suwayomi.tachidesk.graphql.queries.filter.StringFilter
-import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompare
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEntity
+import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareEnum
 import suwayomi.tachidesk.graphql.queries.filter.andFilterWithCompareString
 import suwayomi.tachidesk.graphql.queries.filter.applyOps
 import suwayomi.tachidesk.graphql.server.primitives.Cursor
@@ -39,6 +42,7 @@ import suwayomi.tachidesk.graphql.server.primitives.lessNotUnique
 import suwayomi.tachidesk.graphql.server.primitives.maybeSwap
 import suwayomi.tachidesk.graphql.types.SourceNodeList
 import suwayomi.tachidesk.graphql.types.SourceType
+import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import java.util.concurrent.CompletableFuture

@@ -91,14 +95,23 @@ class SourceQuery {
        val id: Long? = null,
        val name: String? = null,
        val lang: String? = null,
+        @GraphQLDeprecated("replace with contentWarning == ContentRating.MIXED", ReplaceWith("contentWarning"))
        val isNsfw: Boolean? = null,
+        val contentWarning: ContentWarning? = null,
    ) : HasGetOp {
        override fun getOp(): Op<Boolean>? {
            val opAnd = OpAnd()
            opAnd.eq(id, SourceTable.id)
            opAnd.eq(name, SourceTable.name)
            opAnd.eq(lang, SourceTable.lang)
-            opAnd.eq(isNsfw, SourceTable.isNsfw)
+            opAnd.andWhere(isNsfw) {
+                if (it) {
+                    SourceTable.contentWarning greaterEq ContentWarning.MIXED.ordinal
+                } else {
+                    SourceTable.contentWarning less ContentWarning.MIXED.ordinal
+                }
+            }
+            opAnd.andWhere(contentWarning) { SourceTable.contentWarning eq it.ordinal }

            return opAnd.op
        }
@@ -108,7 +121,9 @@ class SourceQuery {
        val id: LongFilter? = null,
        val name: StringFilter? = null,
        val lang: StringFilter? = null,
+        @GraphQLDeprecated("replace with contentWarning", ReplaceWith("contentWarning"))
        val isNsfw: BooleanFilter? = null,
+        val contentWarning: ContentWarningFilter? = null,
        override val and: List<SourceFilter>? = null,
        override val or: List<SourceFilter>? = null,
        override val not: SourceFilter? = null,
@@ -118,7 +133,7 @@ class SourceQuery {
                andFilterWithCompareEntity(SourceTable.id, id),
                andFilterWithCompareString(SourceTable.name, name),
                andFilterWithCompareString(SourceTable.lang, lang),
-                andFilterWithCompare(SourceTable.isNsfw, isNsfw),
+                andFilterWithCompareEnum(SourceTable.contentWarning, contentWarning),
            )
    }

--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/queries/filter/Filter.kt
@@ -28,6 +28,7 @@ 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
+import suwayomi.tachidesk.manga.model.dataclass.ContentWarning

 class ILikeEscapeOp(
    expr1: Expression<*>,
@@ -329,6 +330,24 @@ data class DoubleFilter(
        )
 }

+data class ContentWarningFilter(
+    override val isNull: Boolean? = null,
+    override val equalTo: ContentWarning? = null,
+    override val notEqualTo: ContentWarning? = null,
+    override val notEqualToAll: List<ContentWarning>? = null,
+    override val notEqualToAny: List<ContentWarning>? = null,
+    override val distinctFrom: ContentWarning? = null,
+    override val distinctFromAll: List<ContentWarning>? = null,
+    override val distinctFromAny: List<ContentWarning>? = null,
+    override val notDistinctFrom: ContentWarning? = null,
+    override val `in`: List<ContentWarning>? = null,
+    override val notIn: List<ContentWarning>? = null,
+    override val lessThan: ContentWarning? = null,
+    override val lessThanOrEqualTo: ContentWarning? = null,
+    override val greaterThan: ContentWarning? = null,
+    override val greaterThanOrEqualTo: ContentWarning? = null,
+) : ComparableScalarFilter<ContentWarning>
+
 data class StringFilter(
    override val isNull: Boolean? = null,
    override val equalTo: String? = null,
@@ -618,6 +637,35 @@ fun <T : Comparable<T>, S : T?> andFilterWithCompare(
    return opAnd.op
 }

+@Suppress("UNCHECKED_CAST")
+fun <T : Enum<T>> andFilterWithCompareEnum(
+    column: Column<Int>,
+    filter: ComparableScalarFilter<T>?,
+): Op<Boolean>? {
+    filter ?: return null
+    val opAnd = OpAnd()
+
+    opAnd.andWhere(filter.lessThan) { column less it.ordinal }
+    opAnd.andWhere(filter.lessThanOrEqualTo) { column lessEq it.ordinal }
+    opAnd.andWhere(filter.greaterThan) { column greater it.ordinal }
+    opAnd.andWhere(filter.greaterThanOrEqualTo) { column greaterEq it.ordinal }
+
+    opAnd.andWhere(filter.isNull) { if (it) column.isNull() else column.isNotNull() }
+
+    opAnd.andWhere(filter.equalTo) { column eq it.ordinal }
+    opAnd.andNotWhere(filter.notEqualTo, filter.notEqualToAll, filter.notEqualToAny) { column neq it.ordinal }
+    opAnd.andWhere(filter.distinctFrom, filter.distinctFromAll, filter.distinctFromAny) { DistinctFromOp.distinctFrom(column, it.ordinal) }
+    opAnd.andWhere(filter.notDistinctFrom) { DistinctFromOp.notDistinctFrom(column, it.ordinal) }
+    if (!filter.`in`.isNullOrEmpty()) {
+        opAnd.andWhere(filter.`in`) { column inList it.map { it.ordinal } }
+    }
+    if (!filter.notIn.isNullOrEmpty()) {
+        opAnd.andWhere(filter.notIn) { column notInList it.map { it.ordinal } }
+    }
+
+    return opAnd.op
+}
+
 fun <T : Comparable<T>> andFilterWithCompareEntity(
    column: Column<EntityID<T>>,
    filter: ComparableScalarFilter<T>?,
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskDataLoaderRegistryFactory.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskDataLoaderRegistryFactory.kt
@@ -21,6 +21,8 @@ import suwayomi.tachidesk.graphql.dataLoaders.DisplayScoreForTrackSearchDataLoad
 import suwayomi.tachidesk.graphql.dataLoaders.DownloadedChapterCountForMangaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionForSourceDataLoader
+import suwayomi.tachidesk.graphql.dataLoaders.ExtensionStoreDataLoader
+import suwayomi.tachidesk.graphql.dataLoaders.ExtensionsForExtensionStore
 import suwayomi.tachidesk.graphql.dataLoaders.FirstUnreadChapterForMangaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.GlobalMetaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.HasDuplicateChaptersForMangaDataLoader
@@ -78,6 +80,8 @@ class TachideskDataLoaderRegistryFactory {
                SourceMetaDataLoader(),
                ExtensionDataLoader(),
                ExtensionForSourceDataLoader(),
+                ExtensionsForExtensionStore(),
+                ExtensionStoreDataLoader(),
                TrackerDataLoader(),
                TrackerStatusesDataLoader(),
                TrackerScoresDataLoader(),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/server/TachideskGraphQLSchema.kt
@@ -20,6 +20,7 @@ import suwayomi.tachidesk.graphql.mutations.CategoryMutation
 import suwayomi.tachidesk.graphql.mutations.ChapterMutation
 import suwayomi.tachidesk.graphql.mutations.DownloadMutation
 import suwayomi.tachidesk.graphql.mutations.ExtensionMutation
+import suwayomi.tachidesk.graphql.mutations.ExtensionStoreMutation
 import suwayomi.tachidesk.graphql.mutations.ImageMutation
 import suwayomi.tachidesk.graphql.mutations.InfoMutation
 import suwayomi.tachidesk.graphql.mutations.KoreaderSyncMutation
@@ -36,6 +37,7 @@ import suwayomi.tachidesk.graphql.queries.CategoryQuery
 import suwayomi.tachidesk.graphql.queries.ChapterQuery
 import suwayomi.tachidesk.graphql.queries.DownloadQuery
 import suwayomi.tachidesk.graphql.queries.ExtensionQuery
+import suwayomi.tachidesk.graphql.queries.ExtensionStoreQuery
 import suwayomi.tachidesk.graphql.queries.InfoQuery
 import suwayomi.tachidesk.graphql.queries.KoreaderSyncQuery
 import suwayomi.tachidesk.graphql.queries.MangaQuery
@@ -95,6 +97,7 @@ val schema =
                TopLevelObject(ChapterQuery()),
                TopLevelObject(DownloadQuery()),
                TopLevelObject(ExtensionQuery()),
+                TopLevelObject(ExtensionStoreQuery()),
                TopLevelObject(InfoQuery()),
                TopLevelObject(KoreaderSyncQuery()),
                TopLevelObject(MangaQuery()),
@@ -112,6 +115,7 @@ val schema =
                TopLevelObject(ChapterMutation()),
                TopLevelObject(DownloadMutation()),
                TopLevelObject(ExtensionMutation()),
+                TopLevelObject(ExtensionStoreMutation()),
                TopLevelObject(ImageMutation()),
                TopLevelObject(InfoMutation()),
                TopLevelObject(KoreaderSyncMutation()),
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionStoreType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionStoreType.kt
@@ -0,0 +1,86 @@
+package suwayomi.tachidesk.graphql.types
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 com.expediagroup.graphql.server.extensions.getValueFromDataLoader
+import graphql.schema.DataFetchingEnvironment
+import org.jetbrains.exposed.v1.core.ResultRow
+import suwayomi.tachidesk.graphql.server.primitives.Cursor
+import suwayomi.tachidesk.graphql.server.primitives.Edge
+import suwayomi.tachidesk.graphql.server.primitives.Node
+import suwayomi.tachidesk.graphql.server.primitives.NodeList
+import suwayomi.tachidesk.graphql.server.primitives.PageInfo
+import suwayomi.tachidesk.manga.model.table.ExtensionStoreTable
+import java.util.concurrent.CompletableFuture
+
+class ExtensionStoreType(
+    val name: String,
+    val badgeLabel: String,
+    val signingKey: String,
+    val contactWebsite: String,
+    val contactDiscord: String?,
+    val indexUrl: String,
+    val isLegacy: Boolean,
+    val extensionListUrl: String?,
+) : Node {
+    constructor(row: ResultRow) : this(
+        name = row[ExtensionStoreTable.name],
+        badgeLabel = row[ExtensionStoreTable.badgeLabel],
+        signingKey = row[ExtensionStoreTable.signingKey],
+        contactWebsite = row[ExtensionStoreTable.contactWebsite],
+        contactDiscord = row[ExtensionStoreTable.contactDiscord],
+        indexUrl = row[ExtensionStoreTable.indexUrl],
+        isLegacy = row[ExtensionStoreTable.isLegacy],
+        extensionListUrl = row[ExtensionStoreTable.extensionListUrl],
+    )
+
+    fun extensions(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionNodeList> =
+        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionNodeList>("ExtensionsForExtensionStore", indexUrl)
+}
+
+data class ExtensionStoreNodeList(
+    override val nodes: List<ExtensionStoreType>,
+    override val edges: List<ExtensionStoreEdge>,
+    override val pageInfo: PageInfo,
+    override val totalCount: Int,
+) : NodeList() {
+    data class ExtensionStoreEdge(
+        override val cursor: Cursor,
+        override val node: ExtensionStoreType,
+    ) : Edge()
+
+    companion object {
+        fun List<ExtensionStoreType>.toNodeList(): ExtensionStoreNodeList =
+            ExtensionStoreNodeList(
+                nodes = this,
+                edges = getEdges(),
+                pageInfo =
+                    PageInfo(
+                        hasNextPage = false,
+                        hasPreviousPage = false,
+                        startCursor = Cursor(0.toString()),
+                        endCursor = Cursor(lastIndex.toString()),
+                    ),
+                totalCount = size,
+            )
+
+        private fun List<ExtensionStoreType>.getEdges(): List<ExtensionStoreEdge> {
+            if (isEmpty()) return emptyList()
+            return listOf(
+                ExtensionStoreEdge(
+                    cursor = Cursor("0"),
+                    node = first(),
+                ),
+                ExtensionStoreEdge(
+                    cursor = Cursor(lastIndex.toString()),
+                    node = last(),
+                ),
+            )
+        }
+    }
+}
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/ExtensionType.kt
@@ -7,6 +7,8 @@

 package suwayomi.tachidesk.graphql.types

+import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import graphql.schema.DataFetchingEnvironment
 import org.jetbrains.exposed.v1.core.ResultRow
@@ -16,33 +18,51 @@ import suwayomi.tachidesk.graphql.server.primitives.Node
 import suwayomi.tachidesk.graphql.server.primitives.NodeList
 import suwayomi.tachidesk.graphql.server.primitives.PageInfo
 import suwayomi.tachidesk.manga.impl.extension.Extension
+import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import java.util.concurrent.CompletableFuture

 class ExtensionType(
+    val storeIndexUrl: String?,
+    @GraphQLDeprecated("Removed in extension api v1.6", ReplaceWith("storeIndexUrl"))
    val repo: String?,
-    val apkName: String,
+    @GraphQLDescription("This will be nullable in the future")
+    val apkName: String?,
    val iconUrl: String,
    val name: String,
    val pkgName: String,
+    val apkUrl: String?,
+    val extensionLib: String?,
    val versionName: String,
+    @GraphQLDeprecated(
+        "Type was changed to Long, will be switched back to this variable name in the future.",
+        ReplaceWith("versionCodeLong"),
+    )
    val versionCode: Int,
+    val versionCodeLong: Long,
    val lang: String,
+    @GraphQLDeprecated("Removed in extension api v1.6", ReplaceWith("contentWarning"))
    val isNsfw: Boolean,
+    val contentWarning: ContentWarning,
    val isInstalled: Boolean,
    val hasUpdate: Boolean,
    val isObsolete: Boolean,
 ) : Node {
    constructor(row: ResultRow) : this(
-        repo = row[ExtensionTable.repo],
-        apkName = row[ExtensionTable.apkName],
-        iconUrl = Extension.getExtensionIconUrl(row[ExtensionTable.apkName]),
+        storeIndexUrl = row[ExtensionTable.storeIndexUrl],
+        repo = row[ExtensionTable.storeIndexUrl],
+        apkName = row[ExtensionTable.apkName].orEmpty(),
+        iconUrl = Extension.proxyExtensionIconUrl(row[ExtensionTable.pkgName]),
        name = row[ExtensionTable.name],
        pkgName = row[ExtensionTable.pkgName],
+        apkUrl = row[ExtensionTable.apkUrl],
+        extensionLib = row[ExtensionTable.extensionLib],
        versionName = row[ExtensionTable.versionName],
-        versionCode = row[ExtensionTable.versionCode],
+        versionCode = row[ExtensionTable.versionCode].toInt(),
+        versionCodeLong = row[ExtensionTable.versionCode],
        lang = row[ExtensionTable.lang],
-        isNsfw = row[ExtensionTable.isNsfw],
+        isNsfw = row[ExtensionTable.contentWarning] >= ContentWarning.MIXED.ordinal,
+        contentWarning = ContentWarning.valueOf(row[ExtensionTable.contentWarning]),
        isInstalled = row[ExtensionTable.isInstalled],
        hasUpdate = row[ExtensionTable.hasUpdate],
        isObsolete = row[ExtensionTable.isObsolete],
@@ -50,6 +70,9 @@ class ExtensionType(

    fun source(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<SourceNodeList> =
        dataFetchingEnvironment.getValueFromDataLoader<String, SourceNodeList>("SourcesForExtensionDataLoader", pkgName)
+
+    fun extensionStore(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionStoreType> =
+        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionStoreType>("ExtensionStoreDataLoader", storeIndexUrl.orEmpty())
 }

 data class ExtensionNodeList(
--- a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SourceType.kt
@@ -7,6 +7,7 @@

 package suwayomi.tachidesk.graphql.types

+import com.expediagroup.graphql.generator.annotations.GraphQLDeprecated
 import com.expediagroup.graphql.server.extensions.getValueFromDataLoader
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.ConfigurableSource
@@ -25,7 +26,7 @@ import suwayomi.tachidesk.manga.impl.Source.getSourcePreferencesRaw
 import suwayomi.tachidesk.manga.impl.extension.Extension
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
-import suwayomi.tachidesk.manga.model.dataclass.SourceDataClass
+import suwayomi.tachidesk.manga.model.dataclass.ContentWarning
 import suwayomi.tachidesk.manga.model.table.ExtensionTable
 import suwayomi.tachidesk.manga.model.table.SourceTable
 import java.util.concurrent.CompletableFuture
@@ -41,35 +42,29 @@ class SourceType(
    val id: Long,
    val name: String,
    val lang: String,
+    val contentWarning: ContentWarning,
    val iconUrl: String,
    val supportsLatest: Boolean,
    val isConfigurable: Boolean,
+    @GraphQLDeprecated("", ReplaceWith("contentWarning"))
    val isNsfw: Boolean,
    val displayName: String,
+    val homeUrl: String?,
+    @GraphQLDeprecated("", ReplaceWith("homeUrl"))
    val baseUrl: String?,
 ) : Node {
-    constructor(source: SourceDataClass) : this(
-        id = source.id.toLong(),
-        name = source.name,
-        lang = source.lang,
-        iconUrl = source.iconUrl,
-        supportsLatest = source.supportsLatest,
-        isConfigurable = source.isConfigurable,
-        isNsfw = source.isNsfw,
-        displayName = source.displayName,
-        baseUrl = source.baseUrl,
-    )
-
    constructor(row: ResultRow, sourceExtension: ResultRow, catalogueSource: CatalogueSource) : this(
        id = row[SourceTable.id].value,
        name = row[SourceTable.name],
        lang = row[SourceTable.lang],
-        iconUrl = Extension.getExtensionIconUrl(sourceExtension[ExtensionTable.apkName]),
+        contentWarning = ContentWarning.valueOf(row[SourceTable.contentWarning]),
+        iconUrl = Extension.proxyExtensionIconUrl(sourceExtension[ExtensionTable.pkgName]),
        supportsLatest = catalogueSource.supportsLatest,
        isConfigurable = catalogueSource is ConfigurableSource,
-        isNsfw = row[SourceTable.isNsfw],
+        isNsfw = row[SourceTable.contentWarning] >= ContentWarning.MIXED.ordinal,
        displayName = catalogueSource.toString(),
-        baseUrl = catalogueSource.runCatching { (catalogueSource as? HttpSource)?.baseUrl }.getOrNull(),
+        homeUrl = runCatching { (catalogueSource as? HttpSource)?.getHomeUrl() }.getOrNull(),
+        baseUrl = runCatching { (catalogueSource as? HttpSource)?.baseUrl }.getOrNull(),
    )

    fun manga(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<MangaNodeList> =