diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt index f3c226fae..7058a0252 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt @@ -70,13 +70,14 @@ class NHentai(val context: Context) : HttpSource(), LewdSource { - val advQuery = combineQuery(filters) - val favoriteFilter = filters.findInstance() - val uploadedFilter = filters.findInstance() + val filterList = if (filters.isEmpty()) getFilterList() else filters + val advQuery = combineQuery(filterList) + val favoriteFilter = filterList.findInstance() + val isOkayToSort = filterList.findInstance()?.state?.isBlank() ?: true val url: HttpUrl.Builder - if (favoriteFilter != null && favoriteFilter.state) { + if (favoriteFilter?.state == true) { url = "$baseUrl/favorites".toHttpUrlOrNull()!!.newBuilder() .addQueryParameter("q", "$query $advQuery") .addQueryParameter("page", page.toString()) @@ -85,8 +86,8 @@ class NHentai(val context: Context) : HttpSource(), LewdSource()?.let { f -> + if (isOkayToSort) { + filterList.findInstance()?.let { f -> url.addQueryParameter("sort", f.toUriPart()) } }