From 0f84f8a4da5c69a51e0b8177c46ebd57415de4df Mon Sep 17 00:00:00 2001
From: folke <folke.steen85@gmail.com>
Date: Sat, 14 Oct 2023 11:20:18 +0200
Subject: [PATCH 1/3] fix(en): fix vidsrc extractor

---
 src/en/fmovies/build.gradle                   |  2 +-
 .../animeextension/en/fmovies/FMovies.kt      |  3 ++
 .../en/fmovies/FMoviesHelper.kt               |  2 +-
 .../en/fmovies/extractors/VidsrcExtractor.kt  | 47 +++++++++++++++----
 src/en/seez/build.gradle                      |  2 +-
 .../animeextension/en/seez/VrfHelper.kt       |  2 +-
 .../en/seez/extractors/VidsrcExtractor.kt     | 44 +++++++++++++----
 7 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/src/en/fmovies/build.gradle b/src/en/fmovies/build.gradle
index 2f01ebd7c4..3d82c1fa51 100644
--- a/src/en/fmovies/build.gradle
+++ b/src/en/fmovies/build.gradle
@@ -8,7 +8,7 @@ ext {
     extName = 'FMovies'
     pkgNameSuffix = 'en.fmovies'
     extClass = '.FMovies'
-    extVersionCode = 10
+    extVersionCode = 11
     libVersion = '13'
 }
 
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
index dee9d13c8e..f6693875fa 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animeextension.en.fmovies
 
 import android.app.Application
 import android.content.SharedPreferences
+import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
@@ -237,6 +238,8 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
                 val decrypted = vrfHelper.decrypt(encrypted)
 
