diff --git a/lib-multisrc/blogtruyen/build.gradle.kts b/lib-multisrc/blogtruyen/build.gradle.kts index e2f11e9c192..6e70fd15830 100644 --- a/lib-multisrc/blogtruyen/build.gradle.kts +++ b/lib-multisrc/blogtruyen/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 3 +baseVersionCode = 4 diff --git a/lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt b/lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt index e32a0dfbe2d..1c99c835a67 100644 --- a/lib-multisrc/blogtruyen/src/eu/kanade/tachiyomi/multisrc/blogtruyen/BlogTruyen.kt +++ b/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/") diff --git a/lib-multisrc/mangahub/build.gradle.kts b/lib-multisrc/mangahub/build.gradle.kts index 7863375ef08..aadb9d35326 100644 --- a/lib-multisrc/mangahub/build.gradle.kts +++ b/lib-multisrc/mangahub/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("lib-multisrc") } -baseVersionCode = 28 +baseVersionCode = 29 dependencies { api(project(":lib:randomua")) diff --git a/lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt b/lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt index 4109da1b3a3..85684786238 100644 --- a/lib-multisrc/mangahub/src/eu/kanade/tachiyomi/multisrc/mangahub/MangaHub.kt +++ b/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"), diff --git a/lib-multisrc/mmrcms/build.gradle.kts b/lib-multisrc/mmrcms/build.gradle.kts index 0f73d06ae1c..e1d07a25cab 100644 --- a/lib-multisrc/mmrcms/build.gradle.kts +++ b/lib-multisrc/mmrcms/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("lib-multisrc") } -baseVersionCode = 11 +baseVersionCode = 12 dependencies { api(project(":lib:i18n")) diff --git a/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt b/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt index 50fa20e1bd7..04856b44793 100644 --- a/lib-multisrc/mmrcms/src/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMS.kt +++ b/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/") diff --git a/lib-multisrc/pizzareader/build.gradle.kts b/lib-multisrc/pizzareader/build.gradle.kts index 9dce2478cf8..e2f11e9c192 100644 --- a/lib-multisrc/pizzareader/build.gradle.kts +++ b/lib-multisrc/pizzareader/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 2 +baseVersionCode = 3 diff --git a/lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt b/lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt index e1808a5f5e2..62fd1b3f0b7 100644 --- a/lib-multisrc/pizzareader/src/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReader.kt +++ b/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() diff --git a/lib-multisrc/zeistmanga/build.gradle.kts b/lib-multisrc/zeistmanga/build.gradle.kts index d1d9afd6eed..8047e9e330e 100644 --- a/lib-multisrc/zeistmanga/build.gradle.kts +++ b/lib-multisrc/zeistmanga/build.gradle.kts @@ -2,4 +2,4 @@ plugins { id("lib-multisrc") } -baseVersionCode = 9 +baseVersionCode = 10 diff --git a/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt b/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt index a8aafa6ceb2..f24c98ad3d1 100644 --- a/lib-multisrc/zeistmanga/src/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt +++ b/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) } diff --git a/src/all/cubari/build.gradle b/src/all/cubari/build.gradle index c8140ba7119..d1593a0e33e 100644 --- a/src/all/cubari/build.gradle +++ b/src/all/cubari/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Cubari' extClass = '.CubariFactory' - extVersionCode = 24 + extVersionCode = 25 } apply from: "$rootDir/common.gradle" diff --git a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt b/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt index 82c158ea722..fb4f97b484c 100644 --- a/src/all/cubari/src/eu/kanade/tachiyomi/extension/all/cubari/Cubari.kt +++ b/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() diff --git a/src/en/flamecomics/build.gradle b/src/en/flamecomics/build.gradle index be682977c6f..c9103606ae2 100644 --- a/src/en/flamecomics/build.gradle +++ b/src/en/flamecomics/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Flame Comics' extClass = '.FlameComics' - extVersionCode = 37 + extVersionCode = 38 } apply from: "$rootDir/common.gradle" diff --git a/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt b/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt index f1be321c547..f117aa1def0 100644 --- a/src/en/flamecomics/src/eu/kanade/tachiyomi/extension/en/flamecomics/FlameComics.kt +++ b/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) diff --git a/src/es/olympusscanlation/build.gradle b/src/es/olympusscanlation/build.gradle index 22f8904cf4d..9fcd2850b53 100644 --- a/src/es/olympusscanlation/build.gradle +++ b/src/es/olympusscanlation/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Olympus Scanlation' extClass = '.OlympusScanlation' - extVersionCode = 11 + extVersionCode = 12 } apply from: "$rootDir/common.gradle" diff --git a/src/es/olympusscanlation/src/eu/kanade/tachiyomi/extension/es/olympusscanlation/OlympusScanlation.kt b/src/es/olympusscanlation/src/eu/kanade/tachiyomi/extension/es/olympusscanlation/OlympusScanlation.kt index bebc1ebd547..4216458981a 100644 --- a/src/es/olympusscanlation/src/eu/kanade/tachiyomi/extension/es/olympusscanlation/OlympusScanlation.kt +++ b/src/es/olympusscanlation/src/eu/kanade/tachiyomi/extension/es/olympusscanlation/OlympusScanlation.kt @@ -32,7 +32,7 @@ class OlympusScanlation : HttpSource() { override val supportsLatest: Boolean = true - override val client = super.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 1, 2) .rateLimitHost(apiBaseUrl.toHttpUrl(), 2, 1) .build() diff --git a/src/es/tmohentai/build.gradle b/src/es/tmohentai/build.gradle index 1269b4aab2f..f2a38cb8375 100644 --- a/src/es/tmohentai/build.gradle +++ b/src/es/tmohentai/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'TMOHentai' extClass = '.TMOHentai' - extVersionCode = 8 + extVersionCode = 9 isNsfw = true } diff --git a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt index d8436fbf428..70a1b9be097 100644 --- a/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt +++ b/src/es/tmohentai/src/eu/kanade/tachiyomi/extension/es/tmohentai/TMOHentai.kt @@ -34,7 +34,7 @@ class TMOHentai : ConfigurableSource, ParsedHttpSource() { override val supportsLatest = true - override val client: OkHttpClient = super.client.newBuilder() + override val client: OkHttpClient = network.cloudflareClient.newBuilder() .rateLimitHost(baseUrl.toHttpUrl(), 1, 2) .build() diff --git a/src/it/hentaiarchive/build.gradle b/src/it/hentaiarchive/build.gradle index 21844e0b545..306139d5a1f 100644 --- a/src/it/hentaiarchive/build.gradle +++ b/src/it/hentaiarchive/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'HentaiArchive' extClass = '.HentaiArchive' - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/it/hentaiarchive/src/eu/kanade/tachiyomi/extension/it/hentaiarchive/HentaiArchive.kt b/src/it/hentaiarchive/src/eu/kanade/tachiyomi/extension/it/hentaiarchive/HentaiArchive.kt index a7eacbfc33f..3431d94c2a6 100644 --- a/src/it/hentaiarchive/src/eu/kanade/tachiyomi/extension/it/hentaiarchive/HentaiArchive.kt +++ b/src/it/hentaiarchive/src/eu/kanade/tachiyomi/extension/it/hentaiarchive/HentaiArchive.kt @@ -25,7 +25,7 @@ class HentaiArchive : ParsedHttpSource() { .add("Referer", "$baseUrl/") .build() - override val client = super.client.newBuilder() + override val client = network.cloudflareClient.newBuilder() .addInterceptor { chain -> val request = chain.request() val url = request.url.toString() diff --git a/src/ja/senmanga/build.gradle b/src/ja/senmanga/build.gradle index dbb49eaad5b..7f6787836f4 100644 --- a/src/ja/senmanga/build.gradle +++ b/src/ja/senmanga/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Sen Manga' extClass = '.SenManga' - extVersionCode = 6 + extVersionCode = 7 } apply from: "$rootDir/common.gradle" diff --git a/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt b/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt index 379415b1970..15b52347b66 100644 --- a/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt +++ b/src/ja/senmanga/src/eu/kanade/tachiyomi/extension/ja/senmanga/SenManga.kt @@ -24,7 +24,7 @@ class SenManga : ParsedHttpSource() { override val baseUrl = "https://raw.senmanga.com" @SuppressLint("DefaultLocale") - override val client = super.client.newBuilder().addInterceptor { + override val client = network.cloudflareClient.newBuilder().addInterceptor { // Intercept any image requests and add a referer to them // Enables bandwidth stealing feature val request = if (it.request().url.pathSegments.firstOrNull()?.trim()?.lowercase() == "viewer") {