Explicit cloudflareClient if Cloudflare hosted (#6676)

keiyoushi · Dec 19, 2024 · f7a8f3e · f7a8f3e
1 parent e2e2ba9
commit f7a8f3e
Show file tree

Hide file tree

Showing 35 changed files with 36 additions and 34 deletions.
diff --git a/lib-multisrc/mangareader/build.gradle.kts b/lib-multisrc/mangareader/build.gradle.kts
@@ -2,4 +2,4 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 1
+baseVersionCode = 2
diff --git a/lib-multisrc/mangareader/src/eu/kanade/tachiyomi/multisrc/mangareader/MangaReader.kt b/lib-multisrc/mangareader/src/eu/kanade/tachiyomi/multisrc/mangareader/MangaReader.kt
@@ -22,6 +22,8 @@ abstract class MangaReader : HttpSource(), ConfigurableSource {
 
     override val supportsLatest = true
 
+    override val client = network.cloudflareClient
+
     final override fun latestUpdatesParse(response: Response) = searchMangaParse(response)
 
     final override fun popularMangaParse(response: Response) = searchMangaParse(response)

diff --git a/src/all/comickfun/build.gradle b/src/all/comickfun/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Comick'
     extClass = '.ComickFactory'
-    extVersionCode = 50
+    extVersionCode = 51
     isNsfw = true
 }
 

diff --git a/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/Comick.kt b/src/all/comickfun/src/eu/kanade/tachiyomi/extension/all/comickfun/Comick.kt
@@ -177,7 +177,7 @@ abstract class Comick(
         add("User-Agent", "Tachiyomi ${System.getProperty("http.agent")}")
     }
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .addNetworkInterceptor(::errorInterceptor)
         .rateLimit(3, 1, TimeUnit.SECONDS)
         .build()

diff --git a/src/all/ehentai/build.gradle b/src/all/ehentai/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'E-Hentai'
     extClass = '.EHFactory'
-    extVersionCode = 22
+    extVersionCode = 23
     isNsfw = true
 }
 

