diff --git a/src/ru/desu/build.gradle b/src/ru/desu/build.gradle index c22b16bad..98a075267 100644 --- a/src/ru/desu/build.gradle +++ b/src/ru/desu/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Desu' extClass = '.Desu' - extVersionCode = 27 + extVersionCode = 28 + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt b/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt index 7852c1482..d8a4fbe58 100644 --- a/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt +++ b/src/ru/desu/src/eu/kanade/tachiyomi/extension/ru/desu/Desu.kt @@ -139,22 +139,25 @@ class Desu : ConfigurableSource, HttpSource() { } override fun popularMangaRequest(page: Int) = - GET("$baseUrl$API_URL/?limit=50&order=popular&page=$page") + GET("$baseUrl$API_URL/?limit=50&order=popular&page=$page", headers) override fun popularMangaParse(response: Response) = searchMangaParse(response) override fun latestUpdatesRequest(page: Int) = - GET("$baseUrl$API_URL/?limit=50&order=updated&page=$page") + GET("$baseUrl$API_URL/?limit=50&order=updated&page=$page", headers) override fun latestUpdatesParse(response: Response): MangasPage = searchMangaParse(response) override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { - var url = "$baseUrl$API_URL/?limit=20&page=$page" + val url = "$baseUrl$API_URL/".toHttpUrl().newBuilder() + .addQueryParameter("limit", "20") + .addQueryParameter("page", page.toString()) + val types = mutableListOf() val genres = mutableListOf() (if (filters.isEmpty()) getFilterList() else filters).forEach { filter -> when (filter) { - is OrderBy -> url += "&order=" + arrayOf("popular", "updated", "name")[filter.state] + is OrderBy -> url.addQueryParameter("order", arrayOf("popular", "updated", "name")[filter.state]) is TypeList -> filter.state.forEach { type -> if (type.state) types.add(type) } is GenreList -> filter.state.forEach { genre -> if (genre.state) genres.add(genre) } else -> {} @@ -162,15 +165,15 @@ class Desu : ConfigurableSource, HttpSource() { } if (types.isNotEmpty()) { - url += "&kinds=" + types.joinToString(",") { it.id } + url.addQueryParameter("kinds", types.joinToString(",") { it.id }) } if (genres.isNotEmpty()) { - url += "&genres=" + genres.joinToString(",") { it.id } + url.addQueryParameter("genres", genres.joinToString(",") { it.id }) } if (query.isNotEmpty()) { - url += "&search=$query" + url.addQueryParameter("search", query) } - return GET(url) + return GET(url.build(), headers) } override fun searchMangaParse(response: Response): MangasPage {