Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update nHentai internal logic to be the same as the extension

Browse Source
This commit is contained in:
Jobobby04 2020-08-03 12:14:58 -04:00
parent 885c94f9c8
commit fb19f6b860
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt
View File

@ -70,13 +70,14 @@ class NHentai(val context: Context) : HttpSource(), LewdSource<NHentaiSearchMeta
} }
private fun searchMangaRequestObservable(page: Int, query: String, filters: FilterList): Observable<Request> { private fun searchMangaRequestObservable(page: Int, query: String, filters: FilterList): Observable<Request> {
val advQuery = combineQuery(filters) val filterList = if (filters.isEmpty()) getFilterList() else filters
val favoriteFilter = filters.findInstance<FavoriteFilter>() val advQuery = combineQuery(filterList)
val uploadedFilter = filters.findInstance<UploadedFilter>() val favoriteFilter = filterList.findInstance<FavoriteFilter>()
val isOkayToSort = filterList.findInstance<UploadedFilter>()?.state?.isBlank() ?: true
val url: HttpUrl.Builder val url: HttpUrl.Builder
if (favoriteFilter != null && favoriteFilter.state) { if (favoriteFilter?.state == true) {
url = "$baseUrl/favorites".toHttpUrlOrNull()!!.newBuilder() url = "$baseUrl/favorites".toHttpUrlOrNull()!!.newBuilder()
.addQueryParameter("q", "$query $advQuery") .addQueryParameter("q", "$query $advQuery")
.addQueryParameter("page", page.toString()) .addQueryParameter("page", page.toString())
@ -85,8 +86,8 @@ class NHentai(val context: Context) : HttpSource(), LewdSource<NHentaiSearchMeta
.addQueryParameter("q", "$query $advQuery") .addQueryParameter("q", "$query $advQuery")
.addQueryParameter("page", page.toString()) .addQueryParameter("page", page.toString())
if (uploadedFilter?.state?.isBlank() == true) { if (isOkayToSort) {
filters.findInstance<SortFilter>()?.let { f -> filterList.findInstance<SortFilter>()?.let { f ->
url.addQueryParameter("sort", f.toUriPart()) url.addQueryParameter("sort", f.toUriPart())
} }
} }