From fcf3e8a428ef543d3c3edf74f3641f0d3dfc0d54 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Tue, 11 Mar 2025 01:26:23 +0100
Subject: [PATCH 01/12] fix(lib/lycoris): fix parse json

---
 .../lib/lycorisextractor/LycorisExtractor.kt  | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 57b47590..58efa941 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -10,7 +10,6 @@ import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import uy.kohesive.injekt.injectLazy
 import java.nio.charset.Charset
 
 class LycorisCafeExtractor(private val client: OkHttpClient) {
@@ -19,7 +18,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     private val GETLNKURL = "https://www.lycoris.cafe/api/watch/getLink"
 
-    private val json: Json by injectLazy()
+    private val json = Json { ignoreUnknownKeys = true }
 
     // Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lycoris.py
     fun getVideosFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
@@ -33,40 +32,17 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             GET(url, headers = embedHeaders),
         ).execute().asJsoup()
 
-        val scripts = document.select("script")
+        val script = document.select("script[type='application/json']").first()?.data().toString()
 
-        val episodeDataPattern = Regex("episodeInfo\\s*:\\s*(\\{.*?\\}),", RegexOption.DOT_MATCHES_ALL)
-        var episodeData: String? = null
+        val scriptData = json.decodeFromString<ScriptBody>(script)
 
-        for (script in scripts) {
-            val content = script.data()
-            val match = episodeDataPattern.find(content)
+        val data = json.decodeFromString<ScriptEpisode>(scriptData.body)
 
-            if (match != null) {
-                episodeData = match.groupValues[1]
-                break
-            }
-        }
-
-        val result = mutableMapOf<String, String?>()
-
-        val patterns = listOf(
-            "id" to Regex("id\\s*:\\s*(\\d+)"),
-            "FHD" to Regex("FHD\\s*:\\s*\"([^\"]+)\""),
-            "HD" to Regex("HD\\s*:\\s*\"([^\"]+)\""),
-            "SD" to Regex("SD\\s*:\\s*\"([^\"]+)\"")
-        )
-
-        patterns.forEach { (key, pattern) ->
-            result[key] = episodeData?.let { pattern.find(it)?.groups?.get(1)?.value }
-        }
-
-        var linkList: String? = fetchAndDecodeVideo(client, result["id"].toString(), isSecondary = false).toString()
-
-        val fhdLink = fetchAndDecodeVideo(client, result["FHD"].toString(), isSecondary = true).toString()
-        val sdLink = fetchAndDecodeVideo(client, result["SD"].toString(), isSecondary = true).toString()
-        val hdLink = fetchAndDecodeVideo(client, result["HD"].toString(), isSecondary = true).toString()
+        var linkList: String? = fetchAndDecodeVideo(client, data.episodeInfo.id.toString(), isSecondary = false).toString()
 
+        val fhdLink = fetchAndDecodeVideo(client, data.episodeInfo.FHD.toString(), isSecondary = true).toString()
+        val sdLink = fetchAndDecodeVideo(client, data.episodeInfo.SD.toString(), isSecondary = true).toString()
+        val hdLink = fetchAndDecodeVideo(client, data.episodeInfo.HD.toString(), isSecondary = true).toString()
 
         if (linkList.isNullOrBlank() || linkList == "{}") {
             if (fhdLink.isNotEmpty()) {
@@ -78,20 +54,28 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             if (sdLink.isNotEmpty()) {
                 videos.add(Video(sdLink, "${prefix}lycoris.cafe - 480p", sdLink))
             }
+
         }else {
-            val videoLinks = Json.decodeFromString<VideoLinks>(linkList)
+            val videoLinks = json.decodeFromString<VideoLinksApi>(linkList)
 
             videoLinks.FHD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
-            }?: videos.add(Video(fhdLink, "${prefix}lycoris.cafe - 1080p", fhdLink))
+            }?: fhdLink.takeIf { it.contains("https://") }?.let {
+                videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
+            }
 
             videoLinks.HD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
-            }?: videos.add(Video(hdLink, "${prefix}lycoris.cafe - 720p", hdLink))
+            }?: hdLink.takeIf { it.contains("https://") }?.let {
+                videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
+            }
 
             videoLinks.SD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
-            }?: videos.add(Video(sdLink, "${prefix}lycoris.cafe - 480p", sdLink))
+            }?: sdLink.takeIf { it.contains("https://") }?.let {
+                videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
+            }
+
         }
         return videos
 
@@ -146,6 +130,8 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
     }
 
     private fun checkLinks(client: OkHttpClient, link: String): Boolean {
+        if (!link.contains("https://")) return false
+
         client.newCall(GET(link)).execute().use { response ->
             return response.code.toString() == "200"
         }
@@ -208,16 +194,32 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
     }
 
     @Serializable
