Update exposed to v1.3.0

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -143,11 +143,13 @@ body:
       options:
         - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open or closed issue.
           required: true
+        - label: I have checked the ongoing preview changelog of **[Suwayomi-WebUI](https://github.com/Suwayomi/Suwayomi-WebUI/blob/master/CHANGELOG.md)** and **[Suwayomi-Server](https://github.com/Suwayomi/Suwayomi-Server/blob/master/CHANGELOG.md)** and this bug has **NOT** been listed as fixed
+          required: true
         - label: I have written a short but informative title (ideally less than ~100 characters).
           required: true
         - label: I have tried the troubleshooting guide described in [README.md](https://github.com/Suwayomi/Suwayomi-Server?tab=readme-ov-file#troubleshooting-and-support)
           required: true
-        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
+        - label: I have updated the (**[Suwayomi-WebUI](https://github.com/suwayomi/suwayomi-webui/releases/latest)** and **[Suwayomi-Server](https://github.com/suwayomi/suwayomi-server/releases/latest)**) to the latest versions
           required: true
         - label: I have filled out all of the requested information in this form, including specific version numbers.
           required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -31,7 +31,7 @@ body:
           required: true
         - label: I have written a short but informative title (ideally less than ~100 characters).
           required: true
-        - label: I have updated to the **[latest version](https://github.com/suwayomi/suwayomi-server/releases/latest)**.
+        - label: I have updated the (**[Suwayomi-WebUI](https://github.com/suwayomi/suwayomi-webui/releases/latest)** and **[Suwayomi-Server](https://github.com/suwayomi/suwayomi-server/releases/latest)**) to the latest versions
           required: true
         - label: I have filled out all of the requested information in this form, including specific version numbers.
           required: true

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ okhttp = "5.4.0" # Major version is locked by Tachiyomi extensions
 javalin = "7.2.2"
 jte = "3.2.4"
 jackson = "3.2.0" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
-exposed = "1.2.0"
+exposed = "1.3.0"
 dex2jar = "2.4.37"
 polyglot = "25.0.3"
 settings = "1.3.0"

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

@@ -21,26 +21,6 @@ class ExtensionStoreDataLoader : KotlinDataLoader<String, ExtensionStoreType> {
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionStoreType> =
         DataLoaderFactory.newDataLoader { ids ->
-            future {
-                transaction {
-                    addLogger(Slf4jSqlDebugLogger)
-                    val manga =
-                        ExtensionStoreTable
-                            .selectAll()
-                            .where { ExtensionStoreTable.indexUrl inList ids }
-                            .map { ExtensionStoreType(it) }
-                            .associateBy { it.indexUrl }
-                    ids.map { manga[it] }
-                }
-            }
-        }
-}
-
-class ExtensionStoreForExtension : KotlinDataLoader<String, ExtensionStoreType> {
-    override val dataLoaderName = "ExtensionStoreForExtension"
-
-    override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionStoreType> =
-        DataLoaderFactory.newDataLoader<String, ExtensionStoreType> { ids ->
             future {
                 transaction {
                     addLogger(Slf4jSqlDebugLogger)
@@ -50,14 +30,14 @@ class ExtensionStoreForExtension : KotlinDataLoader<String, ExtensionStoreType>
                             .where { ExtensionStoreTable.indexUrl inList ids }
                             .map { ExtensionStoreType(it) }
                             .associateBy { it.indexUrl }
-                    ids.map { (extensionStoreByIndexUrl[it]) }
+                    ids.map { extensionStoreByIndexUrl[it] }
                 }
             }
         }
 }
 
-class ExtensionForExtensionStore : KotlinDataLoader<String, ExtensionNodeList> {
-    override val dataLoaderName = "ExtensionForExtensionStore"
+class ExtensionsForExtensionStore : KotlinDataLoader<String, ExtensionNodeList> {
+    override val dataLoaderName = "ExtensionsForExtensionStore"
 
     override fun getDataLoader(graphQLContext: GraphQLContext): DataLoader<String, ExtensionNodeList> =
         DataLoaderFactory.newDataLoader<String, ExtensionNodeList> { ids ->

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

@@ -20,10 +20,9 @@ import suwayomi.tachidesk.graphql.dataLoaders.DisplayScoreForTrackRecordDataLoad
 import suwayomi.tachidesk.graphql.dataLoaders.DisplayScoreForTrackSearchDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.DownloadedChapterCountForMangaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ExtensionForExtensionStore
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionForSourceDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.ExtensionStoreDataLoader
-import suwayomi.tachidesk.graphql.dataLoaders.ExtensionStoreForExtension
+import suwayomi.tachidesk.graphql.dataLoaders.ExtensionsForExtensionStore
 import suwayomi.tachidesk.graphql.dataLoaders.FirstUnreadChapterForMangaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.GlobalMetaDataLoader
 import suwayomi.tachidesk.graphql.dataLoaders.HasDuplicateChaptersForMangaDataLoader
@@ -81,9 +80,8 @@ class TachideskDataLoaderRegistryFactory {
                 SourceMetaDataLoader(),
                 ExtensionDataLoader(),
                 ExtensionForSourceDataLoader(),
-                ExtensionForExtensionStore(),
+                ExtensionsForExtensionStore(),
                 ExtensionStoreDataLoader(),
-                ExtensionStoreForExtension(),
                 TrackerDataLoader(),
                 TrackerStatusesDataLoader(),
                 TrackerScoresDataLoader(),

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

@@ -40,7 +40,7 @@ class ExtensionStoreType(
     )
 
     fun extensions(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionNodeList> =
-        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionNodeList>("ExtensionForExtensionStore", indexUrl)
+        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionNodeList>("ExtensionsForExtensionStore", indexUrl)
 }
 
 data class ExtensionStoreNodeList(

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

@@ -72,7 +72,7 @@ class ExtensionType(
         dataFetchingEnvironment.getValueFromDataLoader<String, SourceNodeList>("SourcesForExtensionDataLoader", pkgName)
 
     fun extensionStore(dataFetchingEnvironment: DataFetchingEnvironment): CompletableFuture<ExtensionStoreType> =
-        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionStoreType>("ExtensionStoreForExtension", storeIndexUrl.orEmpty())
+        dataFetchingEnvironment.getValueFromDataLoader<String, ExtensionStoreType>("ExtensionStoreDataLoader", storeIndexUrl.orEmpty())
 }
 
 data class ExtensionNodeList(

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

@@ -10,7 +10,7 @@ package suwayomi.tachidesk.manga.model.table
 import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
 
 object ExtensionStoreTable : IntIdTable() {
-    val indexUrl = varchar("index_url", 2048)
+    val indexUrl = varchar("index_url", 2048).uniqueIndex()
     val name = varchar("name", 256)
     val badgeLabel = varchar("badge_label", 32)
     val signingKey = varchar("signing_key", 512)

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

@@ -11,7 +11,7 @@ import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
 
 object ExtensionTable : IntIdTable() {
     val apkName = varchar("apk_name", 1024).nullable()
-    val storeIndexUrl = varchar("store_index_url", 2048).nullable()
+    val storeIndexUrl = varchar("store_index_url", 2048).nullable().index()
 
     // default is the local source icon from tachiyomi
     @Suppress("ktlint:standard:max-line-length")

server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0057_AddNewExtensionApiFields.kt

@@ -34,6 +34,7 @@ class M0057_AddNewExtensionApiFields : SQLMigration() {
             }
         }
         ALTER TABLE EXTENSION ALTER COLUMN store_index_url ${MAYBE_TYPE_PREFIX}VARCHAR(2048);
+        CREATE INDEX extension_store_index_url ON EXTENSION (store_index_url);
         ALTER TABLE EXTENSION ALTER COLUMN version_code ${MAYBE_TYPE_PREFIX}BIGINT;
         ALTER TABLE EXTENSION ALTER COLUMN apk_name DROP NOT NULL;
         ${

server/src/main/kotlin/suwayomi/tachidesk/server/database/migration/M0058_AddExtensionStore.kt

@@ -14,7 +14,7 @@ import org.jetbrains.exposed.v1.core.dao.id.IntIdTable
 @Suppress("ClassName", "unused")
 class M0058_AddExtensionStore : AddTableMigration() {
     private class ExtensionStoreTable : IntIdTable() {
-        val indexUrl = varchar("index_url", 2048)
+        val indexUrl = varchar("index_url", 2048).uniqueIndex()
         val name = varchar("name", 256)
         val badgeLabel = varchar("badge_label", 32)
         val signingKey = varchar("signing_key", 512)