temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-03 19:04:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix latest Mihon Extension Lib

Browse Source
This commit is contained in:
Syer10
2026-06-26 11:03:33 -04:00
parent 4ace76f508
commit eec0951a75
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/github/NetworkExtensionStore.kt
View File

@@ -45,7 +45,8 @@ data class NetworkExtensionStore(
@ProtoNumber(4) val extensionLib: String, @ProtoNumber(4) val extensionLib: String,
@ProtoNumber(5) val versionCode: Long, @ProtoNumber(5) val versionCode: Long,
@ProtoNumber(6) val versionName: String, @ProtoNumber(6) val versionName: String,
@ProtoNumber(7) val sources: List<Source>, @ProtoNumber(7) val contentWarning: ContentWarning,
@ProtoNumber(8) val sources: List<Source>,
) )
@Serializable @Serializable
@@ -61,25 +62,30 @@ data class NetworkExtensionStore(
@ProtoNumber(3) val language: String, @ProtoNumber(3) val language: String,
@ProtoNumber(4) val homeUrl: String = "", @ProtoNumber(4) val homeUrl: String = "",
@ProtoNumber(5) val mirrorUrls: List<String> = emptyList(), @ProtoNumber(5) val mirrorUrls: List<String> = emptyList(),
@ProtoNumber(6) val contentWarning: ContentWarning = ContentWarning.SAFE, // @ProtoNumber(6) val contentWarning: ContentWarning = ContentWarning.SAFE,
@ProtoNumber(7) val message: String? = null, @ProtoNumber(7) val message: String? = null,
) )
@Serializable @Serializable
enum class ContentWarning { enum class ContentWarning {
@ProtoNumber(0) @ProtoNumber(0)
@JsonNames("CONTENT_WARNING_UNSPECIFIED")
UNSPECIFIED,
@ProtoNumber(1)
@JsonNames("CONTENT_WARNING_SAFE") @JsonNames("CONTENT_WARNING_SAFE")
SAFE, SAFE,
@ProtoNumber(1) @ProtoNumber(2)
@JsonNames("CONTENT_WARNING_MIXED") @JsonNames("CONTENT_WARNING_MIXED")
MIXED, MIXED,
@ProtoNumber(2) @ProtoNumber(3)
@JsonNames("CONTENT_WARNING_NSFW") @JsonNames("CONTENT_WARNING_NSFW")
NSFW, NSFW,
} }
override fun toExtensionStore(indexUrl: String): ExtensionStore = override fun toExtensionStore(indexUrl: String): ExtensionStore =
ExtensionStore( ExtensionStore(
indexUrl = indexUrl, indexUrl = indexUrl,
@@ -110,11 +116,10 @@ fun NetworkExtensionStore.ExtensionList.toExtensionInfos(store: ExtensionStore):
versionName = extension.versionName, versionName = extension.versionName,
lang = if (lang.size == 1) lang.first() else "all", lang = if (lang.size == 1) lang.first() else "all",
contentWarning = contentWarning =
when (extension.sources.maxOfOrNull { it.contentWarning }) { when (extension.contentWarning) {
NetworkExtensionStore.ContentWarning.SAFE -> ContentWarning.SAFE NetworkExtensionStore.ContentWarning.SAFE, NetworkExtensionStore.ContentWarning.UNSPECIFIED -> ContentWarning.SAFE
NetworkExtensionStore.ContentWarning.MIXED -> ContentWarning.MIXED NetworkExtensionStore.ContentWarning.MIXED -> ContentWarning.MIXED
NetworkExtensionStore.ContentWarning.NSFW -> ContentWarning.NSFW NetworkExtensionStore.ContentWarning.NSFW -> ContentWarning.NSFW
null -> ContentWarning.SAFE
}, },
sources = sources =
extension.sources.map { source -> extension.sources.map { source ->
@@ -125,8 +130,8 @@ fun NetworkExtensionStore.ExtensionList.toExtensionInfos(store: ExtensionStore):
homeUrl = source.homeUrl, homeUrl = source.homeUrl,
message = source.message, message = source.message,
contentWarning = contentWarning =
when (source.contentWarning) { when (extension.contentWarning) { // todo source.contentWarning
NetworkExtensionStore.ContentWarning.SAFE -> ContentWarning.SAFE NetworkExtensionStore.ContentWarning.SAFE, NetworkExtensionStore.ContentWarning.UNSPECIFIED -> ContentWarning.SAFE
NetworkExtensionStore.ContentWarning.MIXED -> ContentWarning.MIXED NetworkExtensionStore.ContentWarning.MIXED -> ContentWarning.MIXED
NetworkExtensionStore.ContentWarning.NSFW -> ContentWarning.NSFW NetworkExtensionStore.ContentWarning.NSFW -> ContentWarning.NSFW
}, },