-    data class VideoLinks(
+    data class ScriptBody(
+        val body: String
+    )
+
+    @Serializable
+    data class ScriptEpisode(
+        val episodeInfo: EpisodeInfo
+    )
+
+    @Serializable
+    data class EpisodeInfo(
+        val id: Int? = null,
+        val FHD: String? = null,
+        val HD: String? = null,
+        val SD: String? = null,
+    )
+
+    @Serializable
+    data class VideoLinksApi(
         val HD: String? = null,
         val SD: String? = null,
         val FHD: String? = null,
         val Source: String? = null,
-        val preview: String? = null,
         val SourceMKV: String? = null
     )
 
-
 }
 
 
-- 
2.47.2


From f2f3e26f5e2626c9718cf121be8d6ec15c36e7a5 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 12 Mar 2025 18:30:53 +0100
Subject: [PATCH 02/12] fix(lib/lycoris): small changes

---
 .../lib/lycorisextractor/LycorisExtractor.kt        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 58efa941..45155ee8 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -10,6 +10,7 @@ import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
+import uy.kohesive.injekt.injectLazy
 import java.nio.charset.Charset
 
 class LycorisCafeExtractor(private val client: OkHttpClient) {
@@ -18,7 +19,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     private val GETLNKURL = "https://www.lycoris.cafe/api/watch/getLink"
 
-    private val json = Json { ignoreUnknownKeys = true }
+    private val json: Json by injectLazy()
 
     // Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lycoris.py
     fun getVideosFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
@@ -114,12 +115,12 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
                 val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
 
                 url = GETLNKURL.toHttpUrl().newBuilder()
-                    ?.addQueryParameter("link", finalText)
-                    ?.build() ?: throw IllegalStateException("Invalid URL")
+                    .addQueryParameter("link", finalText)
+                    .build()
             } else {
                 url = GETSECONDARYURL.toHttpUrl().newBuilder()
-                    ?.addQueryParameter("id", episodeId)
-                    ?.build() ?: throw IllegalStateException("Invalid URL")
+                    .addQueryParameter("id", episodeId)
+                    .build()
             }
             client.newCall(GET(url))
                 .execute()
@@ -147,7 +148,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
                 """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
                 """\\x([0-9a-fA-F]{2})|""" +     // \xHH
                 """\\([0-7]{1,3})|""" +          // \OOO (octal)
-                """\\([btnfr"'$\\\\])"""         // \n, \t, itd.
+                """\\([btnfr"'$\\])"""         // \n, \t, itd.
         )
 
         return regex.replace(withoutLineContinuation) { match ->
-- 
2.47.2


From 47c3eb19725d68cb87f833202c14b146c4f19d98 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 12 Mar 2025 18:50:14 +0100
Subject: [PATCH 03/12] fix(lib/lycoris): small changes v2

---
 .../lib/lycorisextractor/LycorisExtractor.kt  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 45155ee8..3f313772 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -4,6 +4,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import android.util.Base64
 import eu.kanade.tachiyomi.util.asJsoup
+import eu.kanade.tachiyomi.util.parseAs
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.Serializable
 import okhttp3.Headers
@@ -35,45 +36,45 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
         val script = document.select("script[type='application/json']").first()?.data().toString()
 
-        val scriptData = json.decodeFromString<ScriptBody>(script)
+        val scriptData = script.parseAs<ScriptBody>()
 
-        val data = json.decodeFromString<ScriptEpisode>(scriptData.body)
+        val data = scriptData.body.parseAs<ScriptEpisode>()
 
-        var linkList: String? = fetchAndDecodeVideo(client, data.episodeInfo.id.toString(), isSecondary = false).toString()
+        val linkList: String? = fetchAndDecodeVideo(client, data.episodeInfo.id.toString(), isSecondary = false)
 
-        val fhdLink = fetchAndDecodeVideo(client, data.episodeInfo.FHD.toString(), isSecondary = true).toString()
-        val sdLink = fetchAndDecodeVideo(client, data.episodeInfo.SD.toString(), isSecondary = true).toString()
-        val hdLink = fetchAndDecodeVideo(client, data.episodeInfo.HD.toString(), isSecondary = true).toString()
+        val fhdLink = fetchAndDecodeVideo(client, data.episodeInfo.FHD.toString(), isSecondary = true)
+        val sdLink = fetchAndDecodeVideo(client, data.episodeInfo.SD.toString(), isSecondary = true)
+        val hdLink = fetchAndDecodeVideo(client, data.episodeInfo.HD.toString(), isSecondary = true)
 
         if (linkList.isNullOrBlank() || linkList == "{}") {
-            if (fhdLink.isNotEmpty()) {
+            if (!fhdLink.isNullOrBlank()) {
                 videos.add(Video(fhdLink, "${prefix}lycoris.cafe - 1080p", fhdLink))
             }
-            if (hdLink.isNotEmpty()) {
+            if (!hdLink.isNullOrBlank()) {
                 videos.add(Video(hdLink, "${prefix}lycoris.cafe - 720p", hdLink))
             }
-            if (sdLink.isNotEmpty()) {
+            if (!sdLink.isNullOrBlank()) {
                 videos.add(Video(sdLink, "${prefix}lycoris.cafe - 480p", sdLink))
             }
 
-        }else {
+        } else {
             val videoLinks = json.decodeFromString<VideoLinksApi>(linkList)
 
             videoLinks.FHD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
-            }?: fhdLink.takeIf { it.contains("https://") }?.let {
+            }?: fhdLink?.takeIf { it.contains("https://") }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
             }
 
             videoLinks.HD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
-            }?: hdLink.takeIf { it.contains("https://") }?.let {
+            }?: hdLink?.takeIf { it.contains("https://") }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
             }
 
             videoLinks.SD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
-            }?: sdLink.takeIf { it.contains("https://") }?.let {
+            }?: sdLink?.takeIf { it.contains("https://") }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
             }
 
