From 5ca42bf9b6b1e76328a31ef4fd9c8921d57e5d95 Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Mon, 23 Aug 2021 04:02:55 +0430
Subject: [PATCH] make it compile

---
 .../eu/kanade/tachiyomi/network/PersistentCookieJar.kt      | 2 +-
 .../eu/kanade/tachiyomi/network/PersistentCookieStore.kt    | 3 +--
 .../tachiyomi/network/interceptor/CloudflareInterceptor.kt  | 6 +++++-
 .../kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieJar.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieJar.kt
index 120e8d6e..2daddab1 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieJar.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieJar.kt
@@ -17,4 +17,4 @@ class PersistentCookieJar(context: Context) : CookieJar {
     override fun loadForRequest(url: HttpUrl): List<Cookie> {
         return store.get(url)
     }
-}
\ No newline at end of file
+}
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieStore.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieStore.kt
index 82cde3a1..20e26e88 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieStore.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/PersistentCookieStore.kt
@@ -76,5 +76,4 @@ class PersistentCookieStore(context: Context) {
     }
 
     private fun Cookie.hasExpired() = System.currentTimeMillis() >= expiresAt
-
-}
\ No newline at end of file
+}
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
index a6a0d5c0..315aaa46 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
@@ -4,6 +4,7 @@ import com.gargoylesoftware.htmlunit.BrowserVersion
 import com.gargoylesoftware.htmlunit.WebClient
 import com.gargoylesoftware.htmlunit.html.HtmlPage
 import eu.kanade.tachiyomi.network.NetworkHelper
+import mu.KotlinLogging
 import okhttp3.Cookie
 import okhttp3.HttpUrl
 import okhttp3.Interceptor
@@ -14,6 +15,8 @@ import java.io.IOException
 
 // from TachiWeb-Server
 class CloudflareInterceptor : Interceptor {
+    private val logger = KotlinLogging.logger {}
+
     private val network: NetworkHelper by injectLazy()
 
     private val `serverCheck` = arrayOf("cloudflare-nginx", "cloudflare")
@@ -24,6 +27,7 @@ class CloudflareInterceptor : Interceptor {
 
         // Check if Cloudflare anti-bot is on
         if (response.code == 503 && response.header("Server") in serverCheck) {
+            logger.debug { "CloudflareInterceptor is kicking in..." }
             return try {
                 chain.proceed(resolveChallenge(response))
             } catch (e: Exception) {
@@ -92,4 +96,4 @@ class CloudflareInterceptor : Interceptor {
             .header("Cookie", newCookies.map { it.toString() }.joinToString("; "))
             .build()
     }
-}
\ No newline at end of file
+}
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
index 5f801d12..bf0faf3a 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt
@@ -75,7 +75,7 @@ abstract class HttpSource : CatalogueSource {
      * Headers builder for requests. Implementations can override this method for custom headers.
      */
     protected open fun headersBuilder() = Headers.Builder().apply {
-        add("User-Agent", DEFAULT_USERAGENT)
+        add("User-Agent", DEFAULT_USER_AGENT)
     }
 
     /**