From 303b789fff159f264273fd646c8963f4d61216a6 Mon Sep 17 00:00:00 2001
From: zhongfly <11155705+zhongfly@users.noreply.github.com>
Date: Wed, 2 Apr 2025 21:49:26 +0800
Subject: [PATCH] zaimanhua: fix search and detail (#8323)

---
 src/zh/zaimanhua/build.gradle                         |  2 +-
 .../tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt     |  4 ++--
 .../tachiyomi/extension/zh/zaimanhua/ZaimanhuaDto.kt  | 11 ++++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/zh/zaimanhua/build.gradle b/src/zh/zaimanhua/build.gradle
index 029023b6e..e8b20e5a3 100644
--- a/src/zh/zaimanhua/build.gradle
+++ b/src/zh/zaimanhua/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Zaimanhua'
     extClass = '.Zaimanhua'
-    extVersionCode = 7
+    extVersionCode = 8
     isNsfw = false
 }
 
diff --git a/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt b/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt
index 66d151d0b..5e7e62d5b 100644
--- a/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt
+++ b/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt
@@ -103,7 +103,7 @@ class Zaimanhua : HttpSource(), ConfigurableSource {
                 "$accountApiUrl/userInfo/get",
                 headersBuilder().setToken(token).build(),
             ),
-        ).execute().parseAs<ResponseDto<UserDto>>()
+        ).execute().parseAs<SimpleResponseDto>()
         return response.errno == 0
     }
 
@@ -127,7 +127,7 @@ class Zaimanhua : HttpSource(), ConfigurableSource {
     // Detail
     // path: "/comic/detail/mangaId"
     override fun mangaDetailsRequest(manga: SManga): Request =
-        GET("$apiUrl/comic/detail/${manga.url}", apiHeaders)
+        GET("$apiUrl/comic/detail/${manga.url}?channel=android", apiHeaders)
 
     override fun mangaDetailsParse(response: Response): SManga {
         val result = response.parseAs<ResponseDto<DataWrapperDto<MangaDto>>>()
diff --git a/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/ZaimanhuaDto.kt b/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/ZaimanhuaDto.kt
index 5471a8026..a7f334843 100644
--- a/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/ZaimanhuaDto.kt
+++ b/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/ZaimanhuaDto.kt
@@ -112,8 +112,9 @@ class PageDto(
 
 @Serializable
 class PageItemDto(
-    @JsonNames("comic_id")
-    private val id: Int,
+    private val id: Int = 0,
+    @SerialName("comic_id")
+    private val comicId: Int = 0,
     private val title: String,
     private val authors: String = "",
     private val status: String,
@@ -121,7 +122,11 @@ class PageItemDto(
     private val types: String,
 ) {
     fun toSManga() = SManga.create().apply {
-        url = this@PageItemDto.id.toString()
+        url = if (this@PageItemDto.id != 0) {
+            this@PageItemDto.id.toString()
+        } else {
+            this@PageItemDto.comicId.toString()
+        }
         title = this@PageItemDto.title
         author = authors.formatList()
         genre = types.formatList()