@@ -82,7 +83,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     }
 
-    private fun decodeVideoLinks(encodedUrl: String?): Any? {
+    private fun decodeVideoLinks(encodedUrl: String?): String? {
         if (encodedUrl.isNullOrEmpty()) {
             return null
         }
@@ -106,7 +107,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         }
     }
 
-    private fun fetchAndDecodeVideo(client: OkHttpClient, episodeId: String, isSecondary: Boolean = false): Any? {
+    private fun fetchAndDecodeVideo(client: OkHttpClient, episodeId: String, isSecondary: Boolean = false): String? {
             val url: HttpUrl
 
             if (isSecondary) {
-- 
2.47.2


From bc313fa859524bf355f3b4b65371223827adb600 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 12 Mar 2025 20:43:09 +0100
Subject: [PATCH 04/12] fix(lib/lycoris): small changes v3

---
 .../kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 3f313772..01564dd9 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -58,7 +58,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             }
 
         } else {
-            val videoLinks = json.decodeFromString<VideoLinksApi>(linkList)
+            val videoLinks = linkList.parseAs<VideoLinksApi>()
 
             videoLinks.FHD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
-- 
2.47.2


From b9e9dbb2a9c1dcc1a85c89f0eafd5e356092cf33 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Sat, 15 Mar 2025 01:31:58 +0100
Subject: [PATCH 05/12] fix(lib/lycoris): small changes v4

---
 .../lib/lycorisextractor/LycorisExtractor.kt  | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 01564dd9..36e8609c 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -34,7 +34,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             GET(url, headers = embedHeaders),
         ).execute().asJsoup()
 
-        val script = document.select("script[type='application/json']").first()?.data().toString()
+        val script = document.select("script[type='application/json']").first()?.data()?.toString() ?: return emptyList()
 
         val scriptData = script.parseAs<ScriptBody>()
 
@@ -77,14 +77,13 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             }?: sdLink?.takeIf { it.contains("https://") }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
             }
-
         }
         return videos
 
     }
 
