From bbf5ee19df1ba1c8cd733a777ce8ff3fc73a69d1 Mon Sep 17 00:00:00 2001
From: Johannes Joens <34899572+jopejoe1@users.noreply.github.com>
Date: Fri, 21 May 2021 01:15:26 +1200
Subject: [PATCH] Bato.to: Search Fix for #7120 (#7124)
* Update build.gradle
* Update BatoTo.kt
---
src/all/batoto/build.gradle | 2 +-
.../tachiyomi/extension/all/batoto/BatoTo.kt | 17 ++++-------------
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/all/batoto/build.gradle b/src/all/batoto/build.gradle
index 0dc98db63..00eb2952d 100644
--- a/src/all/batoto/build.gradle
+++ b/src/all/batoto/build.gradle
@@ -5,7 +5,7 @@ ext {
extName = 'Bato.to'
pkgNameSuffix = 'all.batoto'
extClass = '.BatoToFactory'
- extVersionCode = 10
+ extVersionCode = 11
libVersion = '1.2'
containsNsfw = true
}
diff --git a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
index ac1f3468e..694e39ad7 100644
--- a/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
+++ b/src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
@@ -76,25 +76,18 @@ open class BatoTo(
return when {
query.startsWith("ID:") -> {
val id = query.substringAfter("ID:")
- client.newCall(GET("https://bato.to/series/$id", headers)).asObservableSuccess()
+ client.newCall(GET("$baseUrl/series/$id", headers)).asObservableSuccess()
.map { response ->
queryIDParse(response, id)
}
}
query.isNotBlank() -> {
- val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder()
- val letterFilter = filters.findInstance<LetterFilter>()!!
- url.addQueryParameter("word", query)
- url.addQueryParameter("page", "$page")
- if (letterFilter.state){
- url.addQueryParameter("mode", "letter")
- }
- client.newCall(GET(url.build().toString(), headers)).asObservableSuccess()
+ val url = "$baseUrl/search?word=$query&page=$page"
+ client.newCall(GET(url, headers)).asObservableSuccess()
.map { response ->
queryParse(response)
}
}
-
else -> {
val sortFilter = filters.findInstance<SortFilter>()!!
val reverseSortFilter = filters.findInstance<ReverseSortFilter>()!!
@@ -353,7 +346,7 @@ open class BatoTo(
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
override fun getFilterList() = FilterList(
- LetterFilter(),
+ //LetterFilter(),
Filter.Header("NOTE: Ignored if using text search!"),
Filter.Separator(),
SortFilter(getSortFilter(), 5),
@@ -747,6 +740,4 @@ open class BatoTo(
).filterNot { it.value == siteLang }
private inline fun <reified T> Iterable<*>.findInstance() = find { it is T } as? T
- // Old Filters
-
}