diff --git a/src/all/nhentai/build.gradle b/src/all/nhentai/build.gradle index dc9368c5a..cd525fa5c 100644 --- a/src/all/nhentai/build.gradle +++ b/src/all/nhentai/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'NHentai' extClass = '.NHFactory' - extVersionCode = 43 + extVersionCode = 44 isNsfw = true } diff --git a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt index 1f36ee885..d5dc59a22 100644 --- a/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt +++ b/src/all/nhentai/src/eu/kanade/tachiyomi/extension/all/nhentai/NHentai.kt @@ -136,9 +136,8 @@ open class NHentai( } override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - val fixedQuery = query.ifEmpty { "\"\"" } val filterList = if (filters.isEmpty()) getFilterList() else filters - val nhLangSearch = if (nhLang.isBlank()) "" else "+language:$nhLang " + val nhLangSearch = if (nhLang.isBlank()) "" else "language:$nhLang " val advQuery = combineQuery(filterList) val favoriteFilter = filterList.findInstance() val isOkayToSort = filterList.findInstance()?.state?.isBlank() ?: true @@ -146,14 +145,14 @@ open class NHentai( filterList.findInstance()?.state?.toIntOrNull()?.plus(page) ?: page if (favoriteFilter?.state == true) { - val url = "$baseUrl/favorites".toHttpUrl().newBuilder() - .addQueryParameter("q", "$fixedQuery $advQuery") + val url = "$baseUrl/favorites/".toHttpUrl().newBuilder() + .addQueryParameter("q", "$query $advQuery") .addQueryParameter("page", offsetPage.toString()) return GET(url.build(), headers) } else { - val url = "$baseUrl/search".toHttpUrl().newBuilder() - .addQueryParameter("q", "$fixedQuery $nhLangSearch$advQuery") + val url = "$baseUrl/search/".toHttpUrl().newBuilder() + .addQueryParameter("q", "$query $nhLangSearch$advQuery") .addQueryParameter("page", offsetPage.toString()) if (isOkayToSort) { @@ -173,7 +172,7 @@ open class NHentai( .filterNot(String::isBlank) .forEach { tag -> if (tag.startsWith("-")) append("-") - append(filter.name, "\"", tag.removePrefix("-"), "\" ") + append(filter.name, ":\"", tag.removePrefix("-"), "\" ") } } }