From 0121ced4efc1405101d3e7ee8921eda632189afb Mon Sep 17 00:00:00 2001
From: Ejan <35057681+e-shl@users.noreply.github.com>
Date: Fri, 10 Jun 2022 22:23:19 +0500
Subject: [PATCH] [RU]ComX fix pages (#12146)

* [RU]ComX fix pages

* popularMangaRequest is searchMangaRequest

* pageParameter
---
 src/ru/comx/build.gradle                      |  2 +-
 .../tachiyomi/extension/ru/comx/ComX.kt       | 22 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/ru/comx/build.gradle b/src/ru/comx/build.gradle
index c460c185f..246693069 100644
--- a/src/ru/comx/build.gradle
+++ b/src/ru/comx/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Com-X'
     pkgNameSuffix = 'ru.comx'
     extClass = '.ComX'
-    extVersionCode = 18
+    extVersionCode = 19
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
index 55ffa1105..5179c2354 100644
--- a/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
+++ b/src/ru/comx/src/eu/kanade/tachiyomi/extension/ru/comx/ComX.kt
@@ -54,18 +54,7 @@ class ComX : ParsedHttpSource() {
         .add("Referer", baseUrl)
 
     // Popular
-    override fun popularMangaRequest(page: Int): Request {
-        return POST(
-            "$baseUrl/comix-read/page/$page/",
-            body = FormBody.Builder()
-                .add("dlenewssortby", "rating")
-                .add("dledirection", "desc")
-                .add("set_new_sort", "dle_sort_cat_1")
-                .add("set_direction_sort", "dle_direction_cat_1")
-                .build(),
-            headers = headers
-        )
-    }
+    override fun popularMangaRequest(page: Int): Request = searchMangaRequest(page, "", getFilterList())
 
     override fun popularMangaParse(response: Response): MangasPage {
         val document = response.asJsoup()
@@ -73,7 +62,8 @@ class ComX : ParsedHttpSource() {
         val mangas = document.select(popularMangaSelector()).map { element ->
             popularMangaFromElement(element)
         }
-        return MangasPage(mangas, mangas.size == 50)
+
+        return MangasPage(mangas, mangas.isNotEmpty())
     }
 
     override fun popularMangaSelector() = "div.short"
@@ -99,7 +89,7 @@ class ComX : ParsedHttpSource() {
         val mangas = document.select(latestUpdatesSelector()).map { element ->
             latestUpdatesFromElement(element)
         }
-        return MangasPage(mangas, mangas.size == 24)
+        return MangasPage(mangas, mangas.isNotEmpty())
     }
 
     override fun latestUpdatesSelector() = "ul#content-load li.latest"
@@ -163,9 +153,9 @@ class ComX : ParsedHttpSource() {
                 }
             }
         }
-
+        val pageParameter = if (page > 1) "page/$page/" else ""
         return POST(
-            "$baseUrl/ComicList/p.cat=${sectionPub.joinToString(",")}/g=${mutableGenre.joinToString(",")}/t=${mutableType.joinToString(",")}/adult=${mutableAge.joinToString(",")}/",
+            "$baseUrl/ComicList/p.cat=${sectionPub.joinToString(",")}/g=${mutableGenre.joinToString(",")}/t=${mutableType.joinToString(",")}/adult=${mutableAge.joinToString(",")}/$pageParameter",
             body = FormBody.Builder()
                 .add("dlenewssortby", orderBy)
                 .add("dledirection", ascEnd)