From 84e849aacaf8bfa570512bcf0898e2e961e85042 Mon Sep 17 00:00:00 2001 From: Eshlender <35057681+e-shl@users.noreply.github.com> Date: Wed, 29 Mar 2023 03:11:34 +0500 Subject: [PATCH] [RU]Remanga update errors logic (#15870) --- src/ru/remanga/build.gradle | 2 +- .../kanade/tachiyomi/extension/ru/remanga/Remanga.kt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ru/remanga/build.gradle b/src/ru/remanga/build.gradle index da651a01d..d93a964c2 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 = 67 + extVersionCode = 68 } 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 c6144d328..aac70e9af 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 @@ -365,7 +365,7 @@ class Remanga : ConfigurableSource, HttpSource() { .asObservable().doOnNext { response -> if (!response.isSuccessful) { response.close() - if (response.code == 401) warnLogin = true else throw Exception("HTTP error ${response.code}") + if (response.code == 404 && USER_ID == "") warnLogin = true else throw Exception("HTTP error ${response.code}") } } .map { response -> @@ -404,11 +404,15 @@ class Remanga : ConfigurableSource, HttpSource() { override fun fetchChapterList(manga: SManga): Observable> { val branch = branches.getOrElse(manga.url.substringAfter("/api/titles/").substringBefore("/").substringBefore("?")) { mangaBranches(manga) } return when { - manga.status == SManga.LICENSED && branch.isEmpty() -> { + manga.status == SManga.LICENSED && branch.maxByOrNull { selector(it) }!!.count_chapters == 0 -> { Observable.error(Exception("Лицензировано - Нет глав")) } branch.isEmpty() -> { - return Observable.just(listOf()) + if (USER_ID == "") { + Observable.error(Exception("Для просмотра 18+ контента необходима авторизация через WebView")) + } else { + return Observable.just(listOf()) + } } else -> { val mangaID = mangaIDs[manga.url.substringAfter("/api/titles/").substringBefore("/").substringBefore("?")]