diff --git a/lib-multisrc/galleryadults/build.gradle.kts b/lib-multisrc/galleryadults/build.gradle.kts index dc076cc37..9dce2478c 100644 --- a/lib-multisrc/galleryadults/build.gradle.kts +++ b/lib-multisrc/galleryadults/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 1 +baseVersionCode = 2 diff --git a/lib-multisrc/galleryadults/src/eu/kanade/tachiyomi/multisrc/galleryadults/GalleryAdults.kt b/lib-multisrc/galleryadults/src/eu/kanade/tachiyomi/multisrc/galleryadults/GalleryAdults.kt index aac2d82d2..f8c213528 100644 --- a/lib-multisrc/galleryadults/src/eu/kanade/tachiyomi/multisrc/galleryadults/GalleryAdults.kt +++ b/lib-multisrc/galleryadults/src/eu/kanade/tachiyomi/multisrc/galleryadults/GalleryAdults.kt @@ -294,7 +294,7 @@ abstract class GalleryAdults( val categoryFilters = filters.filterIsInstance().firstOrNull() // Only for query string or multiple tags - val url = "$baseUrl/search".toHttpUrl().newBuilder().apply { + val url = "$baseUrl/search/".toHttpUrl().newBuilder().apply { getSortOrderURIs().forEachIndexed { index, pair -> addQueryParameter(pair.second, toBinary(sortOrderFilter?.state == index)) } @@ -310,7 +310,7 @@ abstract class GalleryAdults( addEncodedQueryParameter(intermediateSearchKey, buildQueryString(selectedGenres.map { it.name }, query)) addPageUri(page) } - return GET(url.build()) + return GET(url.build(), headers) } protected open val advancedSearchKey = "key" @@ -331,7 +331,7 @@ abstract class GalleryAdults( // Advanced search val advancedSearchFilters = filters.filterIsInstance() - val url = "$baseUrl/$advancedSearchUri".toHttpUrl().newBuilder().apply { + val url = "$baseUrl/$advancedSearchUri/".toHttpUrl().newBuilder().apply { getSortOrderURIs().forEachIndexed { index, pair -> addQueryParameter(pair.second, toBinary(sortOrderFilter?.state == index)) } @@ -379,7 +379,7 @@ abstract class GalleryAdults( addEncodedQueryParameter(advancedSearchKey, keys.joinToString("+")) addPageUri(page) } - return GET(url.build()) + return GET(url.build(), headers) } /** diff --git a/src/all/asmhentai/src/eu/kanade/tachiyomi/extension/all/asmhentai/AsmHentai.kt b/src/all/asmhentai/src/eu/kanade/tachiyomi/extension/all/asmhentai/AsmHentai.kt index eda853b73..23619b78a 100644 --- a/src/all/asmhentai/src/eu/kanade/tachiyomi/extension/all/asmhentai/AsmHentai.kt +++ b/src/all/asmhentai/src/eu/kanade/tachiyomi/extension/all/asmhentai/AsmHentai.kt @@ -18,6 +18,15 @@ class AsmHentai( lang = lang, ) { override val supportsLatest = mangaLang.isNotBlank() + override val supportSpeechless: Boolean = true + + override fun Element.mangaLang() = + select("a:has(.flag)").attr("href") + .removeSuffix("/").substringAfterLast("/") + .let { + // Include Speechless in search results + if (it == LANGUAGE_SPEECHLESS) mangaLang else it + } override fun Element.mangaUrl() = selectFirst(".image a")?.attr("abs:href") @@ -25,10 +34,6 @@ class AsmHentai( override fun Element.mangaThumbnail() = selectFirst(".image img")?.imgAttr() - override fun Element.mangaLang() = - select("a:has(.flag)").attr("href") - .removeSuffix("/").substringAfterLast("/") - override fun popularMangaSelector() = ".preview_item" override val favoritePath = "inc/user.php?act=favs"