From 40811bc0ebe86f5f05f786bfc6fcaa902aa74983 Mon Sep 17 00:00:00 2001
From: Samfun75 <38332931+Samfun75@users.noreply.github.com>
Date: Thu, 7 Mar 2024 01:50:09 +0300
Subject: [PATCH] fix(en/fmovies): Update subtitle fetching (#3013)

---
 .../lib/vidsrcextractor/VidSrcExtractor.kt       |  4 ++--
 .../animeextension/en/fmovies/FMovies.kt         | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/vidsrc-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidsrcextractor/VidSrcExtractor.kt b/lib/vidsrc-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidsrcextractor/VidSrcExtractor.kt
index e29aea5261..07b1b42990 100644
--- a/lib/vidsrc-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidsrcextractor/VidSrcExtractor.kt
+++ b/lib/vidsrc-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidsrcextractor/VidSrcExtractor.kt
@@ -33,7 +33,7 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
         ).execute().parseAs<List<String>>()
     }
 
-    fun videosFromUrl(embedLink: String, hosterName: String, type: String = ""): List<Video> {
+    fun videosFromUrl(embedLink: String, hosterName: String, type: String = "", subtitleList: List<Track> = emptyList()): List<Video> {
         val host = embedLink.toHttpUrl().host
         val apiUrl = getApiUrl(embedLink, keys)
 
@@ -64,7 +64,7 @@ class VidsrcExtractor(private val client: OkHttpClient, private val headers: Hea
             data.result.sources.first().file,
             referer = "https://$host/",
             videoNameGen = { q -> hosterName + (if (type.isBlank()) "" else " - $type") + " - $q" },
-            subtitleList = data.result.tracks.toTracks(),
+            subtitleList = subtitleList + data.result.tracks.toTracks(),
         )
     }
 
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 5ae83b6ae7..2a7797a766 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
@@ -251,13 +251,16 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
             val decrypted = utils.vrfDecrypt(encrypted)
             when (name) {
-                "Vidplay", "MyCloud" -> vidsrcExtractor.videosFromUrl(decrypted, name)
+                "Vidplay", "MyCloud" -> {
+                    val subs = client.newCall(
+                        GET("$baseUrl/ajax/episode/subtitles/${data.id}"),
+                    ).execute().toTracks()
+                    vidsrcExtractor.videosFromUrl(decrypted, name, subtitleList = subs)
+                }
                 "Filemoon" -> filemoonExtractor.videosFromUrl(decrypted, headers = headers)
                 "Streamtape" -> {
                     val subtitleList = decrypted.toHttpUrl().queryParameter("sub.info")?.let {
-                        client.newCall(GET(it, headers)).await().parseAs<List<FMoviesSubs>>().map { t ->
-                            Track(t.file, t.label)
-                        }
+                        client.newCall(GET(it, headers)).await().toTracks()
                     } ?: emptyList()
 
                     streamtapeExtractor.videoFromUrl(decrypted, subtitleList = subtitleList)?.let(::listOf) ?: emptyList()
@@ -292,6 +295,11 @@ class FMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return if (this == 1) "" else "${if (first) "?" else "&"}page=$this"
     }
 
+    private fun Response.toTracks(): List<Track> = parseAs<List<FMoviesSubs>>()
+        .map { t ->
+            Track(t.file, t.label)
+        }
+
     companion object {
         private val HOSTERS = arrayOf(
             "Vidplay",