From 44a4f517d2d317a429ffc8bbcc3661f64ea3c079 Mon Sep 17 00:00:00 2001 From: Vetle Ledaal Date: Sun, 23 Mar 2025 16:04:17 +0100 Subject: [PATCH] Remove remaining usage of `network.client` (#8153) * Explicitly use `network.cloudflareClient` instead of `super.client` ... but only if the parent is `HttpSource` or `ParsedHttpSource` * Remove use of `network.client` ... replaced with `network.cloudflareClient` or `super.client` if the parent class sets `client` to `network.cloudflareClient` already. --- lib-multisrc/comicgamma/build.gradle.kts | 2 +- .../src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt | 2 +- lib-multisrc/fansubscat/build.gradle.kts | 2 +- .../src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt | 2 +- lib-multisrc/kemono/build.gradle.kts | 2 +- .../kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt | 2 +- lib-multisrc/mangaesp/build.gradle.kts | 2 +- .../src/eu/kanade/tachiyomi/multisrc/mangaesp/MangaEsp.kt | 2 +- lib-multisrc/mccms/build.gradle.kts | 2 +- .../mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt | 2 +- .../mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt | 2 +- lib-multisrc/multichan/build.gradle.kts | 2 +- .../src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt | 2 +- lib-multisrc/senkuro/build.gradle.kts | 2 +- .../src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt | 2 +- lib-multisrc/sinmh/build.gradle.kts | 2 +- .../sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt | 2 +- lib-multisrc/webtoons/build.gradle.kts | 2 +- .../src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt | 2 +- src/all/akuma/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/all/akuma/Akuma.kt | 4 ++-- src/all/comicfury/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt | 2 +- src/all/comico/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt | 2 +- src/all/holonometria/build.gradle | 3 ++- .../tachiyomi/extension/all/holonometria/Holonometria.kt | 2 +- src/all/izneo/build.gradle | 3 ++- .../src/eu/kanade/tachiyomi/extension/all/izneo/Izneo.kt | 2 +- src/all/kiutaku/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/all/kiutaku/Kiutaku.kt | 2 +- .../src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt | 2 +- src/all/mangadex/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt | 4 ++-- src/all/mangahosted/build.gradle | 2 +- .../kanade/tachiyomi/extension/all/mangahosted/MangaHosted.kt | 2 +- .../eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt | 2 +- src/all/mangatoon/build.gradle | 3 ++- .../eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt | 2 +- src/all/mangaup/build.gradle | 3 ++- .../src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt | 2 +- src/all/mango/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt | 2 +- src/all/namicomi/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/all/namicomi/NamiComi.kt | 2 +- src/all/tappytoon/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/all/tappytoon/Tappytoon.kt | 2 +- src/all/toomics/build.gradle | 2 +- .../kanade/tachiyomi/extension/all/toomics/ToomicsGlobal.kt | 2 +- src/en/clowncorps/build.gradle | 3 ++- .../eu/kanade/tachiyomi/extension/en/clowncorps/ClownCorps.kt | 2 +- src/en/digitalcomicmuseum/build.gradle | 3 ++- .../extension/en/digitalcomicmuseum/DigitalComicMuseum.kt | 2 +- src/en/grrlpower/build.gradle | 3 ++- .../eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt | 2 +- src/en/hentaidexy/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/en/hentaidexy/Hentaidexy.kt | 2 +- src/en/madokami/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt | 2 +- src/en/mangamo/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/en/mangamo/Mangamo.kt | 2 +- src/en/mangaplanet/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/mangaplanet/MangaPlanet.kt | 2 +- src/en/manta/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/en/manta/MantaComics.kt | 2 +- src/en/questionablecontent/build.gradle | 3 ++- .../extension/en/questionablecontent/QuestionableContent.kt | 2 +- src/en/tapastic/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt | 2 +- src/en/vizshonenjump/build.gradle | 3 ++- .../src/eu/kanade/tachiyomi/extension/en/vizshonenjump/Viz.kt | 2 +- src/es/ravenmanga/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/es/ravenmanga/RavenManga.kt | 2 +- src/ja/comicmeteor/build.gradle | 3 ++- .../kanade/tachiyomi/extension/ja/comicmeteor/ComicMeteor.kt | 2 +- src/ja/gaugaumonsterplus/build.gradle | 3 ++- .../extension/ja/gaugaumonsterplus/GaugauMonsterPlus.kt | 2 +- src/ja/kadocomi/build.gradle | 3 ++- .../src/eu/kanade/tachiyomi/extension/ja/kadocomi/KadoComi.kt | 2 +- src/ja/nicovideoseiga/build.gradle | 3 ++- .../tachiyomi/extension/ja/nicovideoseiga/NicovideoSeiga.kt | 2 +- src/ja/ohtawebcomic/build.gradle | 2 +- .../tachiyomi/extension/ja/ohtawebcomic/OhtaWebComic.kt | 2 +- src/ja/rawinu/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/ja/rawinu/RawINU.kt | 2 +- src/ja/yanmaga/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/ja/yanmaga/Yanmaga.kt | 2 +- src/ko/navercomic/build.gradle | 3 ++- .../tachiyomi/extension/ko/navercomic/NaverComicBase.kt | 2 +- src/pt/bakai/build.gradle | 2 +- .../bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt | 2 +- src/pt/blackoutcomics/build.gradle | 2 +- .../tachiyomi/extension/pt/blackoutcomics/BlackoutComics.kt | 2 +- src/pt/bruttal/build.gradle | 3 ++- .../src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt | 2 +- src/pt/maidsecret/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/pt/maidsecret/MaidSecret.kt | 2 +- src/ru/acomics/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt | 2 +- src/ru/unicomics/build.gradle | 3 ++- .../eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt | 2 +- src/uk/honeymanga/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/uk/honeymanga/HoneyManga.kt | 2 +- src/zh/cartoon18/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/zh/cartoon18/Cartoon18.kt | 2 +- src/zh/dm5/build.gradle | 2 +- src/zh/dm5/src/eu/kanade/tachiyomi/extension/zh/dm5/Dm5.kt | 2 +- src/zh/dmzj/build.gradle | 2 +- src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt | 4 ++-- src/zh/mangabz/build.gradle | 3 ++- .../src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt | 2 +- src/zh/manhuagui/build.gradle | 3 ++- .../eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt | 4 ++-- src/zh/manhuaren/build.gradle | 2 +- .../eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt | 2 +- src/zh/manwa/build.gradle | 2 +- .../manwa/src/eu/kanade/tachiyomi/extension/zh/manwa/Manwa.kt | 2 +- src/zh/vomic/build.gradle | 3 ++- .../vomic/src/eu/kanade/tachiyomi/extension/zh/vomic/Vomic.kt | 2 +- src/zh/wnacg/build.gradle | 2 +- .../wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt | 2 +- src/zh/zaimanhua/build.gradle | 3 ++- .../eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt | 2 +- 123 files changed, 147 insertions(+), 127 deletions(-) diff --git a/lib-multisrc/comicgamma/build.gradle.kts b/lib-multisrc/comicgamma/build.gradle.kts index fbcb938f7..b32ccd998 100644 --- a/lib-multisrc/comicgamma/build.gradle.kts +++ b/lib-multisrc/comicgamma/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("lib-multisrc") } -baseVersionCode = 8 +baseVersionCode = 9 dependencies { api(project(":lib:speedbinb")) diff --git a/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt b/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt index deb83274e..2ed4b74f3 100644 --- a/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt +++ b/lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt @@ -28,7 +28,7 @@ open class ComicGamma( private val json = Injekt.get() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(SpeedBinbInterceptor(json)) .build() diff --git a/lib-multisrc/fansubscat/build.gradle.kts b/lib-multisrc/fansubscat/build.gradle.kts index b45873b53..ede652be5 100644 --- a/lib-multisrc/fansubscat/build.gradle.kts +++ b/lib-multisrc/fansubscat/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 5 +baseVersionCode = 6 diff --git a/lib-multisrc/fansubscat/src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt b/lib-multisrc/fansubscat/src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt index feee849e4..306585149 100644 --- a/lib-multisrc/fansubscat/src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt +++ b/lib-multisrc/fansubscat/src/eu/kanade/tachiyomi/multisrc/fansubscat/FansubsCat.kt @@ -39,7 +39,7 @@ abstract class FansubsCat( override fun headersBuilder(): Headers.Builder = Headers.Builder() .add("User-Agent", "Tachiyomi/${AppInfo.getVersionName()}") - override val client: OkHttpClient = network.client + override val client: OkHttpClient = network.cloudflareClient private val json: Json by injectLazy() diff --git a/lib-multisrc/kemono/build.gradle.kts b/lib-multisrc/kemono/build.gradle.kts index ed1c83ed6..b105a49df 100644 --- a/lib-multisrc/kemono/build.gradle.kts +++ b/lib-multisrc/kemono/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 19 +baseVersionCode = 20 diff --git a/lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt b/lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt index 2991ca8ec..b14b35e64 100644 --- a/lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt +++ b/lib-multisrc/kemono/src/eu/kanade/tachiyomi/multisrc/kemono/Kemono.kt @@ -32,7 +32,7 @@ open class Kemono( ) : HttpSource(), ConfigurableSource { override val supportsLatest = true - override val client = network.client.newBuilder().rateLimit(1).build() + override val client = network.cloudflareClient.newBuilder().rateLimit(1).build() override fun headersBuilder() = super.headersBuilder() .add("Referer", "$baseUrl/") diff --git a/lib-multisrc/mangaesp/build.gradle.kts b/lib-multisrc/mangaesp/build.gradle.kts index 824b7d885..8c443df10 100644 --- a/lib-multisrc/mangaesp/build.gradle.kts +++ b/lib-multisrc/mangaesp/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("lib-multisrc") } -baseVersionCode = 3 +baseVersionCode = 4 dependencies { api(project(":lib:i18n")) diff --git a/lib-multisrc/mangaesp/src/eu/kanade/tachiyomi/multisrc/mangaesp/MangaEsp.kt b/lib-multisrc/mangaesp/src/eu/kanade/tachiyomi/multisrc/mangaesp/MangaEsp.kt index 13b6e7793..9f593dcb6 100644 --- a/lib-multisrc/mangaesp/src/eu/kanade/tachiyomi/multisrc/mangaesp/MangaEsp.kt +++ b/lib-multisrc/mangaesp/src/eu/kanade/tachiyomi/multisrc/mangaesp/MangaEsp.kt @@ -48,7 +48,7 @@ abstract class MangaEsp( protected open val useApiSearch = false - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 2) .build() diff --git a/lib-multisrc/mccms/build.gradle.kts b/lib-multisrc/mccms/build.gradle.kts index ede652be5..f0ad544d5 100644 --- a/lib-multisrc/mccms/build.gradle.kts +++ b/lib-multisrc/mccms/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 6 +baseVersionCode = 7 diff --git a/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt index 6462ba75a..e368ecfd7 100644 --- a/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt +++ b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMS.kt @@ -33,7 +33,7 @@ open class MCCMS( private val json: Json by injectLazy() override val client by lazy { - network.client.newBuilder() + network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 2) .build() } diff --git a/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt index 8974fd175..481d72208 100644 --- a/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt +++ b/lib-multisrc/mccms/src/eu/kanade/tachiyomi/multisrc/mccms/MCCMSWeb.kt @@ -26,7 +26,7 @@ open class MCCMSWeb( override val supportsLatest get() = true override val client by lazy { - network.client.newBuilder() + network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 2) .build() } diff --git a/lib-multisrc/multichan/build.gradle.kts b/lib-multisrc/multichan/build.gradle.kts index e2f11e9c1..6e70fd158 100644 --- a/lib-multisrc/multichan/build.gradle.kts +++ b/lib-multisrc/multichan/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 3 +baseVersionCode = 4 diff --git a/lib-multisrc/multichan/src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt b/lib-multisrc/multichan/src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt index 2aa41a6a8..6e1a53242 100644 --- a/lib-multisrc/multichan/src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt +++ b/lib-multisrc/multichan/src/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt @@ -26,7 +26,7 @@ abstract class MultiChan( override val supportsLatest = true - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .readTimeout(30, TimeUnit.SECONDS) .rateLimit(2) diff --git a/lib-multisrc/senkuro/build.gradle.kts b/lib-multisrc/senkuro/build.gradle.kts index e2f11e9c1..6e70fd158 100644 --- a/lib-multisrc/senkuro/build.gradle.kts +++ b/lib-multisrc/senkuro/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 3 +baseVersionCode = 4 diff --git a/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt b/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt index 12ca9c5ce..abf57385e 100644 --- a/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt +++ b/lib-multisrc/senkuro/src/eu/kanade/tachiyomi/multisrc/senkuro/Senkuro.kt @@ -40,7 +40,7 @@ abstract class Senkuro( .add("Content-Type", "application/json") override val client: OkHttpClient = - network.client.newBuilder() + network.cloudflareClient.newBuilder() .rateLimit(3) .build() diff --git a/lib-multisrc/sinmh/build.gradle.kts b/lib-multisrc/sinmh/build.gradle.kts index 7813c7ee1..01917c6f3 100644 --- a/lib-multisrc/sinmh/build.gradle.kts +++ b/lib-multisrc/sinmh/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 11 +baseVersionCode = 12 diff --git a/lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt b/lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt index e888a4a5d..b8a80d3e5 100644 --- a/lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt +++ b/lib-multisrc/sinmh/src/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt @@ -34,7 +34,7 @@ abstract class SinMH( protected open val mobileUrl = _baseUrl.replaceFirst("www.", "m.") override val supportsLatest = true - override val client = network.client.newBuilder().rateLimit(2).build() + override val client = network.cloudflareClient.newBuilder().rateLimit(2).build() override fun headersBuilder(): Headers.Builder = Headers.Builder() .add("User-Agent", System.getProperty("http.agent")!!) diff --git a/lib-multisrc/webtoons/build.gradle.kts b/lib-multisrc/webtoons/build.gradle.kts index e2f11e9c1..6e70fd158 100644 --- a/lib-multisrc/webtoons/build.gradle.kts +++ b/lib-multisrc/webtoons/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 3 +baseVersionCode = 4 diff --git a/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt b/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt index f84cf5bd8..453508eaa 100644 --- a/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt +++ b/lib-multisrc/webtoons/src/eu/kanade/tachiyomi/multisrc/webtoons/Webtoons.kt @@ -45,7 +45,7 @@ open class Webtoons( override val supportsLatest = true - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .cookieJar( object : CookieJar { override fun saveFromResponse(url: HttpUrl, cookies: List) {} diff --git a/src/all/akuma/build.gradle b/src/all/akuma/build.gradle index c7f1bba41..af7b57d40 100644 --- a/src/all/akuma/build.gradle +++ b/src/all/akuma/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Akuma' extClass = '.AkumaFactory' - extVersionCode = 6 + extVersionCode = 7 isNsfw = true } diff --git a/src/all/akuma/src/eu/kanade/tachiyomi/extension/all/akuma/Akuma.kt b/src/all/akuma/src/eu/kanade/tachiyomi/extension/all/akuma/Akuma.kt index 18fd609d6..bc4cfa449 100644 --- a/src/all/akuma/src/eu/kanade/tachiyomi/extension/all/akuma/Akuma.kt +++ b/src/all/akuma/src/eu/kanade/tachiyomi/extension/all/akuma/Akuma.kt @@ -46,12 +46,12 @@ class Akuma( private var storedToken: String? = null - private val ddosGuardIntercept = DDosGuardInterceptor(network.client) + private val ddosGuardIntercept = DDosGuardInterceptor(network.cloudflareClient) private val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ENGLISH).apply { timeZone = TimeZone.getTimeZone("UTC") } - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(ddosGuardIntercept) .addInterceptor(::tokenInterceptor) .rateLimit(2) diff --git a/src/all/comicfury/build.gradle b/src/all/comicfury/build.gradle index 2689f2746..e8dc72b75 100644 --- a/src/all/comicfury/build.gradle +++ b/src/all/comicfury/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Comic Fury' extClass = '.ComicFuryFactory' - extVersionCode = 4 + extVersionCode = 5 isNsfw = true } diff --git a/src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt b/src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt index 3458c5568..93db39f8c 100644 --- a/src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt +++ b/src/all/comicfury/src/eu/kanade/tachiyomi/extension/all/comicfury/ComicFury.kt @@ -33,7 +33,7 @@ class ComicFury( override val name: String = "Comic Fury$extraName" // Used for No Text override val supportsLatest: Boolean = true - override val client = super.client.newBuilder().addInterceptor(TextInterceptor()).build() + override val client = network.cloudflareClient.newBuilder().addInterceptor(TextInterceptor()).build() /** * Archive is on a separate page from manga info diff --git a/src/all/comico/build.gradle b/src/all/comico/build.gradle index b7c5ed101..849c8acae 100644 --- a/src/all/comico/build.gradle +++ b/src/all/comico/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Comico' extClass = '.ComicoFactory' - extVersionCode = 6 + extVersionCode = 7 isNsfw = true } diff --git a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt b/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt index a2a588134..2f52cc915 100644 --- a/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt +++ b/src/all/comico/src/eu/kanade/tachiyomi/extension/all/comico/Comico.kt @@ -62,7 +62,7 @@ open class Comico( this["Origin"] = baseUrl }.build() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .cookieJar( object : CookieJar { override fun saveFromResponse(url: HttpUrl, cookies: List) = diff --git a/src/all/holonometria/build.gradle b/src/all/holonometria/build.gradle index b4dfb1493..7f24782c9 100644 --- a/src/all/holonometria/build.gradle +++ b/src/all/holonometria/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'HOLONOMETRIA' extClass = '.HolonometriaFactory' - extVersionCode = 1 + extVersionCode = 2 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/all/holonometria/src/eu/kanade/tachiyomi/extension/all/holonometria/Holonometria.kt b/src/all/holonometria/src/eu/kanade/tachiyomi/extension/all/holonometria/Holonometria.kt index 89a6f1bb5..c9f80d7d1 100644 --- a/src/all/holonometria/src/eu/kanade/tachiyomi/extension/all/holonometria/Holonometria.kt +++ b/src/all/holonometria/src/eu/kanade/tachiyomi/extension/all/holonometria/Holonometria.kt @@ -26,7 +26,7 @@ class Holonometria( override val supportsLatest = false - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .readTimeout(60, TimeUnit.SECONDS) .build() diff --git a/src/all/izneo/build.gradle b/src/all/izneo/build.gradle index 6207ef0bc..0452d47e0 100644 --- a/src/all/izneo/build.gradle +++ b/src/all/izneo/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'izneo (webtoons)' extClass = '.IzneoFactory' - extVersionCode = 6 + extVersionCode = 7 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/all/izneo/src/eu/kanade/tachiyomi/extension/all/izneo/Izneo.kt b/src/all/izneo/src/eu/kanade/tachiyomi/extension/all/izneo/Izneo.kt index e25d1a1a9..0f9a91dfd 100644 --- a/src/all/izneo/src/eu/kanade/tachiyomi/extension/all/izneo/Izneo.kt +++ b/src/all/izneo/src/eu/kanade/tachiyomi/extension/all/izneo/Izneo.kt @@ -36,7 +36,7 @@ class Izneo(override val lang: String) : ConfigurableSource, HttpSource() { override val versionId = 2 - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(ImageInterceptor).build() private val apiUrl = "$ORIGIN/$lang/api/catalog/detail/webtoon" diff --git a/src/all/kiutaku/build.gradle b/src/all/kiutaku/build.gradle index 4abcf0183..79c5610f4 100644 --- a/src/all/kiutaku/build.gradle +++ b/src/all/kiutaku/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Kiutaku' extClass = '.Kiutaku' - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/all/kiutaku/src/eu/kanade/tachiyomi/extension/all/kiutaku/Kiutaku.kt b/src/all/kiutaku/src/eu/kanade/tachiyomi/extension/all/kiutaku/Kiutaku.kt index 436cccfc2..9597d775c 100644 --- a/src/all/kiutaku/src/eu/kanade/tachiyomi/extension/all/kiutaku/Kiutaku.kt +++ b/src/all/kiutaku/src/eu/kanade/tachiyomi/extension/all/kiutaku/Kiutaku.kt @@ -31,7 +31,7 @@ class Kiutaku : ParsedHttpSource() { override val supportsLatest = true override val client by lazy { - network.client.newBuilder() + network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 2) .build() } diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt index 3db6c9b1c..644a9eea1 100644 --- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt +++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt @@ -85,7 +85,7 @@ open class Komga(private val suffix: String = "") : ConfigurableSource, Unmetere .set("User-Agent", "TachiyomiKomga/${AppInfo.getVersionName()}") override val client: OkHttpClient = - network.client.newBuilder() + network.cloudflareClient.newBuilder() .authenticator { _, response -> if (response.request.header("Authorization") != null) { null // Give up, we've already failed to authenticate. diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index fd4c71406..fffff4169 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'MangaDex' extClass = '.MangaDexFactory' - extVersionCode = 200 + extVersionCode = 201 isNsfw = true } diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt index fc3fb56a7..6fdfbdaec 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt @@ -71,9 +71,9 @@ abstract class MangaDex(final override val lang: String, private val dexLang: St return builder } - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .rateLimit(3) - .addInterceptor(MdAtHomeReportInterceptor(network.client, headers)) + .addInterceptor(MdAtHomeReportInterceptor(network.cloudflareClient, headers)) .build() // Popular manga section diff --git a/src/all/mangahosted/build.gradle b/src/all/mangahosted/build.gradle index f2fb40324..91afe91f0 100644 --- a/src/all/mangahosted/build.gradle +++ b/src/all/mangahosted/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Manga Hosted' extClass = '.MangaHostedFactory' - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/all/mangahosted/src/eu/kanade/tachiyomi/extension/all/mangahosted/MangaHosted.kt b/src/all/mangahosted/src/eu/kanade/tachiyomi/extension/all/mangahosted/MangaHosted.kt index 3c6bd55f1..348a28757 100644 --- a/src/all/mangahosted/src/eu/kanade/tachiyomi/extension/all/mangahosted/MangaHosted.kt +++ b/src/all/mangahosted/src/eu/kanade/tachiyomi/extension/all/mangahosted/MangaHosted.kt @@ -32,7 +32,7 @@ class MangaHosted(private val langOption: LanguageOption) : HttpSource() { private val json: Json by injectLazy() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .rateLimit(2) .build() diff --git a/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt b/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt index 64c3f7ea5..6297af091 100644 --- a/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt +++ b/src/all/mangaplus/src/eu/kanade/tachiyomi/extension/all/mangaplus/MangaPlus.kt @@ -53,7 +53,7 @@ class MangaPlus( .add("User-Agent", USER_AGENT) .add("SESSION-TOKEN", UUID.randomUUID().toString()) - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(::imageIntercept) .addInterceptor(::thumbnailIntercept) .rateLimitHost(API_URL.toHttpUrl(), 1) diff --git a/src/all/mangatoon/build.gradle b/src/all/mangatoon/build.gradle index 4ccbf7c4a..b63f55382 100644 --- a/src/all/mangatoon/build.gradle +++ b/src/all/mangatoon/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'MangaToon (Limited)' extClass = '.MangaToonFactory' - extVersionCode = 5 + extVersionCode = 6 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt b/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt index 5e73af0a8..f7446f209 100644 --- a/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt +++ b/src/all/mangatoon/src/eu/kanade/tachiyomi/extension/all/mangatoon/MangaToon.kt @@ -34,7 +34,7 @@ open class MangaToon( override val supportsLatest = true - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimit(1, 1, TimeUnit.SECONDS) .build() diff --git a/src/all/mangaup/build.gradle b/src/all/mangaup/build.gradle index 352f5238e..55345aca6 100644 --- a/src/all/mangaup/build.gradle +++ b/src/all/mangaup/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Manga UP!' extClass = '.MangaUpFactory' - extVersionCode = 3 + extVersionCode = 4 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt b/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt index 16d85b1fb..ad601f3f6 100644 --- a/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt +++ b/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt @@ -32,7 +32,7 @@ class MangaUp(override val lang: String) : HttpSource() { .add("Referer", baseUrl) .add("User-Agent", USER_AGENT) - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(::thumbnailIntercept) .rateLimitHost(API_URL.toHttpUrl(), 1) .rateLimitHost(baseUrl.toHttpUrl(), 2) diff --git a/src/all/mango/build.gradle b/src/all/mango/build.gradle index 2e60f3a7b..ff1909a25 100644 --- a/src/all/mango/build.gradle +++ b/src/all/mango/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Mango' extClass = '.Mango' - extVersionCode = 10 + extVersionCode = 11 } apply from: "$rootDir/common.gradle" diff --git a/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt b/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt index 7d1d1e4e9..24711aece 100644 --- a/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt +++ b/src/all/mango/src/eu/kanade/tachiyomi/extension/all/mango/Mango.kt @@ -215,7 +215,7 @@ class Mango : ConfigurableSource, UnmeteredSource, HttpSource() { private val preferences: SharedPreferences by getPreferencesLazy() override val client: OkHttpClient = - network.client.newBuilder() + network.cloudflareClient.newBuilder() .dns(Dns.SYSTEM) .addInterceptor { authIntercept(it) } .build() diff --git a/src/all/namicomi/build.gradle b/src/all/namicomi/build.gradle index f6e973062..cda236f6c 100644 --- a/src/all/namicomi/build.gradle +++ b/src/all/namicomi/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'NamiComi' extClass = '.NamiComiFactory' - extVersionCode = 3 + extVersionCode = 4 isNsfw = false } diff --git a/src/all/namicomi/src/eu/kanade/tachiyomi/extension/all/namicomi/NamiComi.kt b/src/all/namicomi/src/eu/kanade/tachiyomi/extension/all/namicomi/NamiComi.kt index a25bb5fcc..25159224b 100644 --- a/src/all/namicomi/src/eu/kanade/tachiyomi/extension/all/namicomi/NamiComi.kt +++ b/src/all/namicomi/src/eu/kanade/tachiyomi/extension/all/namicomi/NamiComi.kt @@ -48,7 +48,7 @@ abstract class NamiComi(final override val lang: String, private val extLang: St set("Origin", baseUrl) } - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .rateLimit(3) .addNetworkInterceptor { chain -> val response = chain.proceed(chain.request()) diff --git a/src/all/tappytoon/build.gradle b/src/all/tappytoon/build.gradle index 866c0cd2d..f930b30a2 100644 --- a/src/all/tappytoon/build.gradle +++ b/src/all/tappytoon/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Tappytoon' extClass = '.TappytoonFactory' - extVersionCode = 7 + extVersionCode = 8 isNsfw = true } diff --git a/src/all/tappytoon/src/eu/kanade/tachiyomi/extension/all/tappytoon/Tappytoon.kt b/src/all/tappytoon/src/eu/kanade/tachiyomi/extension/all/tappytoon/Tappytoon.kt index 6e5f5d07d..5510f6727 100644 --- a/src/all/tappytoon/src/eu/kanade/tachiyomi/extension/all/tappytoon/Tappytoon.kt +++ b/src/all/tappytoon/src/eu/kanade/tachiyomi/extension/all/tappytoon/Tappytoon.kt @@ -31,7 +31,7 @@ class Tappytoon(override val lang: String) : HttpSource() { override val supportsLatest = true - override val client = network.client.newBuilder().addInterceptor { chain -> + override val client = network.cloudflareClient.newBuilder().addInterceptor { chain -> val res = chain.proceed(chain.request()) val mime = res.headers["Content-Type"] if (res.isSuccessful) { diff --git a/src/all/toomics/build.gradle b/src/all/toomics/build.gradle index 91cd33d23..011a74640 100644 --- a/src/all/toomics/build.gradle +++ b/src/all/toomics/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Toomics' extClass = '.ToomicsFactory' - extVersionCode = 8 + extVersionCode = 9 isNsfw = true } diff --git a/src/all/toomics/src/eu/kanade/tachiyomi/extension/all/toomics/ToomicsGlobal.kt b/src/all/toomics/src/eu/kanade/tachiyomi/extension/all/toomics/ToomicsGlobal.kt index 1c870f813..1fe3c75e1 100644 --- a/src/all/toomics/src/eu/kanade/tachiyomi/extension/all/toomics/ToomicsGlobal.kt +++ b/src/all/toomics/src/eu/kanade/tachiyomi/extension/all/toomics/ToomicsGlobal.kt @@ -43,7 +43,7 @@ abstract class ToomicsGlobal( private val json: Json by injectLazy() - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .connectTimeout(1, TimeUnit.MINUTES) .readTimeout(1, TimeUnit.MINUTES) .writeTimeout(1, TimeUnit.MINUTES) diff --git a/src/en/clowncorps/build.gradle b/src/en/clowncorps/build.gradle index 0a9ade80c..68abd53cd 100644 --- a/src/en/clowncorps/build.gradle +++ b/src/en/clowncorps/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Clown Corps' extClass = '.ClownCorps' - extVersionCode = 2 + extVersionCode = 3 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/clowncorps/src/eu/kanade/tachiyomi/extension/en/clowncorps/ClownCorps.kt b/src/en/clowncorps/src/eu/kanade/tachiyomi/extension/en/clowncorps/ClownCorps.kt index fbe5c85ca..57ba4ef17 100644 --- a/src/en/clowncorps/src/eu/kanade/tachiyomi/extension/en/clowncorps/ClownCorps.kt +++ b/src/en/clowncorps/src/eu/kanade/tachiyomi/extension/en/clowncorps/ClownCorps.kt @@ -34,7 +34,7 @@ class ClownCorps : ConfigurableSource, HttpSource() { override val name = "Clown Corps" override val supportsLatest = false - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(TextInterceptor()) .build() diff --git a/src/en/digitalcomicmuseum/build.gradle b/src/en/digitalcomicmuseum/build.gradle index 76341e94e..fd0112f82 100644 --- a/src/en/digitalcomicmuseum/build.gradle +++ b/src/en/digitalcomicmuseum/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Digital Comic Museum' extClass = '.DigitalComicMuseum' - extVersionCode = 2 + extVersionCode = 3 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/digitalcomicmuseum/src/eu/kanade/tachiyomi/extension/en/digitalcomicmuseum/DigitalComicMuseum.kt b/src/en/digitalcomicmuseum/src/eu/kanade/tachiyomi/extension/en/digitalcomicmuseum/DigitalComicMuseum.kt index 5c29e18ad..4fe3c790b 100644 --- a/src/en/digitalcomicmuseum/src/eu/kanade/tachiyomi/extension/en/digitalcomicmuseum/DigitalComicMuseum.kt +++ b/src/en/digitalcomicmuseum/src/eu/kanade/tachiyomi/extension/en/digitalcomicmuseum/DigitalComicMuseum.kt @@ -24,7 +24,7 @@ class DigitalComicMuseum() : ParsedHttpSource() { override val name = "Digital Comic Museum" override val supportsLatest = true - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(::errorIntercept) .build() diff --git a/src/en/grrlpower/build.gradle b/src/en/grrlpower/build.gradle index c26594654..95dadf732 100644 --- a/src/en/grrlpower/build.gradle +++ b/src/en/grrlpower/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Grrl Power Comic' extClass = '.GrrlPower' - extVersionCode = 3 + extVersionCode = 4 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt b/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt index 7e518f5c3..186c2b593 100644 --- a/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt +++ b/src/en/grrlpower/src/eu/kanade/tachiyomi/extension/en/grrlpower/GrrlPower.kt @@ -36,7 +36,7 @@ class GrrlPower( private val currentYear = Calendar.getInstance().get(Calendar.YEAR) private val dateFormat = SimpleDateFormat("MMM dd yyyy", Locale.US) - override val client = super.client.newBuilder().addInterceptor(TextInterceptor()).build() + override val client = network.cloudflareClient.newBuilder().addInterceptor(TextInterceptor()).build() override fun fetchPopularManga(page: Int): Observable = Observable.just( MangasPage( diff --git a/src/en/hentaidexy/build.gradle b/src/en/hentaidexy/build.gradle index 77515056e..407829169 100644 --- a/src/en/hentaidexy/build.gradle +++ b/src/en/hentaidexy/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Hentaidexy' extClass = '.Hentaidexy' - extVersionCode = 33 + extVersionCode = 34 isNsfw = true } diff --git a/src/en/hentaidexy/src/eu/kanade/tachiyomi/extension/en/hentaidexy/Hentaidexy.kt b/src/en/hentaidexy/src/eu/kanade/tachiyomi/extension/en/hentaidexy/Hentaidexy.kt index cc0c59b0b..79bbe9c46 100644 --- a/src/en/hentaidexy/src/eu/kanade/tachiyomi/extension/en/hentaidexy/Hentaidexy.kt +++ b/src/en/hentaidexy/src/eu/kanade/tachiyomi/extension/en/hentaidexy/Hentaidexy.kt @@ -34,7 +34,7 @@ class Hentaidexy : HttpSource() { private val json: Json by injectLazy() - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 1) .build() diff --git a/src/en/madokami/build.gradle b/src/en/madokami/build.gradle index 01ad52097..9571402e7 100644 --- a/src/en/madokami/build.gradle +++ b/src/en/madokami/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Madokami' extClass = '.Madokami' - extVersionCode = 10 + extVersionCode = 11 } apply from: "$rootDir/common.gradle" diff --git a/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt b/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt index aad64bfb4..1ec6ffb2f 100644 --- a/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt +++ b/src/en/madokami/src/eu/kanade/tachiyomi/extension/en/madokami/Madokami.kt @@ -47,7 +47,7 @@ class Madokami : ConfigurableSource, ParsedHttpSource() { return request.newBuilder().header("Authorization", credential).build() } - override val client: OkHttpClient = super.client.newBuilder().addInterceptor { chain -> + override val client: OkHttpClient = network.cloudflareClient.newBuilder().addInterceptor { chain -> val response = chain.proceed(chain.request()) if (response.code == 401) throw IOException("You are currently logged out.\nGo to Extensions > Details to input your credentials.") response diff --git a/src/en/mangamo/build.gradle b/src/en/mangamo/build.gradle index be76c930f..8eaf7b13e 100644 --- a/src/en/mangamo/build.gradle +++ b/src/en/mangamo/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Mangamo' extClass = '.Mangamo' - extVersionCode = 3 + extVersionCode = 4 isNsfw = false } diff --git a/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/Mangamo.kt b/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/Mangamo.kt index 55b0d107d..5a52df3fd 100644 --- a/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/Mangamo.kt +++ b/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/Mangamo.kt @@ -82,7 +82,7 @@ class Mangamo : ConfigurableSource, HttpSource() { private val exclusivesOnlyPref get() = preferences.getStringSet(MangamoConstants.EXCLUSIVES_ONLY_PREF, setOf())!! - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addNetworkInterceptor { val request = it.request() val response = it.proceed(request) diff --git a/src/en/mangaplanet/build.gradle b/src/en/mangaplanet/build.gradle index 4a66a5d08..ed5856cd4 100644 --- a/src/en/mangaplanet/build.gradle +++ b/src/en/mangaplanet/build.gradle @@ -1,7 +1,7 @@ ext { extName = "Manga Planet" extClass = ".MangaPlanet" - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/en/mangaplanet/src/eu/kanade/tachiyomi/extension/en/mangaplanet/MangaPlanet.kt b/src/en/mangaplanet/src/eu/kanade/tachiyomi/extension/en/mangaplanet/MangaPlanet.kt index 791009e19..0c124e58d 100644 --- a/src/en/mangaplanet/src/eu/kanade/tachiyomi/extension/en/mangaplanet/MangaPlanet.kt +++ b/src/en/mangaplanet/src/eu/kanade/tachiyomi/extension/en/mangaplanet/MangaPlanet.kt @@ -34,7 +34,7 @@ class MangaPlanet : ParsedHttpSource() { // No need to be lazy if you're going to use it immediately below. private val json = Injekt.get() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(SpeedBinbInterceptor(json)) .addNetworkInterceptor(CookieInterceptor(baseUrl.toHttpUrl().host, "mpaconf" to "18")) .build() diff --git a/src/en/manta/build.gradle b/src/en/manta/build.gradle index fbd3b2431..faec1b3e2 100644 --- a/src/en/manta/build.gradle +++ b/src/en/manta/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Manta Comics' extClass = '.MantaComics' - extVersionCode = 4 + extVersionCode = 5 } apply from: "$rootDir/common.gradle" diff --git a/src/en/manta/src/eu/kanade/tachiyomi/extension/en/manta/MantaComics.kt b/src/en/manta/src/eu/kanade/tachiyomi/extension/en/manta/MantaComics.kt index bac40441e..11e86925d 100644 --- a/src/en/manta/src/eu/kanade/tachiyomi/extension/en/manta/MantaComics.kt +++ b/src/en/manta/src/eu/kanade/tachiyomi/extension/en/manta/MantaComics.kt @@ -29,7 +29,7 @@ class MantaComics : HttpSource() { private var token: String? = null - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .cookieJar( object : CookieJar { override fun saveFromResponse(url: HttpUrl, cookies: List) { diff --git a/src/en/questionablecontent/build.gradle b/src/en/questionablecontent/build.gradle index 3ab9d456f..8e5f7efda 100644 --- a/src/en/questionablecontent/build.gradle +++ b/src/en/questionablecontent/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Questionable Content' extClass = '.QuestionableContent' - extVersionCode = 8 + extVersionCode = 9 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt b/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt index c21601e1f..9613392c7 100644 --- a/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt +++ b/src/en/questionablecontent/src/eu/kanade/tachiyomi/extension/en/questionablecontent/QuestionableContent.kt @@ -29,7 +29,7 @@ class QuestionableContent : ParsedHttpSource(), ConfigurableSource { override val lang = "en" override val supportsLatest = false - override val client: OkHttpClient = super.client.newBuilder().addInterceptor(TextInterceptor()).build() + override val client: OkHttpClient = network.cloudflareClient.newBuilder().addInterceptor(TextInterceptor()).build() override fun fetchPopularManga(page: Int): Observable { val manga = SManga.create().apply { diff --git a/src/en/tapastic/build.gradle b/src/en/tapastic/build.gradle index e213995df..cd294e9e6 100644 --- a/src/en/tapastic/build.gradle +++ b/src/en/tapastic/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Tapas' extClass = '.Tapastic' - extVersionCode = 21 + extVersionCode = 22 isNsfw = true } diff --git a/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt b/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt index 51d026c95..4de1c906e 100644 --- a/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt +++ b/src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt @@ -51,7 +51,7 @@ class Tapastic : ConfigurableSource, ParsedHttpSource() { private val webViewCookieManager: CookieManager by lazy { CookieManager.getInstance() } - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .cookieJar( // Syncs okhttp with webview cookies, allowing logged-in users do logged-in stuff object : CookieJar { diff --git a/src/en/vizshonenjump/build.gradle b/src/en/vizshonenjump/build.gradle index 835453ea2..af9b43d71 100644 --- a/src/en/vizshonenjump/build.gradle +++ b/src/en/vizshonenjump/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'VIZ' extClass = '.VizFactory' - extVersionCode = 20 + extVersionCode = 21 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/Viz.kt b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/Viz.kt index b648b5162..51e57bb2f 100644 --- a/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/Viz.kt +++ b/src/en/vizshonenjump/src/eu/kanade/tachiyomi/extension/en/vizshonenjump/Viz.kt @@ -38,7 +38,7 @@ open class Viz( override val supportsLatest = true - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(::headersIntercept) .addInterceptor(::authCheckIntercept) .addInterceptor(::authChapterCheckIntercept) diff --git a/src/es/ravenmanga/build.gradle b/src/es/ravenmanga/build.gradle index b1fa5542a..6a103cd21 100644 --- a/src/es/ravenmanga/build.gradle +++ b/src/es/ravenmanga/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'RavenManga' extClass = '.RavenManga' - extVersionCode = 3 + extVersionCode = 4 isNsfw = false } diff --git a/src/es/ravenmanga/src/eu/kanade/tachiyomi/extension/es/ravenmanga/RavenManga.kt b/src/es/ravenmanga/src/eu/kanade/tachiyomi/extension/es/ravenmanga/RavenManga.kt index 737dc39bf..3a01f3145 100644 --- a/src/es/ravenmanga/src/eu/kanade/tachiyomi/extension/es/ravenmanga/RavenManga.kt +++ b/src/es/ravenmanga/src/eu/kanade/tachiyomi/extension/es/ravenmanga/RavenManga.kt @@ -37,7 +37,7 @@ class RavenManga : ParsedHttpSource() { override val supportsLatest = true - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 2) .build() diff --git a/src/ja/comicmeteor/build.gradle b/src/ja/comicmeteor/build.gradle index 6264d98db..4512f2a5e 100644 --- a/src/ja/comicmeteor/build.gradle +++ b/src/ja/comicmeteor/build.gradle @@ -1,7 +1,8 @@ ext { extName = "Comic Meteor" extClass = ".ComicMeteor" - extVersionCode = 1 + extVersionCode = 2 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/ja/comicmeteor/src/eu/kanade/tachiyomi/extension/ja/comicmeteor/ComicMeteor.kt b/src/ja/comicmeteor/src/eu/kanade/tachiyomi/extension/ja/comicmeteor/ComicMeteor.kt index 77474db8b..89ef2c5e8 100644 --- a/src/ja/comicmeteor/src/eu/kanade/tachiyomi/extension/ja/comicmeteor/ComicMeteor.kt +++ b/src/ja/comicmeteor/src/eu/kanade/tachiyomi/extension/ja/comicmeteor/ComicMeteor.kt @@ -33,7 +33,7 @@ class ComicMeteor : ParsedHttpSource() { private val json = Injekt.get() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(SpeedBinbInterceptor(json)) .apply { val interceptors = interceptors() diff --git a/src/ja/gaugaumonsterplus/build.gradle b/src/ja/gaugaumonsterplus/build.gradle index 031e3a0b5..422908de7 100644 --- a/src/ja/gaugaumonsterplus/build.gradle +++ b/src/ja/gaugaumonsterplus/build.gradle @@ -1,7 +1,8 @@ ext { extName = "Gaugau Monster Plus" extClass = ".GaugauMonsterPlus" - extVersionCode = 1 + extVersionCode = 2 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/ja/gaugaumonsterplus/src/eu/kanade/tachiyomi/extension/ja/gaugaumonsterplus/GaugauMonsterPlus.kt b/src/ja/gaugaumonsterplus/src/eu/kanade/tachiyomi/extension/ja/gaugaumonsterplus/GaugauMonsterPlus.kt index 45044e6af..4aa812043 100644 --- a/src/ja/gaugaumonsterplus/src/eu/kanade/tachiyomi/extension/ja/gaugaumonsterplus/GaugauMonsterPlus.kt +++ b/src/ja/gaugaumonsterplus/src/eu/kanade/tachiyomi/extension/ja/gaugaumonsterplus/GaugauMonsterPlus.kt @@ -28,7 +28,7 @@ class GaugauMonsterPlus : ParsedHttpSource() { private val json = Injekt.get() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(SpeedBinbInterceptor(json)) .build() diff --git a/src/ja/kadocomi/build.gradle b/src/ja/kadocomi/build.gradle index 253d371e9..9720b3061 100644 --- a/src/ja/kadocomi/build.gradle +++ b/src/ja/kadocomi/build.gradle @@ -1,7 +1,8 @@ ext { extName = "KadoComi" extClass = ".KadoComi" - extVersionCode = 1 + extVersionCode = 2 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/ja/kadocomi/src/eu/kanade/tachiyomi/extension/ja/kadocomi/KadoComi.kt b/src/ja/kadocomi/src/eu/kanade/tachiyomi/extension/ja/kadocomi/KadoComi.kt index 2965de55c..d11850e0c 100644 --- a/src/ja/kadocomi/src/eu/kanade/tachiyomi/extension/ja/kadocomi/KadoComi.kt +++ b/src/ja/kadocomi/src/eu/kanade/tachiyomi/extension/ja/kadocomi/KadoComi.kt @@ -54,7 +54,7 @@ class KadoComi : HttpSource() { } } - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addNetworkInterceptor(imageDescrambler) .build() diff --git a/src/ja/nicovideoseiga/build.gradle b/src/ja/nicovideoseiga/build.gradle index 23ffbf492..9e78d989c 100644 --- a/src/ja/nicovideoseiga/build.gradle +++ b/src/ja/nicovideoseiga/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Nicovideo Seiga' extClass = '.NicovideoSeiga' - extVersionCode = 6 + extVersionCode = 7 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/ja/nicovideoseiga/src/eu/kanade/tachiyomi/extension/ja/nicovideoseiga/NicovideoSeiga.kt b/src/ja/nicovideoseiga/src/eu/kanade/tachiyomi/extension/ja/nicovideoseiga/NicovideoSeiga.kt index f8a11db9e..f21a2c4c4 100644 --- a/src/ja/nicovideoseiga/src/eu/kanade/tachiyomi/extension/ja/nicovideoseiga/NicovideoSeiga.kt +++ b/src/ja/nicovideoseiga/src/eu/kanade/tachiyomi/extension/ja/nicovideoseiga/NicovideoSeiga.kt @@ -26,7 +26,7 @@ class NicovideoSeiga : HttpSource() { override val lang: String = "ja" override val name: String = "Nicovideo Seiga" override val supportsLatest: Boolean = false - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(::imageIntercept) .build() override val versionId: Int = 2 diff --git a/src/ja/ohtawebcomic/build.gradle b/src/ja/ohtawebcomic/build.gradle index fbd61a0fe..3346f86d8 100644 --- a/src/ja/ohtawebcomic/build.gradle +++ b/src/ja/ohtawebcomic/build.gradle @@ -1,7 +1,7 @@ ext { extName = "Ohta Web Comic" extClass = ".OhtaWebComic" - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/ja/ohtawebcomic/src/eu/kanade/tachiyomi/extension/ja/ohtawebcomic/OhtaWebComic.kt b/src/ja/ohtawebcomic/src/eu/kanade/tachiyomi/extension/ja/ohtawebcomic/OhtaWebComic.kt index 23f0b5455..6bfcd952f 100644 --- a/src/ja/ohtawebcomic/src/eu/kanade/tachiyomi/extension/ja/ohtawebcomic/OhtaWebComic.kt +++ b/src/ja/ohtawebcomic/src/eu/kanade/tachiyomi/extension/ja/ohtawebcomic/OhtaWebComic.kt @@ -31,7 +31,7 @@ class OhtaWebComic : ParsedHttpSource() { private val json = Injekt.get() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(SpeedBinbInterceptor(json)) .build() diff --git a/src/ja/rawinu/build.gradle b/src/ja/rawinu/build.gradle index ec0ec07f1..2fcb3ff49 100644 --- a/src/ja/rawinu/build.gradle +++ b/src/ja/rawinu/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.RawINU' themePkg = 'fmreader' baseUrl = 'https://rawinu.com' - overrideVersionCode = 1 + overrideVersionCode = 2 isNsfw = true } diff --git a/src/ja/rawinu/src/eu/kanade/tachiyomi/extension/ja/rawinu/RawINU.kt b/src/ja/rawinu/src/eu/kanade/tachiyomi/extension/ja/rawinu/RawINU.kt index 0eede805a..403c65721 100644 --- a/src/ja/rawinu/src/eu/kanade/tachiyomi/extension/ja/rawinu/RawINU.kt +++ b/src/ja/rawinu/src/eu/kanade/tachiyomi/extension/ja/rawinu/RawINU.kt @@ -20,7 +20,7 @@ class RawINU : FMReader( "https://rawinu.com", "ja", ) { - override val client = network.client.newBuilder() + override val client = super.client.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 2) .addInterceptor(::ddosChallengeInterceptor) .build() diff --git a/src/ja/yanmaga/build.gradle b/src/ja/yanmaga/build.gradle index 749c37e76..b0cfc7246 100644 --- a/src/ja/yanmaga/build.gradle +++ b/src/ja/yanmaga/build.gradle @@ -1,7 +1,7 @@ ext { extName = "Weekly Young Magazine" extClass = ".YanmagaFactory" - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/ja/yanmaga/src/eu/kanade/tachiyomi/extension/ja/yanmaga/Yanmaga.kt b/src/ja/yanmaga/src/eu/kanade/tachiyomi/extension/ja/yanmaga/Yanmaga.kt index 6c661fb47..eae0881d4 100644 --- a/src/ja/yanmaga/src/eu/kanade/tachiyomi/extension/ja/yanmaga/Yanmaga.kt +++ b/src/ja/yanmaga/src/eu/kanade/tachiyomi/extension/ja/yanmaga/Yanmaga.kt @@ -33,7 +33,7 @@ abstract class Yanmaga( protected val json = Injekt.get() - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(SpeedBinbInterceptor(json)) .build() diff --git a/src/ko/navercomic/build.gradle b/src/ko/navercomic/build.gradle index 7c33dafb1..5997fd112 100644 --- a/src/ko/navercomic/build.gradle +++ b/src/ko/navercomic/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Naver Comic' extClass = '.NaverComicFactory' - extVersionCode = 5 + extVersionCode = 6 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/ko/navercomic/src/eu/kanade/tachiyomi/extension/ko/navercomic/NaverComicBase.kt b/src/ko/navercomic/src/eu/kanade/tachiyomi/extension/ko/navercomic/NaverComicBase.kt index 22d2ba6d3..59894afc3 100644 --- a/src/ko/navercomic/src/eu/kanade/tachiyomi/extension/ko/navercomic/NaverComicBase.kt +++ b/src/ko/navercomic/src/eu/kanade/tachiyomi/extension/ko/navercomic/NaverComicBase.kt @@ -29,7 +29,7 @@ abstract class NaverComicBase(protected val mType: String) : ParsedHttpSource() override val baseUrl: String = "https://comic.naver.com" internal val mobileUrl = "https://m.comic.naver.com" override val supportsLatest = true - override val client: OkHttpClient = network.client + override val client: OkHttpClient = network.cloudflareClient internal val json: Json by injectLazy() private val mobileHeaders = super.headersBuilder() diff --git a/src/pt/bakai/build.gradle b/src/pt/bakai/build.gradle index a9ff1c4bd..fa5d6d3a1 100644 --- a/src/pt/bakai/build.gradle +++ b/src/pt/bakai/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Bakai' extClass = '.Bakai' - extVersionCode = 9 + extVersionCode = 10 isNsfw = true } diff --git a/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt b/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt index ab5e348d6..7577ecca8 100644 --- a/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt +++ b/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt @@ -46,7 +46,7 @@ class Bakai : ParsedHttpSource() { it.name.startsWith("ips4_") || it.path == searchPathSegment } - private val cookieJar = network.client.cookieJar + private val cookieJar = network.cloudflareClient.cookieJar override fun saveFromResponse(url: HttpUrl, cookies: List) = cookieJar.saveFromResponse(url, cookies.removeLimit()) diff --git a/src/pt/blackoutcomics/build.gradle b/src/pt/blackoutcomics/build.gradle index 58b7b926c..5fc1dd483 100644 --- a/src/pt/blackoutcomics/build.gradle +++ b/src/pt/blackoutcomics/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Blackout Comics' extClass = '.BlackoutComics' - extVersionCode = 7 + extVersionCode = 8 isNsfw = true } diff --git a/src/pt/blackoutcomics/src/eu/kanade/tachiyomi/extension/pt/blackoutcomics/BlackoutComics.kt b/src/pt/blackoutcomics/src/eu/kanade/tachiyomi/extension/pt/blackoutcomics/BlackoutComics.kt index 30303ea53..3935bfa21 100644 --- a/src/pt/blackoutcomics/src/eu/kanade/tachiyomi/extension/pt/blackoutcomics/BlackoutComics.kt +++ b/src/pt/blackoutcomics/src/eu/kanade/tachiyomi/extension/pt/blackoutcomics/BlackoutComics.kt @@ -39,7 +39,7 @@ class BlackoutComics : ParsedHttpSource(), ConfigurableSource { override val supportsLatest = true override val client by lazy { - network.client.newBuilder() + network.cloudflareClient.newBuilder() .addInterceptor { chain -> checkingCredentials() diff --git a/src/pt/bruttal/build.gradle b/src/pt/bruttal/build.gradle index 8a45e7212..fff8641ae 100644 --- a/src/pt/bruttal/build.gradle +++ b/src/pt/bruttal/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Bruttal' extClass = '.Bruttal' - extVersionCode = 6 + extVersionCode = 7 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt b/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt index 4e6a09f94..f90bcd761 100644 --- a/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt +++ b/src/pt/bruttal/src/eu/kanade/tachiyomi/extension/pt/bruttal/Bruttal.kt @@ -30,7 +30,7 @@ class Bruttal : HttpSource() { override val supportsLatest = false - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimit(1, 2, TimeUnit.SECONDS) .build() diff --git a/src/pt/maidsecret/build.gradle b/src/pt/maidsecret/build.gradle index ac14844c7..4c1d9bed7 100644 --- a/src/pt/maidsecret/build.gradle +++ b/src/pt/maidsecret/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.MaidSecret' themePkg = 'madara' baseUrl = 'https://maidsecret.com' - overrideVersionCode = 0 + overrideVersionCode = 1 isNsfw = true } diff --git a/src/pt/maidsecret/src/eu/kanade/tachiyomi/extension/pt/maidsecret/MaidSecret.kt b/src/pt/maidsecret/src/eu/kanade/tachiyomi/extension/pt/maidsecret/MaidSecret.kt index e76a39cdb..9a55461b7 100644 --- a/src/pt/maidsecret/src/eu/kanade/tachiyomi/extension/pt/maidsecret/MaidSecret.kt +++ b/src/pt/maidsecret/src/eu/kanade/tachiyomi/extension/pt/maidsecret/MaidSecret.kt @@ -14,7 +14,7 @@ class MaidSecret : Madara( ) { override val useNewChapterEndpoint = true - override val client = network.client.newBuilder() + override val client = super.client.newBuilder() .rateLimit(1, 2, TimeUnit.SECONDS) .build() } diff --git a/src/ru/acomics/build.gradle b/src/ru/acomics/build.gradle index f5197143e..9eb0ef671 100644 --- a/src/ru/acomics/build.gradle +++ b/src/ru/acomics/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'AComics' extClass = '.AComics' - extVersionCode = 5 + extVersionCode = 6 isNsfw = true } diff --git a/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt b/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt index 3e484cb9e..5c3136724 100644 --- a/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt +++ b/src/ru/acomics/src/eu/kanade/tachiyomi/extension/ru/acomics/AComics.kt @@ -22,7 +22,7 @@ class AComics : ParsedHttpSource() { override val lang = "ru" - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addNetworkInterceptor { chain -> val newReq = chain .request() diff --git a/src/ru/unicomics/build.gradle b/src/ru/unicomics/build.gradle index c4aba85b9..2179eaaee 100644 --- a/src/ru/unicomics/build.gradle +++ b/src/ru/unicomics/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'UniComics' extClass = '.UniComics' - extVersionCode = 6 + extVersionCode = 7 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt index 025b20903..c051d570a 100644 --- a/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt +++ b/src/ru/unicomics/src/eu/kanade/tachiyomi/extension/ru/unicomics/UniComics.kt @@ -31,7 +31,7 @@ class UniComics : ParsedHttpSource() { override val supportsLatest = true - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .connectTimeout(10, TimeUnit.SECONDS) .readTimeout(30, TimeUnit.SECONDS) .rateLimit(3) diff --git a/src/uk/honeymanga/build.gradle b/src/uk/honeymanga/build.gradle index 64e46952d..3843ffa3f 100644 --- a/src/uk/honeymanga/build.gradle +++ b/src/uk/honeymanga/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'HoneyManga' extClass = '.HoneyManga' - extVersionCode = 4 + extVersionCode = 5 isNsfw = true } diff --git a/src/uk/honeymanga/src/eu/kanade/tachiyomi/extension/uk/honeymanga/HoneyManga.kt b/src/uk/honeymanga/src/eu/kanade/tachiyomi/extension/uk/honeymanga/HoneyManga.kt index 2617dfce7..d765b95f8 100644 --- a/src/uk/honeymanga/src/eu/kanade/tachiyomi/extension/uk/honeymanga/HoneyManga.kt +++ b/src/uk/honeymanga/src/eu/kanade/tachiyomi/extension/uk/honeymanga/HoneyManga.kt @@ -39,7 +39,7 @@ class HoneyManga : HttpSource() { .add("Origin", baseUrl) .add("Referer", baseUrl) - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .rateLimitHost(API_URL.toHttpUrl(), 10) .build() diff --git a/src/zh/cartoon18/build.gradle b/src/zh/cartoon18/build.gradle index 0757438bc..8be8e2ff8 100644 --- a/src/zh/cartoon18/build.gradle +++ b/src/zh/cartoon18/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Cartoon18' extClass = '.Cartoon18' - extVersionCode = 3 + extVersionCode = 4 isNsfw = true } diff --git a/src/zh/cartoon18/src/eu/kanade/tachiyomi/extension/zh/cartoon18/Cartoon18.kt b/src/zh/cartoon18/src/eu/kanade/tachiyomi/extension/zh/cartoon18/Cartoon18.kt index 9df3ad108..4cebee497 100644 --- a/src/zh/cartoon18/src/eu/kanade/tachiyomi/extension/zh/cartoon18/Cartoon18.kt +++ b/src/zh/cartoon18/src/eu/kanade/tachiyomi/extension/zh/cartoon18/Cartoon18.kt @@ -31,7 +31,7 @@ class Cartoon18 : HttpSource(), ConfigurableSource { private val baseUrlWithLang get() = if (useTrad) baseUrl else "$baseUrl/zh-hans" - override val client = network.client.newBuilder().followRedirects(false).build() + override val client = network.cloudflareClient.newBuilder().followRedirects(false).build() override fun headersBuilder() = super.headersBuilder() .add("Referer", "$baseUrl/") diff --git a/src/zh/dm5/build.gradle b/src/zh/dm5/build.gradle index 1e3f6ecbd..985813afb 100644 --- a/src/zh/dm5/build.gradle +++ b/src/zh/dm5/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Dm5' extClass = '.Dm5' - extVersionCode = 3 + extVersionCode = 4 isNsfw = true } diff --git a/src/zh/dm5/src/eu/kanade/tachiyomi/extension/zh/dm5/Dm5.kt b/src/zh/dm5/src/eu/kanade/tachiyomi/extension/zh/dm5/Dm5.kt index 8df782fd8..4c24cacea 100644 --- a/src/zh/dm5/src/eu/kanade/tachiyomi/extension/zh/dm5/Dm5.kt +++ b/src/zh/dm5/src/eu/kanade/tachiyomi/extension/zh/dm5/Dm5.kt @@ -27,7 +27,7 @@ class Dm5 : ParsedHttpSource(), ConfigurableSource { override val supportsLatest = true override val name = "动漫屋" override val baseUrl = "https://www.dm5.cn" - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(CommentsInterceptor) .build() diff --git a/src/zh/dmzj/build.gradle b/src/zh/dmzj/build.gradle index cc5465585..b894debeb 100644 --- a/src/zh/dmzj/build.gradle +++ b/src/zh/dmzj/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'DMZJ' extClass = '.Dmzj' - extVersionCode = 43 + extVersionCode = 44 } apply from: "$rootDir/common.gradle" diff --git a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt index bb0c26174..a57e3dc36 100644 --- a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt +++ b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt @@ -29,7 +29,7 @@ class Dmzj : ConfigurableSource, HttpSource() { private val preferences: SharedPreferences = getPreferences() - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor(ImageUrlInterceptor) .addInterceptor(CommentsInterceptor) .rateLimit(4) @@ -43,7 +43,7 @@ class Dmzj : ConfigurableSource, HttpSource() { .build() // API v4 randomly fails - private val retryClient = network.client.newBuilder() + private val retryClient = network.cloudflareClient.newBuilder() .addInterceptor(RetryInterceptor) .rateLimit(2) .build() diff --git a/src/zh/mangabz/build.gradle b/src/zh/mangabz/build.gradle index 97fc0679c..30dfc5e82 100644 --- a/src/zh/mangabz/build.gradle +++ b/src/zh/mangabz/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Mangabz' extClass = '.Mangabz' - extVersionCode = 9 + extVersionCode = 10 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt b/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt index c2d8beb8f..1dba8fc31 100644 --- a/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt +++ b/src/zh/mangabz/src/eu/kanade/tachiyomi/extension/zh/mangabz/Mangabz.kt @@ -38,7 +38,7 @@ class Mangabz : MangabzTheme("Mangabz"), ConfigurableSource { urlSuffix = mirror.urlSuffix val cookieInterceptor = CookieInterceptor(mirror.domain, mirror.langCookie to preferences.lang) - client = network.client.newBuilder() + client = network.cloudflareClient.newBuilder() .rateLimit(5) .addNetworkInterceptor(cookieInterceptor) .build() diff --git a/src/zh/manhuagui/build.gradle b/src/zh/manhuagui/build.gradle index 8a802f1c9..8cbfb0593 100644 --- a/src/zh/manhuagui/build.gradle +++ b/src/zh/manhuagui/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'ManHuaGui' extClass = '.Manhuagui' - extVersionCode = 23 + extVersionCode = 24 + isNsfw = true } apply from: "$rootDir/common.gradle" diff --git a/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt b/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt index 2c7fb079c..afcd9edfa 100644 --- a/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt +++ b/src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt @@ -71,14 +71,14 @@ class Manhuagui( // Add rate limit to fix manga thumbnail load failure override val client: OkHttpClient = if (getShowR18()) { - network.client.newBuilder() + network.cloudflareClient.newBuilder() .rateLimitHost(baseHttpUrl, preferences.getString(MAINSITE_RATELIMIT_PREF, MAINSITE_RATELIMIT_DEFAULT_VALUE)!!.toInt(), 10) .rateLimitHost(imageServer[0].toHttpUrl(), preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_DEFAULT_VALUE)!!.toInt()) .rateLimitHost(imageServer[1].toHttpUrl(), preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_DEFAULT_VALUE)!!.toInt()) .addNetworkInterceptor(AddCookieHeaderInterceptor(baseHttpUrl.host)) .build() } else { - network.client.newBuilder() + network.cloudflareClient.newBuilder() .rateLimitHost(baseHttpUrl, preferences.getString(MAINSITE_RATELIMIT_PREF, MAINSITE_RATELIMIT_DEFAULT_VALUE)!!.toInt(), 10) .rateLimitHost(imageServer[0].toHttpUrl(), preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_DEFAULT_VALUE)!!.toInt()) .rateLimitHost(imageServer[1].toHttpUrl(), preferences.getString(IMAGE_CDN_RATELIMIT_PREF, IMAGE_CDN_RATELIMIT_DEFAULT_VALUE)!!.toInt()) diff --git a/src/zh/manhuaren/build.gradle b/src/zh/manhuaren/build.gradle index 14b0514a6..ad1bb3c7a 100644 --- a/src/zh/manhuaren/build.gradle +++ b/src/zh/manhuaren/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Manhuaren' extClass = '.Manhuaren' - extVersionCode = 16 + extVersionCode = 17 } apply from: "$rootDir/common.gradle" diff --git a/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt b/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt index 57d71a4a9..ac445d0d0 100644 --- a/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt +++ b/src/zh/manhuaren/src/eu/kanade/tachiyomi/extension/zh/manhuaren/Manhuaren.kt @@ -61,7 +61,7 @@ class Manhuaren : HttpSource(), ConfigurableSource { private var userId: String = preferences.getString(USER_ID_PREF, null) ?: "-1" private val lastUsedTime: String by lazy { generateLastUsedTime() } - override val client: OkHttpClient = network.client + override val client: OkHttpClient = network.cloudflareClient .newBuilder() .apply { interceptors().removeAll { it.javaClass.simpleName == "BrotliInterceptor" } } .addInterceptor(ErrorResponseInterceptor(baseUrl, preferences)) diff --git a/src/zh/manwa/build.gradle b/src/zh/manwa/build.gradle index af2fd3efe..3e26bded5 100644 --- a/src/zh/manwa/build.gradle +++ b/src/zh/manwa/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Manwa' extClass = '.Manwa' - extVersionCode = 9 + extVersionCode = 10 isNsfw = true } diff --git a/src/zh/manwa/src/eu/kanade/tachiyomi/extension/zh/manwa/Manwa.kt b/src/zh/manwa/src/eu/kanade/tachiyomi/extension/zh/manwa/Manwa.kt index 0dec1bd2c..2e643c2a4 100644 --- a/src/zh/manwa/src/eu/kanade/tachiyomi/extension/zh/manwa/Manwa.kt +++ b/src/zh/manwa/src/eu/kanade/tachiyomi/extension/zh/manwa/Manwa.kt @@ -63,7 +63,7 @@ class Manwa : ParsedHttpSource(), ConfigurableSource { } } - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addNetworkInterceptor(rewriteOctetStream) .build() diff --git a/src/zh/vomic/build.gradle b/src/zh/vomic/build.gradle index bed2e57d9..831a40cf4 100644 --- a/src/zh/vomic/build.gradle +++ b/src/zh/vomic/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'vomic' extClass = '.Vomic' - extVersionCode = 5 + extVersionCode = 6 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/zh/vomic/src/eu/kanade/tachiyomi/extension/zh/vomic/Vomic.kt b/src/zh/vomic/src/eu/kanade/tachiyomi/extension/zh/vomic/Vomic.kt index c9260d5eb..85e13363c 100644 --- a/src/zh/vomic/src/eu/kanade/tachiyomi/extension/zh/vomic/Vomic.kt +++ b/src/zh/vomic/src/eu/kanade/tachiyomi/extension/zh/vomic/Vomic.kt @@ -51,7 +51,7 @@ class Vomic : HttpSource(), ConfigurableSource { } } - override val client = network.client.newBuilder().addInterceptor { chain -> + override val client = network.cloudflareClient.newBuilder().addInterceptor { chain -> try { val response = chain.proceed(chain.request()) if (response.isSuccessful) { diff --git a/src/zh/wnacg/build.gradle b/src/zh/wnacg/build.gradle index 8282a925d..76129a14d 100644 --- a/src/zh/wnacg/build.gradle +++ b/src/zh/wnacg/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'WNACG' extClass = '.wnacg' - extVersionCode = 18 + extVersionCode = 19 isNsfw = true } diff --git a/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt b/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt index db9c9e3c5..61fc474b4 100644 --- a/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt +++ b/src/zh/wnacg/src/eu/kanade/tachiyomi/extension/zh/wnacg/wnacg.kt @@ -32,7 +32,7 @@ class wnacg : ParsedHttpSource(), ConfigurableSource { private val updateUrlInterceptor = UpdateUrlInterceptor(preferences) - override val client = network.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor(updateUrlInterceptor) .build() diff --git a/src/zh/zaimanhua/build.gradle b/src/zh/zaimanhua/build.gradle index facb9d856..029023b6e 100644 --- a/src/zh/zaimanhua/build.gradle +++ b/src/zh/zaimanhua/build.gradle @@ -1,7 +1,8 @@ ext { extName = 'Zaimanhua' extClass = '.Zaimanhua' - extVersionCode = 6 + extVersionCode = 7 + isNsfw = false } apply from: "$rootDir/common.gradle" diff --git a/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt b/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt index 17fc93b54..66d151d0b 100644 --- a/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt +++ b/src/zh/zaimanhua/src/eu/kanade/tachiyomi/extension/zh/zaimanhua/Zaimanhua.kt @@ -48,7 +48,7 @@ class Zaimanhua : HttpSource(), ConfigurableSource { private val preferences: SharedPreferences = getPreferences() - override val client: OkHttpClient = network.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimit(5) .addInterceptor(::authIntercept) .addInterceptor(::imageRetryInterceptor)