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

Fix latest mangadex order, and missing manga, and follows users default content rating (#8161) 

* Fix latest mangadex order, and missing manga, and follows users default prefs for content rating

* update gradle
This commit is contained in:
Carlos 2021-07-17 15:45:28 -04:00 committed by GitHub
parent aea0eb6daf
commit 5a8287c1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangadex/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'MangaDex'
pkgNameSuffix = 'all.mangadex'
extClass = '.MangaDexFactory'
extVersionCode = 124
extVersionCode = 125
libVersion = '1.2'
containsNsfw = true
}

20
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
View File

@ -127,6 +127,21 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val mangaUrl = MDConstants.apiMangaUrl.toHttpUrlOrNull()!!.newBuilder().apply {
addQueryParameter("includes[]", MDConstants.coverArt)
addQueryParameter("limit", mangaIds.size.toString())
if (preferences.getBoolean(MDConstants.getContentRatingSafePrefKey(dexLang), true)) {
addQueryParameter("contentRating[]", "safe")
}
if (preferences.getBoolean(MDConstants.getContentRatingSuggestivePrefKey(dexLang), true)) {
addQueryParameter("contentRating[]", "suggestive")
}
if (preferences.getBoolean(MDConstants.getContentRatingEroticaPrefKey(dexLang), false)) {
addQueryParameter("contentRating[]", "erotica")
}
if (preferences.getBoolean(MDConstants.getContentRatingPornographicPrefKey(dexLang), false)) {
addQueryParameter("contentRating[]", "pornographic")
}
mangaIds.forEach { id ->
addQueryParameter("ids[]", id)
}
@ -135,7 +150,9 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val mangaResponse = client.newCall(GET(mangaUrl, headers, CacheControl.FORCE_NETWORK)).execute()
val mangaListDto = helper.json.decodeFromString<MangaListDto>(mangaResponse.body!!.string())
val mangaList = mangaListDto.results.map { mangaDto ->
val mangaDtoMap = mangaListDto.results.associateBy({ it.data.id }, { it })
val mangaList = mangaIds.mapNotNull { mangaDtoMap[it] }.map { mangaDto ->
val fileName = mangaDto.relationships.firstOrNull { relationshipDto ->
relationshipDto.type.equals(MDConstants.coverArt, true)
}?.attributes?.fileName
@ -161,7 +178,6 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val url = MDConstants.apiMangaUrl.toHttpUrlOrNull()!!.newBuilder().apply {
addQueryParameter("ids[]", query.removePrefix(MDConstants.prefixIdSearch))
addQueryParameter("includes[]", MDConstants.coverArt)
addQueryParameter("contentRating[]", "safe")
addQueryParameter("contentRating[]", "suggestive")
addQueryParameter("contentRating[]", "erotica")