Explicit cloudflareClient if Cloudflare hosted

lib-multisrc/blogtruyen/build.gradle.kts

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

lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt

@@ -37,6 +37,8 @@ abstract class BlogTruyen(
 
     override val supportsLatest = true
 
+    override val client = network.cloudflareClient
+
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
 

lib-multisrc/mangahub/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 28
+baseVersionCode = 29
 
 dependencies {
     api(project(":lib:randomua"))

lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt

@@ -50,7 +50,7 @@ abstract class MangaHub(
     private var baseApiUrl = "https://api.mghcdn.com"
     private var baseCdnUrl = "https://imgx.mghcdn.com"
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .setRandomUserAgent(
             userAgentType = UserAgentType.DESKTOP,
             filterInclude = listOf("chrome"),

lib-multisrc/mmrcms/build.gradle.kts

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

lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt

@@ -67,6 +67,8 @@ constructor(
 
     override val supportsLatest = true
 
+    override val client = network.cloudflareClient
+
     override fun headersBuilder() = super.headersBuilder()
         .add("Referer", "$baseUrl/")
 

lib-multisrc/pizzareader/build.gradle.kts

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

lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt

@@ -29,6 +29,8 @@ abstract class PizzaReader(
 
     override val supportsLatest = true
 
+    override val client = network.cloudflareClient
+
     open val apiUrl by lazy { "$baseUrl$apiPath" }
 
     protected open val json: Json by injectLazy()

lib-multisrc/zeistmanga/build.gradle.kts

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

lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt

@@ -27,6 +27,8 @@ abstract class ZeistManga(
 
     override val supportsLatest = true
 
+    override val client = network.cloudflareClient
+
     protected val json: Json by injectLazy()
 
     private val intl by lazy { ZeistMangaIntl(lang) }

src/all/cubari/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Cubari'
     extClass = '.CubariFactory'
-    extVersionCode = 24
+    extVersionCode = 25
 }
 
 apply from: "$rootDir/common.gradle"

src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt

@@ -38,7 +38,7 @@ open class Cubari(override val lang: String) : HttpSource() {
 
     private val json: Json by injectLazy()
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor { chain ->
             val request = chain.request()
             val headers = request.headers.newBuilder()

src/all/mangaforfree/src/eu/kanade/tachiyomi/extension/all/mangaforfree/MangaForFreeFactory.kt

@@ -28,7 +28,7 @@ abstract class MangaForFree(
     lang: String,
 ) : Madara(name, baseUrl, lang) {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

src/ar/hentaislayer/src/eu/kanade/tachiyomi/extension/ar/hentaislayer/HentaiSlayer.kt

@@ -13,7 +13,7 @@ import uy.kohesive.injekt.api.get
 
 class HentaiSlayer : FuzzyDoodle("هنتاي سلاير", "https://hentaislayer.net", "ar"), ConfigurableSource {
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(2)
         .build()
 

src/ar/mangaswat/src/eu/kanade/tachiyomi/extension/ar/mangaswat/MangaSwat.kt

@@ -43,7 +43,7 @@ class MangaSwat :
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor(::tokenInterceptor)
         .rateLimit(1)
         .build()

src/ar/yonabar/src/eu/kanade/tachiyomi/extension/ar/yonabar/YonaBar.kt

@@ -11,7 +11,7 @@ class YonaBar : Madara(
     "ar",
     SimpleDateFormat("MMM dd, yyyy", Locale("ar")),
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 

src/en/anisascans/src/eu/kanade/tachiyomi/extension/en/anisascans/AnisaScans.kt

@@ -8,7 +8,7 @@ class AnisaScans : Madara(
     "https://anisascans.in",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 

src/en/astrascans/src/eu/kanade/tachiyomi/extension/en/astrascans/AstraScans.kt

@@ -9,7 +9,7 @@ class AstraScans : MangaThemesia(
     "en",
     "/series",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 }

src/en/comickiba/src/eu/kanade/tachiyomi/extension/en/comickiba/Manhuagold.kt

@@ -12,7 +12,7 @@ class Manhuagold : Liliana(
     // MangaReader -> Liliana
     override val versionId = 2
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(2)
         .build()
 }

src/en/culturedworks/src/eu/kanade/tachiyomi/extension/en/culturedworks/CulturedWorks.kt

@@ -12,7 +12,7 @@ class CulturedWorks : MangaThemesia(
     "https://culturedworks.com",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(2)
         .build()
 

src/en/darkscans/src/eu/kanade/tachiyomi/extension/en/darkscans/DarkScans.kt

@@ -6,7 +6,7 @@ import okhttp3.OkHttpClient
 
 class DarkScans : Madara("Dark Scans", "https://darkscans.net", "en") {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(20, 4)
         .build()
 

src/en/dragontea/src/eu/kanade/tachiyomi/extension/en/dragontea/DragonTea.kt

@@ -12,7 +12,7 @@ class DragonTea : Madara(
     "en",
     dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US),
 ) {
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1)
         .build()
 

src/en/drakescans/src/eu/kanade/tachiyomi/extension/en/drakescans/DrakeScans.kt

@@ -15,7 +15,7 @@ class DrakeScans : MangaThemesia(
     // madara -> mangathemesia
     override val versionId = 2
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimitHost(baseUrl.toHttpUrl(), 3, 1, TimeUnit.SECONDS)
         .build()
 

src/en/erosscans/src/eu/kanade/tachiyomi/extension/en/erosscans/ErosScans.kt

@@ -8,7 +8,7 @@ class ErosScans : MangaThemesia(
     "https://tercoscans.xyz",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 }

src/en/firstkissmanhua/src/eu/kanade/tachiyomi/extension/en/firstkissmanhua/FirstKissManhua.kt

@@ -8,7 +8,7 @@ class FirstKissManhua : Madara(
     "https://1stkissmanhua.net",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 

src/en/flamecomics/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'Flame Comics'
     extClass = '.FlameComics'
-    extVersionCode = 37
+    extVersionCode = 38
 }
 
 apply from: "$rootDir/common.gradle"

src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt

@@ -36,7 +36,7 @@ class FlameComics : HttpSource() {
 
     private val json: Json by injectLazy()
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(2, 7)
         .addInterceptor(::buildIdOutdatedInterceptor)
         .addInterceptor(::composedImageIntercept)

src/en/freemanga/src/eu/kanade/tachiyomi/extension/en/freemanga/FreeManga.kt

@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit
 
 class FreeManga : Madara("Free Manga", "https://freemanga.me", "en") {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

src/en/harimanga/src/eu/kanade/tachiyomi/extension/en/harimanga/Harimanga.kt

@@ -8,7 +8,7 @@ class Harimanga : Madara(
     "https://harimanga.me",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 

src/en/hentai20/src/eu/kanade/tachiyomi/extension/en/hentai20/Hentai20.kt

@@ -6,7 +6,7 @@ import okhttp3.OkHttpClient
 
 class Hentai20 : MangaThemesia("Hentai20", "https://hentai20.io", "en") {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1)
         .build()
 }

src/en/hentairead/src/eu/kanade/tachiyomi/extension/en/hentairead/Hentairead.kt

@@ -27,7 +27,7 @@ class Hentairead : Madara("HentaiRead", "https://hentairead.com", "en", dateForm
         .add("Accept", "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8")
         .build()
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor { chain ->
             val request = chain.request()
             val url = request.url.toString()

src/en/hiperdex/src/eu/kanade/tachiyomi/extension/en/hiperdex/Hiperdex.kt

@@ -29,7 +29,7 @@ class Hiperdex :
 
     override val baseUrl by lazy { getPrefBaseUrl() }
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .setRandomUserAgent(
             preferences.getPrefUAType(),
             preferences.getPrefCustomUA(),

src/en/infernalvoidscans/src/eu/kanade/tachiyomi/extension/en/infernalvoidscans/InfernalVoidScans.kt

@@ -10,7 +10,7 @@ class InfernalVoidScans : MangaThemesia(
     "https://hivetoon.com",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addInterceptor { chain ->
             val request = chain.request()
             val headers = request.headers.newBuilder()

src/en/irisscans/src/eu/kanade/tachiyomi/extension/en/irisscans/IrisScans.kt

@@ -9,7 +9,7 @@ class IrisScans : MangaThemesia(
     "https://irisscans.xyz",
     "en",
 ) {
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(4)
         .build()
 }

src/en/kaiscans/src/eu/kanade/tachiyomi/extension/en/kaiscans/LuaScans.kt

@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia
 import eu.kanade.tachiyomi.network.interceptor.rateLimit
 
 class LuaScans : MangaThemesia("Lua Scans (unoriginal)", "https://ponvi.online", "en") {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(2)
         .build()
 

src/en/kappabeast/src/eu/kanade/tachiyomi/extension/en/kappabeast/KappaBeast.kt

@@ -9,7 +9,7 @@ class KappaBeast : MangaThemesia(
     "https://kappabeast.com",
     "en",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 

src/en/lunarscans/src/eu/kanade/tachiyomi/extension/en/lunarscans/LunarScans.kt

@@ -31,7 +31,7 @@ class LunarScans :
 
     private val preferences = Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
 
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .setRandomUserAgent(
             preferences.getPrefUAType(),
             preferences.getPrefCustomUA(),

src/en/manga18x/src/eu/kanade/tachiyomi/extension/en/manga18x/Manga18x.kt

@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.util.concurrent.TimeUnit
 
 class Manga18x : Madara("Manga 18x", "https://manga18x.net", "en") {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .readTimeout(2, TimeUnit.MINUTES)
         .build()
 

src/en/mangaclash/src/eu/kanade/tachiyomi/extension/en/mangaclash/MangaClash.kt

@@ -14,7 +14,7 @@ class MangaClash : Madara(
     dateFormat = SimpleDateFormat("MM/dd/yy", Locale.US),
 ) {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

src/en/mangakomi/src/eu/kanade/tachiyomi/extension/en/mangakomi/MangaKomi.kt

@@ -11,7 +11,7 @@ class MangaKomi : Madara(
     "en",
 ) {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1, 1, TimeUnit.SECONDS)
         .build()
 }

src/en/mangasect/src/eu/kanade/tachiyomi/extension/en/mangasect/MangaSect.kt

@@ -9,7 +9,7 @@ class MangaSect : Liliana(
     "en",
     usesPostSearch = true,
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(1)
         .build()
 }

src/en/mangatx/src/eu/kanade/tachiyomi/extension/en/mangatx/MangaTX.kt

@@ -12,7 +12,7 @@ class MangaTX : MangaThemesia(
     mangaUrlDirectory = "/manga-list",
     dateFormat = SimpleDateFormat("dd-MM-yyyy", Locale.ROOT),
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 

src/en/manhuafast/src/eu/kanade/tachiyomi/extension/en/manhuafast/ManhuaFast.kt

@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit
 
 class ManhuaFast : Madara("ManhuaFast", "https://manhuafast.com", "en") {
 
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(20, 4, TimeUnit.SECONDS)
         .build()
 

src/en/manhuaga/src/eu/kanade/tachiyomi/extension/en/manhuaga/Manhuaga.kt

@@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import okhttp3.OkHttpClient
 
 class Manhuaga : Madara("Manhuaga", "https://manhuaga.com", "en") {
-    override val client: OkHttpClient = super.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .addInterceptor { chain ->
             val originalRequest = chain.request()
             chain.proceed(originalRequest).let { response ->

src/en/manhwafreake/src/eu/kanade/tachiyomi/extension/en/manhwafreake/ManhwaFreake.kt

@@ -9,7 +9,7 @@ class ManhwaFreake : MangaThemesia(
     "en",
     mangaUrlDirectory = "/series",
 ) {
-    override val client = super.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimit(3)
         .build()
 }