From 6783cebec7b001d7de93fb7071c52d1172ac46c8 Mon Sep 17 00:00:00 2001
From: bapeey <90949336+bapeey@users.noreply.github.com>
Date: Sun, 17 Nov 2024 08:08:31 -0500
Subject: [PATCH] SchaleNetwork: Fix http 400 (#6072)

* fix http 400

* add default headers

* requested changes

* minor changes
---
 src/all/koharu/build.gradle                   |  2 +-
 .../tachiyomi/extension/all/koharu/Koharu.kt  | 44 ++++++++++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/all/koharu/build.gradle b/src/all/koharu/build.gradle
index 0bd0a7ad2..a000dd3ad 100644
--- a/src/all/koharu/build.gradle
+++ b/src/all/koharu/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'SchaleNetwork'
     extClass = '.KoharuFactory'
-    extVersionCode = 10
+    extVersionCode = 11
     isNsfw = true
 }
 
diff --git a/src/all/koharu/src/eu/kanade/tachiyomi/extension/all/koharu/Koharu.kt b/src/all/koharu/src/eu/kanade/tachiyomi/extension/all/koharu/Koharu.kt
index 06cbbe945..fa71cd005 100644
--- a/src/all/koharu/src/eu/kanade/tachiyomi/extension/all/koharu/Koharu.kt
+++ b/src/all/koharu/src/eu/kanade/tachiyomi/extension/all/koharu/Koharu.kt
@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
@@ -62,9 +63,25 @@ class Koharu(
 
     private fun remadd() = preferences.getBoolean(PREF_REM_ADD, false)
 
-    override fun headersBuilder() = super.headersBuilder()
-        .add("Referer", "$baseUrl/")
-        .add("Origin", baseUrl)
+    private fun getDomain(): String {
+        try {
+            val noRedirectClient = client.newBuilder().followRedirects(false).build()
+            val host = noRedirectClient.newCall(GET(baseUrl, headers)).execute()
+                .headers["Location"]?.toHttpUrlOrNull()?.host
+                ?: return baseUrl
+            return "https://$host"
+        } catch (_: Exception) {
+            return baseUrl
+        }
+    }
+
+    private val lazyHeaders by lazy {
+        val domain = getDomain()
+        headersBuilder()
+            .set("Referer", "$domain/")
+            .set("Origin", domain)
+            .build()
+    }
 
     private fun getManga(book: Entry) = SManga.create().apply {
         setUrlWithoutDomain("${book.id}/${book.public_key}")
@@ -74,7 +91,6 @@ class Koharu(
 
     private fun getImagesByMangaEntry(entry: MangaEntry): Pair<ImagesInfo, String> {
         val data = entry.data
-        val quality = 0
         fun getIPK(
             ori: DataKey?,
             alt1: DataKey?,
@@ -107,19 +123,19 @@ class Koharu(
             else -> "0"
         }
 
-        val imagesResponse = client.newCall(GET("$apiBooksUrl/data/${entry.id}/${entry.public_key}/$id/$public_key?v=${entry.updated_at ?: entry.created_at}&w=$realQuality", headers)).execute()
+        val imagesResponse = client.newCall(GET("$apiBooksUrl/data/${entry.id}/${entry.public_key}/$id/$public_key?v=${entry.updated_at ?: entry.created_at}&w=$realQuality", lazyHeaders)).execute()
         val images = imagesResponse.parseAs<ImagesInfo>() to realQuality
         return images
     }
 
     // Latest
 
-    override fun latestUpdatesRequest(page: Int) = GET("$apiBooksUrl?page=$page" + if (searchLang.isNotBlank()) "&s=language!:\"$searchLang\"" else "", headers)
+    override fun latestUpdatesRequest(page: Int) = GET("$apiBooksUrl?page=$page" + if (searchLang.isNotBlank()) "&s=language!:\"$searchLang\"" else "", lazyHeaders)
     override fun latestUpdatesParse(response: Response) = popularMangaParse(response)
 
     // Popular
 
-    override fun popularMangaRequest(page: Int) = GET("$apiBooksUrl?sort=8&page=$page" + if (searchLang.isNotBlank()) "&s=language!:\"$searchLang\"" else "", headers)
+    override fun popularMangaRequest(page: Int) = GET("$apiBooksUrl?sort=8&page=$page" + if (searchLang.isNotBlank()) "&s=language!:\"$searchLang\"" else "", lazyHeaders)
     override fun popularMangaParse(response: Response): MangasPage {
         val data = response.parseAs<Books>()
 
@@ -134,7 +150,7 @@ class Koharu(
         return when {
             query.startsWith(PREFIX_ID_KEY_SEARCH) -> {
                 val ipk = query.removePrefix(PREFIX_ID_KEY_SEARCH)
-                val response = client.newCall(GET("$apiBooksUrl/detail/$ipk", headers)).execute()
+                val response = client.newCall(GET("$apiBooksUrl/detail/$ipk", lazyHeaders)).execute()
                 Observable.just(searchMangaParse2(response))
             }
             else -> super.fetchSearchManga(page, query, filters)
@@ -173,7 +189,7 @@ class Koharu(
             addQueryParameter("page", page.toString())
         }.build()
 
-        return GET(url, headers)
+        return GET(url, lazyHeaders)
     }
 
     override fun searchMangaParse(response: Response) = popularMangaParse(response)
@@ -195,7 +211,7 @@ class Koharu(
     // Details
 
     override fun mangaDetailsRequest(manga: SManga): Request {
-        return GET("$apiBooksUrl/detail/${manga.url}", headers)
+        return GET("$apiBooksUrl/detail/${manga.url}", lazyHeaders)
     }
 
     override fun mangaDetailsParse(response: Response): SManga {
@@ -296,7 +312,7 @@ class Koharu(
     // Chapter
 
     override fun chapterListRequest(manga: SManga): Request {
-        return GET("$apiBooksUrl/detail/${manga.url}", headers)
+        return GET("$apiBooksUrl/detail/${manga.url}", lazyHeaders)
     }
 
     override fun chapterListParse(response: Response): List<SChapter> {
@@ -315,7 +331,7 @@ class Koharu(
     // Page List
 
     override fun pageListRequest(chapter: SChapter): Request {
-        return GET("$apiBooksUrl/detail/${chapter.url}", headers)
+        return GET("$apiBooksUrl/detail/${chapter.url}", lazyHeaders)
     }
 
     override fun pageListParse(response: Response): List<Page> {
@@ -327,6 +343,10 @@ class Koharu(
         }
     }
 
+    override fun imageRequest(page: Page): Request {
+        return GET(page.imageUrl!!, lazyHeaders)
+    }
+
     override fun imageUrlParse(response: Response) = throw UnsupportedOperationException()
 
     // Settings