From 4f32f6e8ed18cc4ea068b88775417f51194b2648 Mon Sep 17 00:00:00 2001 From: Eshlender <35057681+e-shl@users.noreply.github.com> Date: Sat, 6 May 2023 19:17:05 +0500 Subject: [PATCH] [RU]Remanga fix lastEx (why deploy the find in the past commit) (#16298) --- src/ru/remanga/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ru/remanga/build.gradle b/src/ru/remanga/build.gradle index 0be4fb5de..c8af60b3a 100644 --- a/src/ru/remanga/build.gradle +++ b/src/ru/remanga/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Remanga' pkgNameSuffix = 'ru.remanga' extClass = '.Remanga' - extVersionCode = 74 + extVersionCode = 75 } dependencies { diff --git a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt index 48a21ffb0..3a4c72da7 100644 --- a/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt +++ b/src/ru/remanga/src/eu/kanade/tachiyomi/extension/ru/remanga/Remanga.kt @@ -422,7 +422,7 @@ class Remanga : ConfigurableSource, HttpSource() { } private fun filterPaid(tempChaptersList: MutableList): MutableList { - val lastEx = tempChaptersList.findLast { it.scanlator.equals("exmanga") } + val lastEx = tempChaptersList.find { it.scanlator.equals("exmanga") } return if (!preferences.getBoolean(PAID_PREF, false)) { tempChaptersList.filter { !it.name.contains("\uD83D\uDCB2") || if (lastEx != null) { @@ -485,7 +485,7 @@ class Remanga : ConfigurableSource, HttpSource() { val response = chapterListRequest(selectedBranch2.id, it) chapterListParse(response, manga, exChapters) }.let { tempChaptersList.addAll(0, it.flatten()) } - return filterPaid(tempChaptersList).distinctBy { it.name.substringBefore(". Глава") + "--" + it.chapter_number }.sortedWith(compareBy({ it.name.substringBefore(". Глава").toFloat() }, { it.chapter_number })).reversed().let { Observable.just(it) } + return filterPaid(tempChaptersList).distinctBy { it.name.substringBefore(". Глава") + "--" + it.chapter_number }.sortedWith(compareBy({ it.name.substringBefore(". Глава").toIntOrNull()!! }, { it.chapter_number })).reversed().let { Observable.just(it) } } } }