From fed99f9fde91011319e4b5e0fe3e146f49314a9c Mon Sep 17 00:00:00 2001
From: Secozzi <49240133+Secozzi@users.noreply.github.com>
Date: Sat, 21 Jan 2023 21:23:27 +0100
Subject: [PATCH] MarinMoe: Fix seeking & cookies (#1197)

---
 src/en/marinmoe/build.gradle                  |  2 +-
 .../animeextension/en/marinmoe/MarinMoe.kt    | 22 +++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/en/marinmoe/build.gradle b/src/en/marinmoe/build.gradle
index 496baa668..c5b02b65b 100644
--- a/src/en/marinmoe/build.gradle
+++ b/src/en/marinmoe/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'marin.moe'
     pkgNameSuffix = 'en.marinmoe'
     extClass = '.MarinMoe'
-    extVersionCode = 6
+    extVersionCode = 7
     libVersion = '13'
 }
 
diff --git a/src/en/marinmoe/src/eu/kanade/tachiyomi/animeextension/en/marinmoe/MarinMoe.kt b/src/en/marinmoe/src/eu/kanade/tachiyomi/animeextension/en/marinmoe/MarinMoe.kt
index e1b66daa7..403f03c48 100644
--- a/src/en/marinmoe/src/eu/kanade/tachiyomi/animeextension/en/marinmoe/MarinMoe.kt
+++ b/src/en/marinmoe/src/eu/kanade/tachiyomi/animeextension/en/marinmoe/MarinMoe.kt
@@ -65,7 +65,7 @@ class MarinMoe : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun popularAnimeRequest(page: Int): Request {
-        return GET("$baseUrl/anime?sort=vwk-d&page=$page")
+        return GET("$baseUrl/anime?sort=vwk-d&page=$page", headers = headers)
     }
 
     // =============================== Latest ===============================
@@ -196,25 +196,23 @@ class MarinMoe : ConfigurableAnimeSource, AnimeHttpSource() {
     }
 
     override fun videoListParse(response: Response): List<Video> {
-        var cookiesResponse = client.newCall(GET(response.request.url.toString(), headers = headers)).execute()
-
         var newHeaders = headers.newBuilder()
+        val ddosCookies = client.cookieJar.loadForRequest(response.request.url).filter {
+            // Don't need these
+            it.name !in arrayOf("__ddgid_", "__ddgmark_")
+        }.joinToString(";") { "${it.name}=${it.value}" }
 
-        for (cookie in cookiesResponse.headers) {
-            if (cookie.first == "set-cookie" && cookie.second.startsWith("XSRF-TOKEN")) {
-                newHeaders.add("X-XSRF-TOKEN", cookie.second.substringAfter("=").substringBefore(";").replace("%3D", "="))
-            }
+        newHeaders.add(
+            "X-XSRF-TOKEN",
+            ddosCookies.substringAfter("XSRF-TOKEN=").substringBefore(";").replace("%3D", "=")
+        )
 
-            if (cookie.first == "set-cookie" && cookie.second.startsWith("marinmoe_session")) {
-                newHeaders.add("Cookie", cookie.second.substringBefore(";").replace("%3D", "="))
-            }
-        }
+        newHeaders.add("Cookie", ddosCookies)
 
         val videoHeaders = newHeaders.build().newBuilder()
             .add("Accept", "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5")
             .add("Referer", response.request.url.toString())
             .add("Accept-Language", "en-US,en;q=0.5")
-            .add("Range", "bytes=0-")
 
         newHeaders.add("Origin", baseUrl)
             .add("Content-Type", "application/json")