From b7a66c665758695d6f22907453971364baa7c00f Mon Sep 17 00:00:00 2001
From: Dark25 <nadiecaca2000@gmail.com>
Date: Wed, 14 Aug 2024 19:50:25 +0200
Subject: [PATCH] chore(lib/StreamWishExtractor): Update StreamWishExtractor

---
 .../streamwishextractor/StreamWishExtractor.kt   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt b/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
index 2df5e846..5d79a577 100644
--- a/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
+++ b/lib/streamwish-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamwishextractor/StreamWishExtractor.kt
@@ -14,9 +14,9 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
     fun videosFromUrl(url: String, prefix: String) = videosFromUrl(url) { "$prefix - $it" }
 
     fun videosFromUrl(url: String, videoNameGen: (String) -> String = { quality -> "StreamWish - $quality" }): List<Video> {
-        val doc = client.newCall(GET(url, headers)).execute()
-            .asJsoup()
-        // Sometimes the script body is packed, sometimes it isn't
+
+        val doc = client.newCall(GET(getEmbedUrl(url), headers)).execute().asJsoup()
+
         val scriptBody = doc.selectFirst("script:containsData(m3u8)")?.data()
             ?.let { script ->
                 if (script.contains("eval(function(p,a,c")) {
@@ -25,7 +25,6 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
                     script
                 }
             }
-
         val masterUrl = scriptBody
             ?.substringAfter("source", "")
             ?.substringAfter("file:\"", "")
@@ -35,4 +34,13 @@ class StreamWishExtractor(private val client: OkHttpClient, private val headers:
 
         return playlistUtils.extractFromHls(masterUrl, url, videoNameGen = videoNameGen)
     }
+
+    private fun getEmbedUrl(url: String): String {
+        return if (url.contains("/f/")) {
+            val videoId = url.substringAfter("/f/")
+            "https://streamwish.com/$videoId"
+        } else {
+            url
+        }
+    }
 }