diff --git a/multisrc/overrides/grouple/allhentai/src/AllHentai.kt b/multisrc/overrides/grouple/allhentai/src/AllHentai.kt index 4084b14f1..399fb7822 100644 --- a/multisrc/overrides/grouple/allhentai/src/AllHentai.kt +++ b/multisrc/overrides/grouple/allhentai/src/AllHentai.kt @@ -12,7 +12,7 @@ class AllHentai : GroupLe("AllHentai", "http://23.allhen.online", "ru") { override val id: Long = 1809051393403180443 override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseUrl/search/advanced?offset=${70 * (page - 1)}".toHttpUrlOrNull()!!.newBuilder() + val url = super.searchMangaRequest(page, query, filters).url.newBuilder() (if (filters.isEmpty()) getFilterList() else filters).forEach { filter -> when (filter) { is GenreList -> filter.state.forEach { genre -> @@ -47,9 +47,6 @@ class AllHentai : GroupLe("AllHentai", "http://23.allhen.online", "ru") { else -> return@forEach } } - if (query.isNotEmpty()) { - url.addQueryParameter("q", query) - } return if (url.toString().contains("&")) GET(url.toString().replace("=%3D", "="), headers) else popularMangaRequest(page) diff --git a/multisrc/overrides/grouple/mintmanga/src/MintManga.kt b/multisrc/overrides/grouple/mintmanga/src/MintManga.kt index 1c6eff68e..8d3948e37 100644 --- a/multisrc/overrides/grouple/mintmanga/src/MintManga.kt +++ b/multisrc/overrides/grouple/mintmanga/src/MintManga.kt @@ -12,10 +12,7 @@ class MintManga : GroupLe("MintManga", "https://mintmanga.live", "ru") { override val id: Long = 6 override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseUrl/search/advanced?offset=${70 * (page - 1)}".toHttpUrlOrNull()!!.newBuilder() - if (query.isNotEmpty()) { - url.addQueryParameter("q", query) - } + val url = super.searchMangaRequest(page, query, filters).url.newBuilder() (if (filters.isEmpty()) getFilterList().reversed() else filters.reversed()).forEach { filter -> when (filter) { is GenreList -> filter.state.forEach { genre -> @@ -113,9 +110,10 @@ class MintManga : GroupLe("MintManga", "https://mintmanga.live", "ru") { Genre("Арт", "el_2220"), Genre("Ёнкома", "el_2741"), Genre("Комикс", "el_1903"), + Genre("Манга", "el_6421"), Genre("Манхва", "el_1873"), Genre("Маньхуа", "el_1875"), - Genre("Ранобэ", "el_5688"), + Genre("Ранобэ", "el_5688") ) private fun getGenreList() = listOf( diff --git a/multisrc/overrides/grouple/readmanga/src/ReadManga.kt b/multisrc/overrides/grouple/readmanga/src/ReadManga.kt index c2ca15673..24c05e7a1 100644 --- a/multisrc/overrides/grouple/readmanga/src/ReadManga.kt +++ b/multisrc/overrides/grouple/readmanga/src/ReadManga.kt @@ -12,10 +12,7 @@ class ReadManga : GroupLe("ReadManga", "https://readmanga.live", "ru") { override val id: Long = 5 override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseUrl/search/advanced?offset=${70 * (page - 1)}".toHttpUrlOrNull()!!.newBuilder() - if (query.isNotEmpty()) { - url.addQueryParameter("q", query) - } + val url = super.searchMangaRequest(page, query, filters).url.newBuilder() (if (filters.isEmpty()) getFilterList().reversed() else filters.reversed()).forEach { filter -> when (filter) { is GenreList -> filter.state.forEach { genre -> @@ -113,9 +110,9 @@ class ReadManga : GroupLe("ReadManga", "https://readmanga.live", "ru") { Genre("Арт", "el_5685"), Genre("Ёнкома", "el_2161"), Genre("Комикс", "el_3515"), + Genre("Манга", "el_9451"), Genre("Манхва", "el_3001"), - Genre("Маньхуа", "el_3002"), - Genre("Ранобэ", "el_8575"), + Genre("Маньхуа", "el_3002") ) private fun getGenreList() = listOf( diff --git a/multisrc/overrides/grouple/rumix/src/RuMIX.kt b/multisrc/overrides/grouple/rumix/src/RuMIX.kt index a5bcac89f..f8077bb67 100644 --- a/multisrc/overrides/grouple/rumix/src/RuMIX.kt +++ b/multisrc/overrides/grouple/rumix/src/RuMIX.kt @@ -10,10 +10,7 @@ import okhttp3.Request class RuMIX : GroupLe("RuMIX", "https://rumix.me", "ru") { override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseUrl/search/advanced?offset=${70 * (page - 1)}".toHttpUrlOrNull()!!.newBuilder() - if (query.isNotEmpty()) { - url.addQueryParameter("q", query) - } + val url = super.searchMangaRequest(page, query, filters).url.newBuilder() (if (filters.isEmpty()) getFilterList().reversed() else filters.reversed()).forEach { filter -> when (filter) { is OrderBy -> { diff --git a/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt b/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt index b9978f87a..218b6aa8a 100644 --- a/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt +++ b/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt @@ -12,10 +12,7 @@ class SelfManga : GroupLe("SelfManga", "https://selfmanga.live", "ru") { override val id: Long = 5227602742162454547 override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val url = "$baseUrl/search/advanced?offset=${70 * (page - 1)}".toHttpUrlOrNull()!!.newBuilder() - if (query.isNotEmpty()) { - url.addQueryParameter("q", query) - } + val url = super.searchMangaRequest(page, query, filters).url.newBuilder() (if (filters.isEmpty()) getFilterList().reversed() else filters.reversed()).forEach { filter -> when (filter) { is GenreList -> filter.state.forEach { genre -> diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt index 5ebe74e19..190f41b6f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt @@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Headers +import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -92,6 +93,14 @@ abstract class GroupLe( override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + val url = "$baseUrl/search/advanced?offset=${50 * (page - 1)}".toHttpUrlOrNull()!!.newBuilder() + if (query.isNotEmpty()) { + url.addQueryParameter("q", query) + } + return GET(url.toString().replace("=%3D", "="), headers) + } + override fun mangaDetailsParse(document: Document): SManga { val infoElement = document.select(".expandable").first() val rawCategory = infoElement.select("span.elem_category").text() diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt index 91686bf85..cccc3a440 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt @@ -9,7 +9,7 @@ class GroupLeGenerator : ThemeSourceGenerator { override val themeClass = "GroupLe" - override val baseVersionCode: Int = 6 + override val baseVersionCode: Int = 7 override val sources = listOf( SingleLang("ReadManga", "https://readmanga.live", "ru", overrideVersionCode = 46),