From 0fe977a99bd416916ab3bb8c9b50bdba428a1970 Mon Sep 17 00:00:00 2001 From: Eshlender <35057681+e-shl@users.noreply.github.com> Date: Mon, 3 Oct 2022 16:48:38 +0500 Subject: [PATCH] [RU]LibGroup hide all chapters have price (#13690) * [RU]LibGroup hide all chapters have price * fix covers --- .../eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt | 2 +- .../java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt index 565ec94f1..9e86e4577 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt @@ -9,7 +9,7 @@ class LibGenerator : ThemeSourceGenerator { override val themeClass = "LibGroup" - override val baseVersionCode: Int = 9 + override val baseVersionCode: Int = 10 override val sources = listOf( SingleLang("MangaLib", "https://mangalib.me", "ru", overrideVersionCode = 74), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt index 52a2c4f93..3cd47f397 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt @@ -186,7 +186,7 @@ abstract class LibGroup( isEng.equals("eng") && el.jsonObject["eng_name"]?.jsonPrimitive?.content.orEmpty().isNotEmpty() -> el.jsonObject["eng_name"]!!.jsonPrimitive.content else -> el.jsonObject["name"]!!.jsonPrimitive.content } - thumbnail_url = if (el.jsonObject["covers"] != null) baseUrl + el.jsonObject["covers"]!!.jsonObject["default"]!!.jsonPrimitive.content + thumbnail_url = if (el.jsonObject["coverImage"] != null) baseUrl + el.jsonObject["coverImage"]!!.jsonPrimitive.content else baseUrl + "/uploads/cover/" + slug + "/cover/" + el.jsonObject["cover"]!!.jsonPrimitive.content + "_250x350.jpg" url = "/$slug" } @@ -313,7 +313,7 @@ abstract class LibGroup( sortChaptersByTranslator(sortingList, chaptersList, slug, branches) } else { chaptersList - ?.filter { it.jsonObject["status"]?.jsonPrimitive?.intOrNull != 2 } + ?.filter { it.jsonObject["status"]?.jsonPrimitive?.intOrNull != 2 && it.jsonObject["price"]?.jsonPrimitive?.intOrNull == 0 } ?.map { chapterFromElement(it, sortingList, slug, null, null, teams, chaptersList) } }