+                Log.i("SOMETHING", "$name - $decrypted")
+
                 when (name) {
                     "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
                     "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
index 293fb0ec4a..f0e0b045ac 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMoviesHelper.kt
@@ -39,7 +39,7 @@ class FMoviesHelper(private val client: OkHttpClient, private val headers: Heade
 
     fun getVidSrc(query: String, host: String): String {
         val url = API_URL.newBuilder().apply {
-            addPathSegment(if (host == "vidstream.pro") "rawVizcloud" else "rawMcloud")
+            addPathSegment(if (host.contains("mcloud", true)) "rawMcloud" else "rawVizcloud")
             addQueryParameter("apikey", API_KEY)
         }.build().toString()
 
diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
index 79d3e3a71a..6a86a5d115 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi.animeextension.en.fmovies.extractors
 
+import android.util.Log
 import eu.kanade.tachiyomi.animeextension.en.fmovies.FMoviesHelper
 import eu.kanade.tachiyomi.animeextension.en.fmovies.FMoviesSubs
 import eu.kanade.tachiyomi.animeextension.en.fmovies.VidsrcResponse
@@ -21,19 +22,27 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
     private val playlistUtils by lazy { PlaylistUtils(client, headers) }
 
     fun videosFromUrl(url: String, name: String): List<Video> {
-        val host = when (name) {
-            "Vidplay" -> "vidstream.pro"
-            else -> "mcloud.to"
-        }
+        val httpUrl = url.toHttpUrl()
+        val host = httpUrl.host
         val referer = "https://$host/"
 
-        val httpUrl = url.toHttpUrl()
+        val query = buildString {
+            append(httpUrl.pathSegments.last())
+            append("?")
+            append(
+                httpUrl.queryParameterNames.joinToString("&") {
+                    "$it=${httpUrl.queryParameter(it)}"
+                },
+            )
+        }
 
-        val query = "${httpUrl.pathSegments.last()}?t=${httpUrl.queryParameter("t")!!}"
-        val rawUrl = vrfHelper.getVidSrc(query, host)
+        val rawUrl = vrfHelper.getVidSrc(query, host).addAutoStart()
 
         val refererHeaders = headers.newBuilder().apply {
-            add("Referer", referer)
+            add("Accept", "application/json, text/javascript, */*; q=0.01")
+            add("Host", host)
+            add("Referer", url.addAutoStart())
+            add("X-Requested-With", "XMLHttpRequest")
         }.build()
 
         val infoJson = client.newCall(
@@ -41,18 +50,36 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
         ).execute().parseAs<VidsrcResponse>()
 
         val subtitleList = httpUrl.queryParameter("sub.info")?.let {
+            val subtitlesHeaders = headers.newBuilder().apply {
+                add("Accept", "application/json, text/javascript, */*; q=0.01")
+                add("Host", it.toHttpUrl().host)
+                add("Origin", "https://$host")
+                add("Referer", referer)
+            }.build()
+
             client.newCall(
-                GET(it, headers = refererHeaders),
+                GET(it, headers = subtitlesHeaders),
             ).execute().parseAs<List<FMoviesSubs>>().map {
                 Track(it.file, it.label)
             }
         } ?: emptyList()
 
         return infoJson.result.sources.distinctBy { it.file }.flatMap {
-            playlistUtils.extractFromHls(it.file, subtitleList = subtitleList, referer = referer, videoNameGen = { q -> "$name - $q" })
+            val url = it.file
+                .toHttpUrl()
+                .newBuilder()
+                .fragment(null)
+                .build()
+                .toString()
+
+            playlistUtils.extractFromHls(url, subtitleList = subtitleList, referer = referer, videoNameGen = { q -> "$name - $q" })
         }
     }
 
+    private fun String.addAutoStart(): String {
+        return this.toHttpUrl().newBuilder().setQueryParameter("autostart", "true").build().toString()
+    }
+
     private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
         val responseBody = use { transform(it.body.string()) }
         return json.decodeFromString(responseBody)
diff --git a/src/en/seez/build.gradle b/src/en/seez/build.gradle
index 00744d08df..3a20bf6aa8 100644
--- a/src/en/seez/build.gradle
+++ b/src/en/seez/build.gradle
@@ -8,7 +8,7 @@ ext {
     extName = 'Seez'
     pkgNameSuffix = 'en.seez'
     extClass = '.Seez'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '13'
 }
 
diff --git a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt
index 5f6e1c1a1d..efd4d95ef0 100644
--- a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt
+++ b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/VrfHelper.kt
@@ -27,7 +27,7 @@ class VrfHelper(private val client: OkHttpClient, private val headers: Headers)
 
     fun getVidSrc(query: String, host: String): String {
         val url = API_URL.newBuilder().apply {
-            addPathSegment("rawVizcloud")
+            addPathSegment(if (host.contains("mcloud", true)) "rawMcloud" else "rawVizcloud")
             addQueryParameter("apikey", API_KEY)
         }.build().toString()
 
diff --git a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt
index 0855ad8e7d..2e4218da10 100644
--- a/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt
+++ b/src/en/seez/src/eu/kanade/tachiyomi/animeextension/en/seez/extractors/VidsrcExtractor.kt
@@ -21,17 +21,27 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
     private val playlistUtils by lazy { PlaylistUtils(client, headers) }
 
     fun videosFromUrl(url: String, name: String): List<Video> {
-        val host = "vidstream.pro"
-
+        val httpUrl = url.toHttpUrl()
+        val host = httpUrl.host
         val referer = "https://$host/"
 
-        val httpUrl = url.toHttpUrl()
+        val query = buildString {
+            append(httpUrl.pathSegments.last())
+            append("?")
+            append(
+                httpUrl.queryParameterNames.joinToString("&") {
+                    "$it=${httpUrl.queryParameter(it)}"
+                },
+            )
+        }
 
-        val query = "${httpUrl.pathSegments.last()}?t=${httpUrl.queryParameter("t")!!}"
-        val rawUrl = vrfHelper.getVidSrc(query, host)
+        val rawUrl = vrfHelper.getVidSrc(query, host).addAutoStart()
 
         val refererHeaders = headers.newBuilder().apply {
-            add("Referer", referer)
+            add("Accept", "application/json, text/javascript, */*; q=0.01")
+            add("Host", host)
+            add("Referer", url.addAutoStart())
+            add("X-Requested-With", "XMLHttpRequest")
         }.build()
 
         val infoJson = client.newCall(
@@ -39,18 +49,36 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
         ).execute().parseAs<VidsrcResponse>()
 
         val subtitleList = httpUrl.queryParameter("sub.info")?.let {
+            val subtitlesHeaders = headers.newBuilder().apply {
+                add("Accept", "application/json, text/javascript, */*; q=0.01")
+                add("Host", it.toHttpUrl().host)
+                add("Origin", "https://$host")
+                add("Referer", referer)
+            }.build()
+
             client.newCall(
-                GET(it, headers = refererHeaders),
+                GET(it, headers = subtitlesHeaders),
             ).execute().parseAs<List<FMoviesSubs>>().map {
                 Track(it.file, it.label)
             }
         } ?: emptyList()
 
         return infoJson.result.sources.distinctBy { it.file }.flatMap {
-            playlistUtils.extractFromHls(it.file, subtitleList = subtitleList, referer = referer, videoNameGen = { q -> "$name - $q" })
+            val url = it.file
+                .toHttpUrl()
+                .newBuilder()
+                .fragment(null)
+                .build()
+                .toString()
+
+            playlistUtils.extractFromHls(url, subtitleList = subtitleList, referer = referer, videoNameGen = { q -> "$name - $q" })
         }
     }
 
+    private fun String.addAutoStart(): String {
+        return this.toHttpUrl().newBuilder().setQueryParameter("autostart", "true").build().toString()
+    }
+
     private inline fun <reified T> Response.parseAs(transform: (String) -> String = { it }): T {
         val responseBody = use { transform(it.body.string()) }
         return json.decodeFromString(responseBody)

From fd03fd7a6352a831181d000414c5405729ef7909 Mon Sep 17 00:00:00 2001
From: folke <folke.steen85@gmail.com>
Date: Sat, 14 Oct 2023 11:21:02 +0200
Subject: [PATCH 2/3] remove log

---
 .../animeextension/en/fmovies/extractors/VidsrcExtractor.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
index 6a86a5d115..005d6f3758 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/extractors/VidsrcExtractor.kt
@@ -1,6 +1,5 @@
 package eu.kanade.tachiyomi.animeextension.en.fmovies.extractors
 
-import android.util.Log
 import eu.kanade.tachiyomi.animeextension.en.fmovies.FMoviesHelper
 import eu.kanade.tachiyomi.animeextension.en.fmovies.FMoviesSubs
 import eu.kanade.tachiyomi.animeextension.en.fmovies.VidsrcResponse

From 6660336161470a6370b09eb531483bed801f83a9 Mon Sep 17 00:00:00 2001
From: folke <folke.steen85@gmail.com>
Date: Sat, 14 Oct 2023 11:21:50 +0200
Subject: [PATCH 3/3] remove log part 2

---
 .../eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
index f6693875fa..dee9d13c8e 100644
--- a/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
+++ b/src/en/fmovies/src/eu/kanade/tachiyomi/animeextension/en/fmovies/FMovies.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.animeextension.en.fmovies
 
 import android.app.Application
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.preference.ListPreference
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.PreferenceScreen
@@ -238,8 +237,6 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
                 val decrypted = vrfHelper.decrypt(encrypted)
 
-                Log.i("SOMETHING", "$name - $decrypted")
-
                 when (name) {
                     "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
                     "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)