From cd28f381bf5d89c7005fdab24bae99b3dbea449d Mon Sep 17 00:00:00 2001
From: bapeey <90949336+bapeey@users.noreply.github.com>
Date: Fri, 28 Feb 2025 22:26:17 -0500
Subject: [PATCH] LectorMoe(SenshiManga/Taikutsu): Filter out paid chapters and
 update api url (#7845)

* filter out chapters and update urls

* suscribersOnly
---
 lib-multisrc/lectormoe/build.gradle.kts                |  2 +-
 .../kanade/tachiyomi/multisrc/lectormoe/LectorMoe.kt   |  6 +++++-
 .../tachiyomi/multisrc/lectormoe/LectorMoeDto.kt       | 10 +++++++---
 .../tachiyomi/extension/es/senshimanga/SenshiManga.kt  |  1 +
 .../kanade/tachiyomi/extension/es/taikutsu/Taikutsu.kt |  1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib-multisrc/lectormoe/build.gradle.kts b/lib-multisrc/lectormoe/build.gradle.kts
index dc076cc37..9dce2478c 100644
--- a/lib-multisrc/lectormoe/build.gradle.kts
+++ b/lib-multisrc/lectormoe/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 1
+baseVersionCode = 2
diff --git a/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoe.kt b/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoe.kt
index ca9c6c70f..37f24fb4a 100644
--- a/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoe.kt
+++ b/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoe.kt
@@ -111,7 +111,11 @@ abstract class LectorMoe(
     override fun chapterListParse(response: Response): List<SChapter> {
         val result = json.decodeFromString<Data<SeriesDto>>(response.body.string())
         val seriesSlug = result.data.slug
-        return result.data.chapters?.map { it.toSChapter(seriesSlug) } ?: emptyList()
+        return result.data.chapters
+            ?.filter { it.subscribersOnly.not() }
+            ?.map { it.toSChapter(seriesSlug) }
+            ?.filter { it.date_upload < System.currentTimeMillis() }
+            ?: emptyList()
     }
 
     override fun pageListRequest(chapter: SChapter): Request {
diff --git a/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoeDto.kt b/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoeDto.kt
index b9ac22513..3491d555c 100644
--- a/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoeDto.kt
+++ b/lib-multisrc/lectormoe/src/eu/kanade/tachiyomi/multisrc/lectormoe/LectorMoeDto.kt
@@ -7,6 +7,7 @@ import kotlinx.serialization.Serializable
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Locale
+import java.util.TimeZone
 
 @Serializable
 class Data<T>(val data: T)
@@ -53,18 +54,21 @@ class SeriesAuthorDto(
     val name: String,
 )
 
-private val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US)
+private val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).apply {
+    timeZone = TimeZone.getTimeZone("UTC")
+}
 
 @Serializable
 class SeriesChapterDto(
     private val title: String,
     private val number: Float,
-    private val createdAt: String,
+    private val releasedAt: String,
+    val subscribersOnly: Boolean,
 ) {
     fun toSChapter(seriesSlug: String) = SChapter.create().apply {
         name = "Capítulo ${number.toString().removeSuffix(".0")} - $title"
         date_upload = try {
-            dateFormat.parse(createdAt)?.time ?: 0L
+            dateFormat.parse(releasedAt)?.time ?: 0L
         } catch (_: ParseException) {
             0L
         }
diff --git a/src/es/senshimanga/src/eu/kanade/tachiyomi/extension/es/senshimanga/SenshiManga.kt b/src/es/senshimanga/src/eu/kanade/tachiyomi/extension/es/senshimanga/SenshiManga.kt
index 3279f119b..37f52d88e 100644
--- a/src/es/senshimanga/src/eu/kanade/tachiyomi/extension/es/senshimanga/SenshiManga.kt
+++ b/src/es/senshimanga/src/eu/kanade/tachiyomi/extension/es/senshimanga/SenshiManga.kt
@@ -6,4 +6,5 @@ class SenshiManga : LectorMoe(
     "Senshi Manga",
     "https://senshimanga.capibaratraductor.com",
     "es",
+    apiBaseUrl = "https://api.capibaratraductor.com",
 )
diff --git a/src/es/taikutsu/src/eu/kanade/tachiyomi/extension/es/taikutsu/Taikutsu.kt b/src/es/taikutsu/src/eu/kanade/tachiyomi/extension/es/taikutsu/Taikutsu.kt
index da99f62c9..3567a1afa 100644
--- a/src/es/taikutsu/src/eu/kanade/tachiyomi/extension/es/taikutsu/Taikutsu.kt
+++ b/src/es/taikutsu/src/eu/kanade/tachiyomi/extension/es/taikutsu/Taikutsu.kt
@@ -6,4 +6,5 @@ class Taikutsu : LectorMoe(
     "Taikutsu",
     "https://taikutsutl.capibaratraductor.com",
     "es",
+    apiBaseUrl = "https://api.capibaratraductor.com",
 )