-    private fun decodeVideoLinks(encodedUrl: String?): String? {
-        if (encodedUrl.isNullOrEmpty()) {
+    private fun decodeVideoLinks(encodedUrl: String): String? {
+        if (encodedUrl.isBlank()) {
             return null
         }
 
@@ -108,27 +107,27 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
     }
 
     private fun fetchAndDecodeVideo(client: OkHttpClient, episodeId: String, isSecondary: Boolean = false): String? {
-            val url: HttpUrl
+        val url: HttpUrl
 
-            if (isSecondary) {
-                val convertedText = episodeId.toByteArray(Charset.forName("UTF-8")).toString(Charset.forName("ISO-8859-1"))
-                val unicodeEscape = decodePythonEscape(convertedText)
-                val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
+        if (isSecondary) {
+            val convertedText = episodeId.toByteArray(Charset.forName("UTF-8")).toString(Charset.forName("ISO-8859-1"))
+            val unicodeEscape = decodePythonEscape(convertedText)
+            val finalText = unicodeEscape.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8)
 
-                url = GETLNKURL.toHttpUrl().newBuilder()
-                    .addQueryParameter("link", finalText)
-                    .build()
-            } else {
-                url = GETSECONDARYURL.toHttpUrl().newBuilder()
-                    .addQueryParameter("id", episodeId)
-                    .build()
+            url = GETLNKURL.toHttpUrl().newBuilder()
+                .addQueryParameter("link", finalText)
+                .build()
+        } else {
+            url = GETSECONDARYURL.toHttpUrl().newBuilder()
+                .addQueryParameter("id", episodeId)
+                .build()
+        }
+        client.newCall(GET(url))
+            .execute()
+            .use { response ->
+                val data = response.body.string() ?: ""
+                return decodeVideoLinks(data)
             }
-            client.newCall(GET(url))
-                .execute()
-                .use { response ->
-                    val data = response.body.string() ?: ""
-                    return decodeVideoLinks(data)
-                }
     }
 
     private fun checkLinks(client: OkHttpClient, link: String): Boolean {
-- 
2.47.2


From 9a8ea456b458a1ba0821103a68bdc7efab0d8a80 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Mon, 24 Mar 2025 16:59:52 +0100
Subject: [PATCH 06/12] fix(lib/lycoris): small changes v5

---
 .../lib/lycorisextractor/LycorisExtractor.kt  | 32 +++++++++++--------
 src/pl/docchi/build.gradle                    |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index 36e8609c..f28484d2 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -5,13 +5,11 @@ import eu.kanade.tachiyomi.network.GET
 import android.util.Base64
 import eu.kanade.tachiyomi.util.asJsoup
 import eu.kanade.tachiyomi.util.parseAs
-import kotlinx.serialization.json.Json
 import kotlinx.serialization.Serializable
 import okhttp3.Headers
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-import uy.kohesive.injekt.injectLazy
 import java.nio.charset.Charset
 
 class LycorisCafeExtractor(private val client: OkHttpClient) {
@@ -20,8 +18,6 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     private val GETLNKURL = "https://www.lycoris.cafe/api/watch/getLink"
 
-    private val json: Json by injectLazy()
-
     // Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lycoris.py
     fun getVideosFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
 
@@ -34,17 +30,25 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             GET(url, headers = embedHeaders),
         ).execute().asJsoup()
 
-        val script = document.select("script[type='application/json']").first()?.data()?.toString() ?: return emptyList()
+        val script = document.selectFirst("script[type='application/json']")?.data() ?: return emptyList()
 
         val scriptData = script.parseAs<ScriptBody>()
 
         val data = scriptData.body.parseAs<ScriptEpisode>()
 
-        val linkList: String? = fetchAndDecodeVideo(client, data.episodeInfo.id.toString(), isSecondary = false)
+        val linkList = data.episodeInfo.id?.let {
+            fetchAndDecodeVideo(client, data.episodeInfo.id.toString(), isSecondary = false)
+        }
 
-        val fhdLink = fetchAndDecodeVideo(client, data.episodeInfo.FHD.toString(), isSecondary = true)
-        val sdLink = fetchAndDecodeVideo(client, data.episodeInfo.SD.toString(), isSecondary = true)
-        val hdLink = fetchAndDecodeVideo(client, data.episodeInfo.HD.toString(), isSecondary = true)
+        val fhdLink = data.episodeInfo.FHD?.let {
+            fetchAndDecodeVideo(client, data.episodeInfo.FHD, isSecondary = true)
+        }
+        val sdLink = data.episodeInfo.SD?.let {
+            fetchAndDecodeVideo(client, data.episodeInfo.SD, isSecondary = true)
+        }
+        val hdLink = data.episodeInfo.HD?.let {
+            fetchAndDecodeVideo(client, data.episodeInfo.HD, isSecondary = true)
+        }
 
         if (linkList.isNullOrBlank() || linkList == "{}") {
             if (!fhdLink.isNullOrBlank()) {
@@ -56,25 +60,24 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
             if (!sdLink.isNullOrBlank()) {
                 videos.add(Video(sdLink, "${prefix}lycoris.cafe - 480p", sdLink))
             }
-
         } else {
             val videoLinks = linkList.parseAs<VideoLinksApi>()
 
             videoLinks.FHD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
-            }?: fhdLink?.takeIf { it.contains("https://") }?.let {
+            } ?: fhdLink?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 1080p", it))
             }
 
             videoLinks.HD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
-            }?: hdLink?.takeIf { it.contains("https://") }?.let {
+            } ?: hdLink?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 720p", it))
             }
 
             videoLinks.SD?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
-            }?: sdLink?.takeIf { it.contains("https://") }?.let {
+            } ?: sdLink?.takeIf { checkLinks(client, it) }?.let {
                 videos.add(Video(it, "${prefix}lycoris.cafe - 480p", it))
             }
         }
@@ -125,7 +128,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         client.newCall(GET(url))
             .execute()
             .use { response ->
-                val data = response.body.string() ?: ""
+                val data = response.body.string()
                 return decodeVideoLinks(data)
             }
     }
