Merge ce3359c0fa into e6b9d621f9

This data is passed to loadLinks but name is not included in TvSeriesLoadResponse which is crucial as not all sites support filtering using ids and name is required.

app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcTo.kt

@@ -22,17 +22,15 @@ class VidSrcTo : ExtractorApi() {
             subtitleCallback: (SubtitleFile) -> Unit,
             callback: (ExtractorLink) -> Unit
     ) {
-        app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id")?.let { mediaId ->
+        val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id") ?: return
-            val res = app.get("$mainUrl/ajax/embed/episode/$mediaId/sources").parsedSafe<VidsrctoEpisodeSources>()
+        val res = app.get("$mainUrl/ajax/embed/episode/$mediaId/sources").parsedSafe<VidsrctoEpisodeSources>() ?: return
-            if (res?.status == 200) {
+        if (res?.status != 200) return
-                res.result?.amap { source ->
+        res.result?.amap { source ->
-                    val embedRes = app.get("$mainUrl/ajax/embed/source/${source.id}").parsedSafe<VidsrctoEmbedSource>()
+            val embedRes = app.get("$mainUrl/ajax/embed/source/${source.id}").parsedSafe<VidsrctoEmbedSource>() ?: return@amap
-                    val finalUrl = DecryptUrl(embedRes?.result?.encUrl ?: "")
+            val finalUrl = DecryptUrl(embedRes?.result?.encUrl)
-                    when (source.title) {
+            when (source.title) {
-                        "Vidplay" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
+                "Vidplay" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
-                        "Filemoon" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
+                "Filemoon" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
-                    }
-                }
             }
         }
     }
@@ -46,6 +44,7 @@ class VidSrcTo : ExtractorApi() {
         data = cipher.doFinal(data)
         return URLDecoder.decode(data.toString(Charsets.UTF_8), "utf-8")
     }
+
     data class VidsrctoEpisodeSources(
             @JsonProperty("status") val status: Int,
             @JsonProperty("result") val result: List<VidsrctoResult>?

app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt

@@ -105,6 +105,7 @@ open class TmdbProvider : MainAPI() {
                             this.id,
                             episode.episode_number,
                             episode.season_number,
+                            this.name ?: this.original_name,
                         ).toJson(),
                         episode.name,
                         episode.season_number,
@@ -122,6 +123,7 @@ open class TmdbProvider : MainAPI() {
                             this.id,
                             episodeNum,
                             season.season_number,
+                            this.name ?: this.original_name,
                         ).toJson(),
                         season = season.season_number
                     )