diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index 16d2dae94..599395a1b 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: MangaDex' pkgNameSuffix = 'all.mangadex' extClass = '.MangadexFactory' - extVersionCode = 76 + extVersionCode = 77 libVersion = '1.2' } diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt index d370cce76..607524cfc 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt @@ -452,13 +452,28 @@ abstract class Mangadex( // Skip chapters that don't match the desired language, or are future releases chapterJson?.forEach { key, jsonElement -> val chapterElement = jsonElement.asJsonObject - if (chapterElement.get("lang_code").string == internalLang && (chapterElement.get("timestamp").asLong * 1000) <= now) { + if (shouldKeepChapter(chapterElement, now)) { chapters.add(chapterFromJson(key, chapterElement, finalChapterNumber, status)) } } return chapters } + /**filter out the following chapters + * language doesn't match the chosen language + * future chapters + * chapters from manga plus since they have to be read in mangaplus extension + * + */ + private fun shouldKeepChapter(chapterJson: JsonObject, now: Long): Boolean { + return when { + chapterJson.get("lang_code").string != internalLang -> false + (chapterJson.get("timestamp").asLong * 1000) > now -> false + chapterJson.get("group_id").string == "9097" -> false + else -> true + } + } + private fun chapterFromJson(chapterId: String, chapterJson: JsonObject, finalChapterNumber: String, status: Int): SChapter { val chapter = SChapter.create() chapter.url = API_CHAPTER + chapterId