@@ -142,6 +145,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         // 1. Obsługa kontynuacji linii (backslash + newline)
         val withoutLineContinuation = text.replace("\\\n", "")
 
+
         // 2. Regex do wykrywania wszystkich sekwencji escape
         val regex = Regex(
             """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
diff --git a/src/pl/docchi/build.gradle b/src/pl/docchi/build.gradle
index 79a34009..02e2d766 100644
--- a/src/pl/docchi/build.gradle
+++ b/src/pl/docchi/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Docchi'
     extClass = '.Docchi'
-    extVersionCode = 2
+    extVersionCode = 3
     isNsfw = true
 }
 
-- 
2.47.2


From de4383ff6fa48f848282831f8f01185fe31667f2 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 26 Mar 2025 01:36:23 +0100
Subject: [PATCH 07/12] fix(lib/lycoris&lulu): big change v1

---
 .../lib/luluextractor/LuluExtractor.kt        | 113 +++++++++---------
 .../lib/lycorisextractor/LycorisExtractor.kt  |  22 ++--
 .../animeextension/pl/docchi/Docchi.kt        |   2 +-
 3 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
index afcd99bc..0a30f355 100644
--- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
+++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
@@ -7,22 +7,22 @@ import okhttp3.OkHttpClient
 import java.util.regex.Pattern
 
 class LuluExtractor(private val client: OkHttpClient) {
+    //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
+    fun videosFromUrl(url: String, prefix: String, headers: Headers): List<Video> {
+        val luluHeaders = headers.newBuilder()
+            .add("Referer", "https://luluvdo.com")
+            .add("Origin", "https://luluvdo.com")
+            .build()
 
-    private val headers = Headers.Builder()
-        .add("Referer", "https://luluvdo.com")
-        .add("Origin", "https://luluvdo.com")
-        .build()
-
-    fun videosFromUrl(url: String, prefix: String): List<Video> {
         val videos = mutableListOf<Video>()
 
         try {
-            val html = client.newCall(GET(url, headers)).execute().use { it.body.string() }
+            val html = client.newCall(GET(url, luluHeaders)).execute().use { it.body.string() }
             val m3u8Url = extractM3u8Url(html) ?: return emptyList()
             val fixedUrl = fixM3u8Link(m3u8Url)
-            val quality = getResolution(fixedUrl)
+            val quality = getResolution(fixedUrl, luluHeaders)
 
-            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl))
+            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl, luluHeaders))
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -50,37 +50,42 @@ class LuluExtractor(private val client: OkHttpClient) {
 
     private fun fixM3u8Link(link: String): String {
         val paramOrder = listOf("t", "s", "e", "f")
-        val baseUrl = link.split("?").first()
-        val params = link.split("?").getOrNull(1)?.split("&") ?: emptyList()
+        val params = Pattern.compile("[?&]([^=]*)=([^&]*)").matcher(link).let { matcher ->
+            generateSequence { if (matcher.find()) matcher.group(1) to matcher.group(2) else null }.toList()
+        }
 
-        val paramMap = mutableMapOf<String, String>()
-        val extraParams = mutableMapOf(
-            "i" to "0.3",
-            "sp" to "0"
-        )
+        val paramDict = mutableMapOf<String, String>()
+        val extraParams = mutableMapOf<String, String>()
 
-        params.forEachIndexed { index, param ->
-            val parts = param.split("=")
-            when {
-                parts.size == 2 -> {
-                    val (key, value) = parts
-                    if (key in paramOrder) paramMap[key] = value
-                    else extraParams[key] = value
+        params.forEachIndexed { index, (key , value) ->
+            if (key.isNullOrEmpty()) {
+                if (index < paramOrder.size) {
+                    if (value != null) {
+                        paramDict[paramOrder[index]] = value
+                    }
+                }
+            } else {
+                if (value != null) {
+                    extraParams[key] = value
                 }
-                index < paramOrder.size -> paramMap[paramOrder[index]] = parts.firstOrNull() ?: ""
             }
         }
 
-        return buildString {
-            append(baseUrl)
-            append("?")
-            append(paramOrder.joinToString("&") { "$it=${paramMap[it]}" })
-            append("&")
-            append(extraParams.map { "${it.key}=${it.value}" }.joinToString("&"))
-        }
+        extraParams["i"] = "0.3"
+        extraParams["sp"] = "0"
+
+        val baseUrl = link.split("?")[0]
+
+        val fixedLink = StringBuilder(baseUrl)
+        val orderedParams = paramOrder.filter { paramDict.containsKey(it) }.map { "$it=${paramDict[it]}" }
+
+        fixedLink.append("?").append(orderedParams.joinToString("&"))
+        fixedLink.append("&").append(extraParams.entries.joinToString("&") { "${it.key}=${it.value}" })
+
+        return fixedLink.toString()
     }
 
-    private fun getResolution(m3u8Url: String): String {
+    private fun getResolution(m3u8Url: String, headers: Headers): String {
         return try {
             val content = client.newCall(GET(m3u8Url, headers)).execute()
                 .use { it.body.string() }
@@ -98,31 +103,29 @@ class LuluExtractor(private val client: OkHttpClient) {
 }
 
 object JavaScriptUnpacker {
-    private val UNPACK_REGEX = Regex(
-        """}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""",
-        RegexOption.DOT_MATCHES_ALL
-    )
-
-    fun unpack(encodedJs: String): String? {
-        val match = UNPACK_REGEX.find(encodedJs) ?: return null
-        val (payload, radixStr, countStr, symtabStr) = match.destructured
-
-        val radix = radixStr.toIntOrNull() ?: return null
-        val count = countStr.toIntOrNull() ?: return null
-        val symtab = symtabStr.split('|')
-
-        if (symtab.size != count) throw IllegalArgumentException("Invalid symtab size")
-
-        val baseDict = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-            .take(radix)
-            .withIndex()
-            .associate { it.value to it.index }
-
-        return Regex("""\b\w+\b""").replace(payload) { mr ->
-            symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
-        }.replace("\\", "")
+    private val UNPACK_REGEX by lazy {
+        Regex("""\}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""")
     }
+    fun unpack(encodedJs: String): String? {
+            val match = UNPACK_REGEX.find(encodedJs) ?: return null
+            val (payload, radixStr, countStr, symtabStr) = match.destructured
 
+            val radix = radixStr.toIntOrNull() ?: return null
+            val count = countStr.toIntOrNull() ?: return null
+            val symtab = symtabStr.split('|')
+
+            if (symtab.size != count) throw IllegalArgumentException("Invalid symtab size")
+
+            val baseDict = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                .take(radix)
+                .withIndex()
+                .associate { it.value to it.index }
+
+            return Regex("""\b\w+\b""").replace(payload) { mr ->
+                symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
+            }.replace("\\", "")
+
+    }
     private fun unbase(value: String, radix: Int, dict: Map<Char, Int>): Int {
         var result = 0
         var multiplier = 1
diff --git a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
index f28484d2..0b2430d4 100644
--- a/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
+++ b/lib/lycoris-extractor/src/main/java/eu/kanade/tachiyomi/lib/lycorisextractor/LycorisExtractor.kt
@@ -18,6 +18,16 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
 
     private val GETLNKURL = "https://www.lycoris.cafe/api/watch/getLink"
 
+    private val wordsRegex by lazy {
+        Regex(
+        """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
+            """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
+            """\\x([0-9a-fA-F]{2})|""" +     // \xHH
+            """\\([0-7]{1,3})|""" +          // \OOO (octal)
+            """\\([btnfr"'$\\])"""         // \n, \t, itd.
+        )
+    }
+
     // Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lycoris.py
     fun getVideosFromUrl(url: String, headers: Headers, prefix: String): List<Video> {
 
@@ -145,17 +155,7 @@ class LycorisCafeExtractor(private val client: OkHttpClient) {
         // 1. Obsługa kontynuacji linii (backslash + newline)
         val withoutLineContinuation = text.replace("\\\n", "")
 
-
-        // 2. Regex do wykrywania wszystkich sekwencji escape
-        val regex = Regex(
-            """\\U([0-9a-fA-F]{8})|""" +     // \UXXXXXXXX
-                """\\u([0-9a-fA-F]{4})|""" +     // \uXXXX
-                """\\x([0-9a-fA-F]{2})|""" +     // \xHH
-                """\\([0-7]{1,3})|""" +          // \OOO (octal)
-                """\\([btnfr"'$\\])"""         // \n, \t, itd.
-        )
-
-        return regex.replace(withoutLineContinuation) { match ->
+        return wordsRegex.replace(withoutLineContinuation) { match ->
             val (u8, u4, x2, octal, simple) = match.destructured
             when {
                 u8.isNotEmpty() -> handleUnicode8(u8)
diff --git a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
index 62daaed8..63046fed 100644
--- a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
+++ b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
@@ -203,7 +203,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
                 }
 
                 serverUrl.contains("luluvdo.com") -> {
-                    luluExtractor.videosFromUrl(serverUrl, prefix)
+                    luluExtractor.videosFromUrl(serverUrl, prefix, headers)
                 }
 
                 serverUrl.contains("drive.google.com") -> {
-- 
2.47.2


From cfdcc6480a7def4743e47a393b1e268a4f0296be Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 26 Mar 2025 01:43:41 +0100
Subject: [PATCH 08/12] fix(lib/lycoris&lulu): small change v2

---
 .../lib/luluextractor/LuluExtractor.kt        | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
index 0a30f355..b98bd401 100644
--- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
+++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
@@ -104,26 +104,27 @@ class LuluExtractor(private val client: OkHttpClient) {
 
 object JavaScriptUnpacker {
     private val UNPACK_REGEX by lazy {
-        Regex("""\}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""")
+        Regex("""\}\('(.*)', *(\d+), *(\d+), *'(.*?)'\.split\('\|'\)""",
+            RegexOption.DOT_MATCHES_ALL)
     }
     fun unpack(encodedJs: String): String? {
-            val match = UNPACK_REGEX.find(encodedJs) ?: return null
-            val (payload, radixStr, countStr, symtabStr) = match.destructured
+        val match = UNPACK_REGEX.find(encodedJs) ?: return null
+        val (payload, radixStr, countStr, symtabStr) = match.destructured
 
-            val radix = radixStr.toIntOrNull() ?: return null
-            val count = countStr.toIntOrNull() ?: return null
-            val symtab = symtabStr.split('|')
+        val radix = radixStr.toIntOrNull() ?: return null
+        val count = countStr.toIntOrNull() ?: return null
+        val symtab = symtabStr.split('|')
 
-            if (symtab.size != count) throw IllegalArgumentException("Invalid symtab size")
+        if (symtab.size != count) throw IllegalArgumentException("Invalid symtab size")
 
-            val baseDict = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                .take(radix)
-                .withIndex()
-                .associate { it.value to it.index }
+        val baseDict = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            .take(radix)
+            .withIndex()
+            .associate { it.value to it.index }
 
-            return Regex("""\b\w+\b""").replace(payload) { mr ->
-                symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
-            }.replace("\\", "")
+        return Regex("""\b\w+\b""").replace(payload) { mr ->
+            symtab.getOrNull(unbase(mr.value, radix, baseDict)) ?: mr.value
+        }.replace("\\", "")
 
     }
     private fun unbase(value: String, radix: Int, dict: Map<Char, Int>): Int {
-- 
2.47.2


From 4289c079c5e9adf2e9e2aadb8b7392037e3581ae Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Thu, 27 Mar 2025 00:06:00 +0100
Subject: [PATCH 09/12] fix(lib/lycoris&lulu): small change v3

---
 .../lib/luluextractor/LuluExtractor.kt        | 21 ++++++++++---------
 .../animeextension/pl/docchi/Docchi.kt        |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
index b98bd401..abfbd8c2 100644
--- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
+++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
@@ -6,23 +6,24 @@ import okhttp3.Headers
 import okhttp3.OkHttpClient
 import java.util.regex.Pattern
 
-class LuluExtractor(private val client: OkHttpClient) {
-    //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
-    fun videosFromUrl(url: String, prefix: String, headers: Headers): List<Video> {
-        val luluHeaders = headers.newBuilder()
-            .add("Referer", "https://luluvdo.com")
-            .add("Origin", "https://luluvdo.com")
-            .build()
+class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
 
+    private val headers = headers.newBuilder()
+        .add("Referer", "https://luluvdo.com")
+        .add("Origin", "https://luluvdo.com")
+        .build()
+
+    //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
+    fun videosFromUrl(url: String, prefix: String): List<Video> {
         val videos = mutableListOf<Video>()
 
         try {
-            val html = client.newCall(GET(url, luluHeaders)).execute().use { it.body.string() }
+            val html = client.newCall(GET(url, headers)).execute().use { it.body.string() }
             val m3u8Url = extractM3u8Url(html) ?: return emptyList()
             val fixedUrl = fixM3u8Link(m3u8Url)
-            val quality = getResolution(fixedUrl, luluHeaders)
+            val quality = getResolution(fixedUrl, headers)
 
-            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl, luluHeaders))
+            videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl, headers))
         } catch (e: Exception) {
             e.printStackTrace()
         }
diff --git a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
index 63046fed..4621b611 100644
--- a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
+++ b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
@@ -137,7 +137,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
     private val sibnetExtractor by lazy { SibnetExtractor(client) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val lycorisExtractor by lazy { LycorisCafeExtractor(client) }
-    private val luluExtractor by lazy { LuluExtractor(client) }
+    private val luluExtractor by lazy { LuluExtractor(client, headers) }
     private val googledriveExtractor by lazy { GoogleDriveExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
@@ -203,7 +203,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
                 }
 
                 serverUrl.contains("luluvdo.com") -> {
-                    luluExtractor.videosFromUrl(serverUrl, prefix, headers)
+                    luluExtractor.videosFromUrl(serverUrl, prefix)
                 }
 
                 serverUrl.contains("drive.google.com") -> {
-- 
2.47.2


From 9f910735b2be5f36f37d4a7973f56288ce323ca3 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 2 Apr 2025 19:20:57 +0200
Subject: [PATCH 10/12] fix(lib/lycoris&lulu&docchi): small change v4

---
 .../lib/luluextractor/LuluExtractor.kt        | 23 +++++++++++--------
 .../animeextension/pl/docchi/Docchi.kt        |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
index abfbd8c2..56b47132 100644
--- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
+++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
@@ -3,14 +3,15 @@ package eu.kanade.tachiyomi.lib.luluextractor
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.network.GET
 import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import java.util.regex.Pattern
 
 class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
 
     private val headers = headers.newBuilder()
-        .add("Referer", "https://luluvdo.com")
-        .add("Origin", "https://luluvdo.com")
+        .add("Referer", "https://luluvdo.com/")
+        .add("Origin", "https://luluvdo.com/")
         .build()
 
     //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
@@ -21,7 +22,7 @@ class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
             val html = client.newCall(GET(url, headers)).execute().use { it.body.string() }
             val m3u8Url = extractM3u8Url(html) ?: return emptyList()
             val fixedUrl = fixM3u8Link(m3u8Url)
-            val quality = getResolution(fixedUrl, headers)
+            val quality = getResolution(fixedUrl)
 
             videos.add(Video(fixedUrl, "${prefix}Lulu - $quality", fixedUrl, headers))
         } catch (e: Exception) {
@@ -77,16 +78,18 @@ class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
 
         val baseUrl = link.split("?")[0]
 
-        val fixedLink = StringBuilder(baseUrl)
-        val orderedParams = paramOrder.filter { paramDict.containsKey(it) }.map { "$it=${paramDict[it]}" }
+        val fixedLink = baseUrl.toHttpUrl().newBuilder()
+        paramOrder.filter { paramDict.containsKey(it) }.forEach { key ->
+            fixedLink.addQueryParameter(key, paramDict[key])
+        }
+        extraParams.forEach { (key, value) ->
+            fixedLink.addQueryParameter(key, value)
+        }
 
-        fixedLink.append("?").append(orderedParams.joinToString("&"))
-        fixedLink.append("&").append(extraParams.entries.joinToString("&") { "${it.key}=${it.value}" })
-
-        return fixedLink.toString()
+        return fixedLink.build().toString()
     }
 
-    private fun getResolution(m3u8Url: String, headers: Headers): String {
+    private fun getResolution(m3u8Url: String): String {
         return try {
             val content = client.newCall(GET(m3u8Url, headers)).execute()
                 .use { it.body.string() }
diff --git a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
index 4621b611..d1222e65 100644
--- a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
+++ b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
@@ -278,7 +278,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
         val genres: List<String>,
         val broadcast_day: String?,
         val aired_from: String?,
-        val episodes: Int,
+        val episodes: Int?,
         val season: String,
         val season_year: Int,
         val series_type: String,
-- 
2.47.2


From 7f227fb541fc686662e8333d7a10f919eed64c26 Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Wed, 2 Apr 2025 19:22:25 +0200
Subject: [PATCH 11/12] fix(pl/docchi): tiny change v1

---
 .../eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
index d1222e65..37b3b385 100644
--- a/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
+++ b/src/pl/docchi/src/eu/kanade/tachiyomi/animeextension/pl/docchi/Docchi.kt
@@ -294,7 +294,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
         val cover: String,
         val adult_content: String,
         val series_type: String,
-        val episodes: Int,
+        val episodes: Int?,
         val season: String,
         val season_year: Int,
     )
@@ -315,7 +315,7 @@ class Docchi : ConfigurableAnimeSource, AnimeHttpSource() {
         val genres: List<String>,
         val broadcast_day: String?,
         val aired_from: String?,
-        val episodes: Int,
+        val episodes: Int?,
         val season: String,
         val season_year: Int,
         val series_type: String,
-- 
2.47.2


From c513e99d71c4966b87cfac6a0e5d4ff1126aceac Mon Sep 17 00:00:00 2001
From: Hayanek <kontakt@wolfek.xyz>
Date: Fri, 4 Apr 2025 01:10:30 +0200
Subject: [PATCH 12/12] fix(lib/lulu): tiny change v2

---
 .../java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
index 56b47132..550ddae9 100644
--- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
+++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt
@@ -11,7 +11,7 @@ class LuluExtractor(private val client: OkHttpClient, headers: Headers) {
 
     private val headers = headers.newBuilder()
         .add("Referer", "https://luluvdo.com/")
-        .add("Origin", "https://luluvdo.com/")
+        .add("Origin", "https://luluvdo.com")
         .build()
 
     //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py
-- 
2.47.2