Merge a936fc9ac8 into e6b9d621f9

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

@@ -22,15 +22,17 @@ class VidSrcTo : ExtractorApi() {
             subtitleCallback: (SubtitleFile) -> Unit,
             callback: (ExtractorLink) -> Unit
     ) {
-        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>() ?: return
-        if (res?.status != 200) return
-        res.result?.amap { source ->
-            val embedRes = app.get("$mainUrl/ajax/embed/source/${source.id}").parsedSafe<VidsrctoEmbedSource>() ?: return@amap
-            val finalUrl = DecryptUrl(embedRes?.result?.encUrl)
-            when (source.title) {
-                "Vidplay" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
-                "Filemoon" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
+        app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id")?.let { mediaId ->
+            val res = app.get("$mainUrl/ajax/embed/episode/$mediaId/sources").parsedSafe<VidsrctoEpisodeSources>()
+            if (res?.status == 200) {
+                res.result?.amap { source ->
+                    val embedRes = app.get("$mainUrl/ajax/embed/source/${source.id}").parsedSafe<VidsrctoEmbedSource>()
+                    val finalUrl = DecryptUrl(embedRes?.result?.encUrl ?: "")
+                    when (source.title) {
+                        "Vidplay" -> AnyVidplay(finalUrl.substringBefore("/e/")).getUrl(finalUrl, referer, subtitleCallback, callback)
+                        "Filemoon" -> FileMoon().getUrl(finalUrl, referer, subtitleCallback, callback)
+                    }
+                }
             }
         }
     }
@@ -44,7 +46,6 @@ 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,7 +105,6 @@ open class TmdbProvider : MainAPI() {
                             this.id,
                             episode.episode_number,
                             episode.season_number,
-                            this.name ?: this.original_name,
                         ).toJson(),
                         episode.name,
                         episode.season_number,
@@ -123,7 +122,6 @@ open class TmdbProvider : MainAPI() {
                             this.id,
                             episodeNum,
                             season.season_number,
-                            this.name ?: this.original_name,
                         ).toJson(),
                         season = season.season_number
                     )