From b4fede6f9bade0eb795610f428de872f102d3e15 Mon Sep 17 00:00:00 2001 From: Chopper <156493704+choppeh@users.noreply.github.com> Date: Mon, 26 May 2025 16:03:05 -0300 Subject: [PATCH] Update domains and migrate sources (#8958) * JeazScans: Migrate to MangaThemesia * TeamLanhLung: Update domain * MagusManga: Migrate to Iken --- src/en/magusmanga/build.gradle | 6 +-- .../extension/en/magusmanga/MagusManga.kt | 40 ++++++++----------- src/es/jeazscans/build.gradle | 6 +-- .../extension/es/jeazscans/JeazScans.kt | 13 +++--- src/vi/teamlanhlung/AndroidManifest.xml | 2 +- src/vi/teamlanhlung/build.gradle | 2 +- .../extension/vi/teamlanhlung/TeamLanhLung.kt | 2 +- 7 files changed, 31 insertions(+), 40 deletions(-) diff --git a/src/en/magusmanga/build.gradle b/src/en/magusmanga/build.gradle index 9a2a59d2b..fc3e16b4a 100644 --- a/src/en/magusmanga/build.gradle +++ b/src/en/magusmanga/build.gradle @@ -1,9 +1,9 @@ ext { extName = 'Magus Manga' extClass = '.MagusManga' - themePkg = 'keyoapp' - baseUrl = 'https://magustoon.com' - overrideVersionCode = 35 + themePkg = 'iken' + baseUrl = 'https://magustoon.org' + overrideVersionCode = 44 isNsfw = false } diff --git a/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt index 5f557d733..414710e4b 100644 --- a/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt +++ b/src/en/magusmanga/src/eu/kanade/tachiyomi/extension/en/magusmanga/MagusManga.kt @@ -1,41 +1,33 @@ package eu.kanade.tachiyomi.extension.en.magusmanga -import eu.kanade.tachiyomi.multisrc.keyoapp.Keyoapp +import eu.kanade.tachiyomi.multisrc.iken.Iken +import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.interceptor.rateLimitHost +import eu.kanade.tachiyomi.source.model.MangasPage +import eu.kanade.tachiyomi.source.model.SManga +import eu.kanade.tachiyomi.util.asJsoup import okhttp3.HttpUrl.Companion.toHttpUrl -import okhttp3.Interceptor import okhttp3.Response -import okio.IOException -import org.jsoup.Jsoup -class MagusManga : Keyoapp( +class MagusManga : Iken( "Magus Manga", - "https://magustoon.com", "en", + "https://magustoon.org", + "https://api.magustoon.org", ) { - override val versionId = 2 + // Moved from Keyoapp to Iken + override val versionId = 3 override val client = network.cloudflareClient.newBuilder() - .addInterceptor(::captchaInterceptor) .rateLimitHost(baseUrl.toHttpUrl(), 1) .build() - private fun captchaInterceptor(chain: Interceptor.Chain): Response { - val request = chain.request() - val response = chain.proceed(request) + override fun popularMangaRequest(page: Int) = GET(baseUrl, headers) - if (response.code == 401) { - val document = Jsoup.parse( - response.peekBody(Long.MAX_VALUE).string(), - response.request.url.toString(), - ) - - if (document.selectFirst(".g-recaptcha") != null) { - response.close() - throw IOException("Solve Captcha in WebView") - } - } - - return response + override fun popularMangaParse(response: Response): MangasPage { + val entries = response.asJsoup().select(".splide__track li > a").mapNotNull { + titleCache[it.absUrl("href").substringAfter("series/")]?.toSManga() + }.distinctBy(SManga::url) + return MangasPage(entries, false) } } diff --git a/src/es/jeazscans/build.gradle b/src/es/jeazscans/build.gradle index 735ea6396..4817d6fca 100644 --- a/src/es/jeazscans/build.gradle +++ b/src/es/jeazscans/build.gradle @@ -1,9 +1,9 @@ ext { extName = 'Jeaz Scans' extClass = '.JeazScans' - themePkg = 'madara' - baseUrl = 'https://marcialhub.xyz' - overrideVersionCode = 4 + themePkg = 'mangathemesia' + baseUrl = 'https://lectorhub.j5z.xyz' + overrideVersionCode = 15 isNsfw = false } diff --git a/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt b/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt index d83a428b4..f53710f85 100644 --- a/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt +++ b/src/es/jeazscans/src/eu/kanade/tachiyomi/extension/es/jeazscans/JeazScans.kt @@ -1,19 +1,18 @@ package eu.kanade.tachiyomi.extension.es.jeazscans -import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia import eu.kanade.tachiyomi.network.interceptor.rateLimit import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale -class JeazScans : Madara( - "JeazScans", - "https://marcialhub.xyz", +class JeazScans : MangaThemesia( + "Jeaz Scans", + "https://lectorhub.j5z.xyz", "es", - SimpleDateFormat("d MMMM, yyyy", Locale("es")), + dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("es")), ) { - override val useLoadMoreRequest = LoadMoreStrategy.Always - override val useNewChapterEndpoint = true + override val id = 5292079548510508306 override val client: OkHttpClient = super.client.newBuilder() .rateLimit(2) diff --git a/src/vi/teamlanhlung/AndroidManifest.xml b/src/vi/teamlanhlung/AndroidManifest.xml index a9475b0ab..3d86073aa 100644 --- a/src/vi/teamlanhlung/AndroidManifest.xml +++ b/src/vi/teamlanhlung/AndroidManifest.xml @@ -13,7 +13,7 @@ diff --git a/src/vi/teamlanhlung/build.gradle b/src/vi/teamlanhlung/build.gradle index 5665e1f26..070c2df69 100644 --- a/src/vi/teamlanhlung/build.gradle +++ b/src/vi/teamlanhlung/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Team Lanh Lung' extClass = '.TeamLanhLung' - extVersionCode = 22 + extVersionCode = 23 isNsfw = true } diff --git a/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt b/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt index 87236322e..f2f05a6b6 100644 --- a/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt +++ b/src/vi/teamlanhlung/src/eu/kanade/tachiyomi/extension/vi/teamlanhlung/TeamLanhLung.kt @@ -32,7 +32,7 @@ class TeamLanhLung : ParsedHttpSource() { override val name: String = "Team Lạnh Lùng" - override val baseUrl: String = "https://teamlanhlung5.shop" + override val baseUrl: String = "https://teamlanhlung9.shop" override val lang: String = "vi"