Fix chapters not loading in AS (closes #11950). (#12116)

src/pt/argosscan/build.gradle

@@ -6,7 +6,7 @@ ext {
     extName = 'Argos Scan'
     pkgNameSuffix = 'pt.argosscan'
     extClass = '.ArgosScan'
-    extVersionCode = 21
+    extVersionCode = 22
 }
 
 apply from: "$rootDir/common.gradle"

src/pt/argosscan/src/eu/kanade/tachiyomi/extension/pt/argosscan/ArgosScan.kt

@@ -50,7 +50,7 @@ class ArgosScan : HttpSource(), ConfigurableSource {
 
     override val lang = "pt-BR"
 
-    override val supportsLatest = true
+    override val supportsLatest = false
 
     override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .addInterceptor(::loginIntercept)
@@ -71,7 +71,11 @@ class ArgosScan : HttpSource(), ConfigurableSource {
     private fun genericMangaFromObject(project: ArgosProjectDto): SManga = SManga.create().apply {
         title = project.name!!
         url = "/obras/${project.id}"
-        thumbnail_url = "$baseUrl/images/${project.id}/${project.cover!!}"
+        thumbnail_url = if (project.cover!! == "default.jpg") {
+            "$baseUrl/img/default.jpg"
+        } else {
+            "$baseUrl/images/${project.id}/${project.cover}"
+        }
     }
 
     override fun popularMangaRequest(page: Int): Request {
@@ -104,20 +108,9 @@ class ArgosScan : HttpSource(), ConfigurableSource {
         return MangasPage(mangaList, hasNextPage)
     }
 
-    override fun latestUpdatesRequest(page: Int): Request {
+    override fun latestUpdatesRequest(page: Int): Request = throw UnsupportedOperationException()
-        val payload = buildLatestQueryPayload(page)
 
-        val body = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
+    override fun latestUpdatesParse(response: Response): MangasPage = throw UnsupportedOperationException()
-
-        val newHeaders = headersBuilder()
-            .add("Content-Length", body.contentLength().toString())
-            .add("Content-Type", body.contentType().toString())
-            .build()
-
-        return POST(GRAPHQL_URL, newHeaders, body)
-    }
-
-    override fun latestUpdatesParse(response: Response): MangasPage = popularMangaParse(response)
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         val payload = buildSearchQueryPayload(query, page)
@@ -168,7 +161,11 @@ class ArgosScan : HttpSource(), ConfigurableSource {
         val project = result.data["project"]!!
 
         title = project.name!!
-        thumbnail_url = "$baseUrl/images/${project.id}/${project.cover!!}"
+        thumbnail_url = if (project.cover!! == "default.jpg") {
+            "$baseUrl/img/default.jpg"
+        } else {
+            "$baseUrl/images/${project.id}/${project.cover}"
+        }
         description = project.description.orEmpty()
         author = project.authors.orEmpty().joinToString()
         status = SManga.ONGOING
@@ -196,6 +193,10 @@ class ArgosScan : HttpSource(), ConfigurableSource {
     }
 
     override fun pageListRequest(chapter: SChapter): Request {
+        if (chapter.url.removePrefix("/leitor/").toIntOrNull() != null) {
+            throw Exception(REFRESH_WARNING)
+        }
+
         val chapterId = chapter.url.substringAfter("leitor/")
 
         val payload = buildPagesQueryPayload(chapterId)
@@ -369,6 +370,7 @@ class ArgosScan : HttpSource(), ConfigurableSource {
 
         private const val CLOUDFLARE_ERROR = "Falha ao contornar o Cloudflare."
         private const val REQUEST_ERROR = "Erro na requisição. Tente novamente mais tarde."
+        private const val REFRESH_WARNING = "Atualize a lista de capítulos para atualizar os IDs."
 
         private val JSON_MEDIA_TYPE = "application/json; charset=utf-8".toMediaTypeOrNull()
 

src/pt/argosscan/src/eu/kanade/tachiyomi/extension/pt/argosscan/ArgosScanDto.kt

@@ -34,7 +34,7 @@ data class ArgosProjectDto(
 @Serializable
 data class ArgosChapterDto(
     val createAt: String? = "",
-    val id: Int = 0,
+    val id: String = "",
     val images: List<String>? = emptyList(),
     val number: Int? = 0,
     val project: ArgosProjectDto? = null,

src/pt/argosscan/src/eu/kanade/tachiyomi/extension/pt/argosscan/ArgosScanQueries.kt

@@ -93,39 +93,6 @@ fun buildPopularQueryPayload(page: Int) = buildJsonObject {
     }
 }
 
-fun buildLatestQueryPayload(page: Int) = buildJsonObject {
-    put("operationName", "getProjects")
-    put("query", POPULAR_QUERY)
-    putJsonObject("variables") {
-        putJsonObject("filters") {
-            putJsonObject("childExpressions") {
-                putJsonObject("filters") {
-                    put("field", "Chapter.id")
-                    put("op", "GE")
-                    put("relationField", "Project.chapters")
-                    putJsonArray("values") {
-                        add("1")
-                    }
-                }
-                put("operator", "AND")
-            }
-            put("operator", "AND")
-        }
-        putJsonObject("orders") {
-            putJsonArray("orders") {
-                addJsonObject {
-                    put("field", "Chapter.createAt")
-                    put("or", "DESC")
-                }
-            }
-        }
-        putJsonObject("pagination") {
-            put("limit", 12)
-            put("page", page)
-        }
-    }
-}
-
 fun buildSearchQueryPayload(query: String, page: Int) = buildJsonObject {
     put("operationName", "getProjects")
     put("query", POPULAR_QUERY)