diff --git a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt
@@ -398,7 +398,7 @@ abstract class EHentai(
         .appendQueryParameter(param, value)
         .toString()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .cookieJar(CookieJar.NO_COOKIES)
         .addInterceptor { chain ->
             val newReq = chain

diff --git a/src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFire.kt b/src/all/mangafire/src/eu/kanade/tachiyomi/extension/all/mangafire/MangaFire.kt
@@ -33,7 +33,7 @@ open class MangaFire(
 
     private val json: Json by injectLazy()
 
-    override val client = network.cloudflareClient.newBuilder()
+    override val client = super.client.newBuilder()
         .addInterceptor(ImageInterceptor)
         .build()
 

diff --git a/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReader.kt b/src/all/mangareaderto/src/eu/kanade/tachiyomi/extension/all/mangareaderto/MangaReader.kt
@@ -31,7 +31,7 @@ open class MangaReader(
 
     override val baseUrl = "https://mangareader.to"
 
-    override val client = network.client.newBuilder()
+    override val client = super.client.newBuilder()
         .addInterceptor(ImageInterceptor)
         .build()
 

diff --git a/src/all/ninemanga/build.gradle b/src/all/ninemanga/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'NineManga'
     extClass = '.NineMangaFactory'
-    extVersionCode = 20
+    extVersionCode = 21
 }
 
 apply from: "$rootDir/common.gradle"

diff --git a/src/all/ninemanga/src/eu/kanade/tachiyomi/extension/all/ninemanga/NineManga.kt b/src/all/ninemanga/src/eu/kanade/tachiyomi/extension/all/ninemanga/NineManga.kt
@@ -29,7 +29,7 @@ open class NineManga(
 
     private val cookieInterceptor = CookieInterceptor(baseUrl.substringAfter("://"), "ninemanga_list_num" to "1")
 
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .addInterceptor { chain ->
             val request = chain.request()
             val url = request.url.toString()

diff --git a/src/all/photos18/build.gradle b/src/all/photos18/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Photos18'
     extClass = '.Photos18'
-    extVersionCode = 4
+    extVersionCode = 5
     isNsfw = true
 }
 

diff --git a/src/all/photos18/src/eu/kanade/tachiyomi/extension/all/photos18/Photos18.kt b/src/all/photos18/src/eu/kanade/tachiyomi/extension/all/photos18/Photos18.kt
@@ -34,7 +34,7 @@ class Photos18 : HttpSource(), ConfigurableSource {
     private val baseUrlWithLang get() = if (useTrad) baseUrl else "$baseUrl/zh-hans"
     private fun String.stripLang() = removePrefix("/zh-hans")
 
-    override val client = network.client.newBuilder().followRedirects(false).build()
+    override val client = network.cloudflareClient.newBuilder().followRedirects(false).build()
 
     override fun headersBuilder() = Headers.Builder().apply {
         add("Referer", baseUrl)

diff --git a/src/all/projectsuki/build.gradle b/src/all/projectsuki/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Project Suki'
     extClass = '.ProjectSuki'
-    extVersionCode = 3
+    extVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"

diff --git a/src/all/projectsuki/src/eu/kanade/tachiyomi/extension/all/projectsuki/ProjectSuki.kt b/src/all/projectsuki/src/eu/kanade/tachiyomi/extension/all/projectsuki/ProjectSuki.kt
@@ -208,7 +208,7 @@ class ProjectSuki : HttpSource(), ConfigurableSource {
      * (this is a permalink, check for updated version),
      * most client options are already set as they should be, including the [Cache][okhttp3.Cache].
      */
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .setRandomUserAgent(
             userAgentType = preferences.shared.getPrefUAType(),
             customUA = preferences.shared.getPrefCustomUA(),

diff --git a/src/all/xinmeitulu/build.gradle b/src/all/xinmeitulu/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Xinmeitulu'
     extClass = '.Xinmeitulu'
-    extVersionCode = 4
+    extVersionCode = 5
     isNsfw = true
 }
 

diff --git a/src/all/xinmeitulu/src/eu/kanade/tachiyomi/extension/all/xinmeitulu/Xinmeitulu.kt b/src/all/xinmeitulu/src/eu/kanade/tachiyomi/extension/all/xinmeitulu/Xinmeitulu.kt
@@ -23,7 +23,7 @@ class Xinmeitulu : ParsedHttpSource() {
     override val name = "Xinmeitulu"
     override val supportsLatest = false
 
-    override val client = network.client.newBuilder().addInterceptor(::contentTypeIntercept).build()
+    override val client = network.cloudflareClient.newBuilder().addInterceptor(::contentTypeIntercept).build()
 
     // Latest
 

diff --git a/src/en/cutiecomics/build.gradle b/src/en/cutiecomics/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Cutie Comics'
     extClass = '.CutieComics'
-    extVersionCode = 1
+    extVersionCode = 2
     isNsfw = true
 }
 

diff --git a/src/en/cutiecomics/src/eu/kanade/tachiyomi/extension/en/cutiecomics/CutieComics.kt b/src/en/cutiecomics/src/eu/kanade/tachiyomi/extension/en/cutiecomics/CutieComics.kt
@@ -30,7 +30,7 @@ class CutieComics : ParsedHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimitHost(baseUrl.toHttpUrl(), 2)
         .build()
 

diff --git a/src/es/hentaimode/build.gradle b/src/es/hentaimode/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'HentaiMode'
     extClass = '.HentaiMode'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = true
 }
 

diff --git a/src/es/hentaimode/src/eu/kanade/tachiyomi/extension/es/hentaimode/HentaiMode.kt b/src/es/hentaimode/src/eu/kanade/tachiyomi/extension/es/hentaimode/HentaiMode.kt
@@ -28,7 +28,7 @@ class HentaiMode : ParsedHttpSource() {
 
     override val supportsLatest = false
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimitHost(baseUrl.toHttpUrl(), 2)
         .build()
 

diff --git a/src/es/nartag/build.gradle b/src/es/nartag/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.Nartag'
     themePkg = 'madara'
     baseUrl = 'https://traduccionesamistosas.eyudud.net'
-    overrideVersionCode = 0
+    overrideVersionCode = 1
     isNsfw = true
 }
 

diff --git a/src/es/nartag/src/eu/kanade/tachiyomi/extension/es/nartag/Nartag.kt b/src/es/nartag/src/eu/kanade/tachiyomi/extension/es/nartag/Nartag.kt
@@ -12,7 +12,7 @@ class Nartag : Madara(
 ) {
     override val versionId = 2
 
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client: OkHttpClient = super.client.newBuilder()
         .rateLimitHost(baseUrl.toHttpUrl(), 2)
         .build()
 

diff --git a/src/fr/scanmanga/build.gradle b/src/fr/scanmanga/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Scan-Manga'
     extClass = '.ScanManga'
-    extVersionCode = 7
+    extVersionCode = 8
     isNsfw = true
 }
 

diff --git a/src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt b/src/fr/scanmanga/src/eu/kanade/tachiyomi/extension/fr/scanmanga/ScanManga.kt
@@ -34,7 +34,7 @@ class ScanManga : ParsedHttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .addNetworkInterceptor { chain ->
             val originalCookies = chain.request().header("Cookie") ?: ""
             val newReq = chain

diff --git a/src/ja/rawotaku/src/eu/kanade/tachiyomi/extension/ja/rawotaku/RawOtaku.kt b/src/ja/rawotaku/src/eu/kanade/tachiyomi/extension/ja/rawotaku/RawOtaku.kt
@@ -32,7 +32,7 @@ class RawOtaku : MangaReader() {
 
     override val baseUrl = "https://rawotaku.com"
 
-    override val client = network.cloudflareClient.newBuilder()
+    override val client = super.client.newBuilder()
         .rateLimit(2)
         .build()
 

diff --git a/src/pt/taiyo/build.gradle b/src/pt/taiyo/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Taiyō'
     extClass = '.Taiyo'
-    extVersionCode = 3
+    extVersionCode = 4
     isNsfw = true
 }
 

diff --git a/src/pt/taiyo/src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt b/src/pt/taiyo/src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt
@@ -60,7 +60,7 @@ class Taiyo : ParsedHttpSource() {
 
     private var bearerToken: String = preferences.getString(BEARER_TOKEN_PREF, "").toString()
 
-    override val client = network.client.newBuilder()
+    override val client = network.cloudflareClient.newBuilder()
         .rateLimitHost(baseUrl.toHttpUrl(), 2)
         .rateLimitHost(IMG_CDN.toHttpUrl(), 2)
         .addInterceptor(::authorizationInterceptor)

diff --git a/src/pt/taosect/build.gradle b/src/pt/taosect/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Tao Sect'
     extClass = '.TaoSect'
-    extVersionCode = 19
+    extVersionCode = 20
     isNsfw = true
 }
 

diff --git a/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt b/src/pt/taosect/src/eu/kanade/tachiyomi/extension/pt/taosect/TaoSect.kt
@@ -35,7 +35,7 @@ class TaoSect : HttpSource() {
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.client.newBuilder()
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
         .rateLimit(1, 2, TimeUnit.SECONDS)
         .build()
 

diff --git a/src/tr/mangakings/build.gradle b/src/tr/mangakings/build.gradle
@@ -3,7 +3,7 @@ ext {
     extClass = '.MangaKings'
     themePkg = 'mangathemesia'
     baseUrl = 'https://mangakings.com.tr'
-    overrideVersionCode = 0
+    overrideVersionCode = 1
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/tr/mangakings/src/eu/kanade/tachiyomi/extension/tr/mangakings/MangaKings.kt b/src/tr/mangakings/src/eu/kanade/tachiyomi/extension/tr/mangakings/MangaKings.kt
@@ -14,7 +14,7 @@ class MangaKings : MangaThemesia(
     dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("tr")),
 
 ) {
-    override val client = network.client.newBuilder()
+    override val client = super.client.newBuilder()
         .rateLimitHost(baseUrl.toHttpUrl(), 2)
         .build()
 

diff --git a/src/zh/manhuadb/build.gradle b/src/zh/manhuadb/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'ManhuaDB'
     extClass = '.ManhuaDB'
-    extVersionCode = 6
+    extVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/MDB.kt b/src/zh/manhuadb/src/eu/kanade/tachiyomi/extension/zh/manhuadb/MDB.kt
@@ -24,7 +24,7 @@ abstract class MDB(
     override val lang: String = "zh",
 ) : ParsedHttpSource() {
 
-    override val client = network.client.newBuilder().rateLimit(2).build()
+    override val client = network.cloudflareClient.newBuilder().rateLimit(2).build()
 
     override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 

diff --git a/src/zh/roumanwu/build.gradle b/src/zh/roumanwu/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Roumanwu'
     extClass = '.Roumanwu'
-    extVersionCode = 12
+    extVersionCode = 13
     isNsfw = true
 }
 

diff --git a/src/zh/roumanwu/src/eu/kanade/tachiyomi/extension/zh/roumanwu/Roumanwu.kt b/src/zh/roumanwu/src/eu/kanade/tachiyomi/extension/zh/roumanwu/Roumanwu.kt
@@ -32,7 +32,7 @@ class Roumanwu : ParsedHttpSource(), ConfigurableSource {
         max(MIRRORS.size - 1, preferences.getString(MIRROR_PREF, MIRROR_DEFAULT)!!.toInt()),
     ]
 
-    override val client = network.client.newBuilder().addInterceptor(ScrambledImageInterceptor).build()
+    override val client = network.cloudflareClient.newBuilder().addInterceptor(ScrambledImageInterceptor).build()
 
     private val imageUrlRegex = """\\"imageUrl\\":\\"(?<imageUrl>[^\\]+)""".toRegex()