From fb19f6b860c735784cce2e1c7e6cbe0978b7287e Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 3 Aug 2020 12:14:58 -0400
Subject: [PATCH] Update nHentai internal logic to be the same as the extension

---
 .../kanade/tachiyomi/source/online/all/NHentai.kt   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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<NHentaiSearchMeta
     }
 
     private fun searchMangaRequestObservable(page: Int, query: String, filters: FilterList): Observable<Request> {
-        val advQuery = combineQuery(filters)
-        val favoriteFilter = filters.findInstance<FavoriteFilter>()
-        val uploadedFilter = filters.findInstance<UploadedFilter>()
+        val filterList = if (filters.isEmpty()) getFilterList() else filters
+        val advQuery = combineQuery(filterList)
+        val favoriteFilter = filterList.findInstance<FavoriteFilter>()
+        val isOkayToSort = filterList.findInstance<UploadedFilter>()?.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<NHentaiSearchMeta
                 .addQueryParameter("q", "$query $advQuery")
                 .addQueryParameter("page", page.toString())
 
-            if (uploadedFilter?.state?.isBlank() == true) {
-                filters.findInstance<SortFilter>()?.let { f ->
+            if (isOkayToSort) {
+                filterList.findInstance<SortFilter>()?.let { f ->
                     url.addQueryParameter("sort", f.toUriPart())
                 }
             }