From 940047de119d5eb6e812f8d2bcb41f91c207c0d2 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:21:02 +0800
Subject: [PATCH] Refine Cloudflare challenge detection

---
 .../tachiyomi/network/interceptor/CloudflareInterceptor.kt   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
index a4bce44b4..1ed072221 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
@@ -20,9 +20,7 @@ class CloudflareInterceptor(context: Context) : WebViewInterceptor(context) {
     private val executor = ContextCompat.getMainExecutor(context)
 
     override fun shouldIntercept(response: Response): Boolean {
-        // Check if Cloudflare anti-bot is on
-        return response.code in ERROR_CODES && response.header("Server") in SERVER_CHECK &&
-            response.header("X-Varnish") == null
+        return response.header("cf-mitigated") == "challenge"
     }
 
     override fun intercept(
@@ -111,5 +109,4 @@ class CloudflareInterceptor(context: Context) : WebViewInterceptor(context) {
 }
 
 private val ERROR_CODES = intArrayOf(403, 503)
-private val SERVER_CHECK = arrayOf("cloudflare-nginx", "cloudflare")
 private const val COOKIE_NAME = "cf_clearance"