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,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 8
+baseVersionCode = 9
 
 dependencies {
     api(project(":lib:speedbinb"))

lib-multisrc/comicgamma/src/eu/kanade/tachiyomi/multisrc/comicgamma/ComicGamma.kt

@@ -28,7 +28,7 @@ open class ComicGamma(
 
     private val json = Injekt.get<Json>()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(SpeedBinbInterceptor(json))
         .build()
 

lib-multisrc/fansubscat/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 5
+baseVersionCode = 6

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()
 

lib-multisrc/kemono/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 19
+baseVersionCode = 20

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/")

lib-multisrc/mangaesp/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 3
+baseVersionCode = 4
 
 dependencies {
   api(project(":lib:i18n"))

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()
 

lib-multisrc/mccms/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 6
+baseVersionCode = 7

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()
     }

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()
     }

lib-multisrc/multichan/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 3
+baseVersionCode = 4

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)

lib-multisrc/senkuro/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 3
+baseVersionCode = 4

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()
 

lib-multisrc/sinmh/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 11
+baseVersionCode = 12

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")!!)

lib-multisrc/webtoons/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 3
+baseVersionCode = 4

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<Cookie>) {}

src/all/akuma/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Akuma'
     extClass = '.AkumaFactory'
-    extVersionCode = 6
+    extVersionCode = 7
     isNsfw = true
 }
 

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)

src/all/comicfury/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Comic Fury'
     extClass = '.ComicFuryFactory'
-    extVersionCode = 4
+    extVersionCode = 5
     isNsfw = true
 }
 

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

src/all/comico/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Comico'
     extClass = '.ComicoFactory'
-    extVersionCode = 6
+    extVersionCode = 7
     isNsfw = true
 }
 

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<Cookie>) =

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"

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()
 

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"

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"

src/all/kiutaku/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Kiutaku'
     extClass = '.Kiutaku'
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

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()
     }

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.

src/all/mangadex/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'MangaDex'
     extClass = '.MangaDexFactory'
-    extVersionCode = 200
+    extVersionCode = 201
     isNsfw = true
 }
 

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

src/all/mangahosted/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Manga Hosted'
     extClass = '.MangaHostedFactory'
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

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()
 

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)

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"

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()
 

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"

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)

src/all/mango/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Mango'
     extClass = '.Mango'
-    extVersionCode = 10
+    extVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"

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()

src/all/namicomi/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'NamiComi'
     extClass = '.NamiComiFactory'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = false
 }
 

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())

src/all/tappytoon/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Tappytoon'
     extClass = '.TappytoonFactory'
-    extVersionCode = 7
+    extVersionCode = 8
     isNsfw = true
 }
 

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) {

src/all/toomics/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Toomics'
     extClass = '.ToomicsFactory'
-    extVersionCode = 8
+    extVersionCode = 9
     isNsfw = true
 }
 

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)

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"

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()
 

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"

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()
 

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"

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<MangasPage> = Observable.just(
         MangasPage(

src/en/hentaidexy/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Hentaidexy'
     extClass = '.Hentaidexy'
-    extVersionCode = 33
+    extVersionCode = 34
     isNsfw = true
 }
 

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()
 

src/en/madokami/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Madokami'
     extClass = '.Madokami'
-    extVersionCode = 10
+    extVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"

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

src/en/mangamo/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Mangamo'
     extClass = '.Mangamo'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = false
 }
 

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)

src/en/mangaplanet/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = "Manga Planet"
     extClass = ".MangaPlanet"
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

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<Json>()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(SpeedBinbInterceptor(json))
         .addNetworkInterceptor(CookieInterceptor(baseUrl.toHttpUrl().host, "mpaconf" to "18"))
         .build()

src/en/manta/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Manta Comics'
     extClass = '.MantaComics'
-    extVersionCode = 4
+    extVersionCode = 5
 }
 
 apply from: "$rootDir/common.gradle"

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<Cookie>) {

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"

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<MangasPage> {
         val manga = SManga.create().apply {

src/en/tapastic/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Tapas'
     extClass = '.Tapastic'
-    extVersionCode = 21
+    extVersionCode = 22
     isNsfw = true
 }
 

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 {

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"

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)

src/es/ravenmanga/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'RavenManga'
     extClass = '.RavenManga'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = false
 }
 

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()
 

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"

src/ja/comicmeteor/src/eu/kanade/tachiyomi/extension/ja/comicmeteor/ComicMeteor.kt

@@ -33,7 +33,7 @@ class ComicMeteor : ParsedHttpSource() {
 
     private val json = Injekt.get<Json>()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(SpeedBinbInterceptor(json))
         .apply {
             val interceptors = interceptors()

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"

src/ja/gaugaumonsterplus/src/eu/kanade/tachiyomi/extension/ja/gaugaumonsterplus/GaugauMonsterPlus.kt

@@ -28,7 +28,7 @@ class GaugauMonsterPlus : ParsedHttpSource() {
 
     private val json = Injekt.get<Json>()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(SpeedBinbInterceptor(json))
         .build()
 

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"

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()
 

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"

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

src/ja/ohtawebcomic/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = "Ohta Web Comic"
     extClass = ".OhtaWebComic"
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

src/ja/ohtawebcomic/src/eu/kanade/tachiyomi/extension/ja/ohtawebcomic/OhtaWebComic.kt

@@ -31,7 +31,7 @@ class OhtaWebComic : ParsedHttpSource() {
 
     private val json = Injekt.get<Json>()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(SpeedBinbInterceptor(json))
         .build()
 

src/ja/rawinu/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.RawINU'
     themePkg = 'fmreader'
     baseUrl = 'https://rawinu.com'
-    overrideVersionCode = 1
+    overrideVersionCode = 2
     isNsfw = true
 }
 

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()

src/ja/yanmaga/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = "Weekly Young Magazine"
     extClass = ".YanmagaFactory"
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

src/ja/yanmaga/src/eu/kanade/tachiyomi/extension/ja/yanmaga/Yanmaga.kt

@@ -33,7 +33,7 @@ abstract class Yanmaga(
 
     protected val json = Injekt.get<Json>()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(SpeedBinbInterceptor(json))
         .build()
 

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"

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()

src/pt/bakai/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Bakai'
     extClass = '.Bakai'
-    extVersionCode = 9
+    extVersionCode = 10
     isNsfw = true
 }
 

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<Cookie>) =
                         cookieJar.saveFromResponse(url, cookies.removeLimit())

src/pt/blackoutcomics/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Blackout Comics'
     extClass = '.BlackoutComics'
-    extVersionCode = 7
+    extVersionCode = 8
     isNsfw = true
 }
 

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()
 

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"

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()
 

src/pt/maidsecret/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.MaidSecret'
     themePkg = 'madara'
     baseUrl = 'https://maidsecret.com'
-    overrideVersionCode = 0
+    overrideVersionCode = 1
     isNsfw = true
 }
 

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()
 }

src/ru/acomics/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'AComics'
     extClass = '.AComics'
-    extVersionCode = 5
+    extVersionCode = 6
     isNsfw = true
 }
 

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()

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"