Merge remote-tracking branch 'origin/master'

This commit is contained in:
LagradOst 2022-07-28 01:38:37 +02:00
commit c6f75fef42
6 changed files with 12 additions and 13 deletions

View File

@ -226,8 +226,7 @@ class EgyBestProvider : MainAPI() {
link,
this.mainUrl,
quality!!,
true,
headers = mapOf("range" to "bytes=0-"),
true
)
)
}

View File

@ -152,4 +152,4 @@ class HDMovie5 : MainAPI() {
loadExtractor(httpsify(link), "$mainUrl/", subtitleCallback, callback)
}.contains(true)
}
}
}

View File

@ -18,7 +18,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor
class TwoEmbedProvider : TmdbProvider() {
override val apiName = "2Embed"
override var name = "2Embed"
override var mainUrl = "https://2embed.org"
override var mainUrl = "https://www.2embed.to"
override val useMetaLoadResponse = true
override val instantLinkLoading = false
override val supportedTypes = setOf(
@ -46,10 +46,10 @@ class TwoEmbedProvider : TmdbProvider() {
) else listOf(mappedData.tmdbID.toString(), "tmdb")
val isMovie = mappedData.episode == null && mappedData.season == null
val embedUrl = if (isMovie) {
"$mainUrl/embed/movie?$site=$id"
"$mainUrl/embed/$site/movie?id=$id"
} else {
val suffix = "$id&sea=${mappedData.season ?: 1}&epi=${mappedData.episode ?: 1}"
"$mainUrl/embed/series?$site=$suffix"
val suffix = "$id&s=${mappedData.season ?: 1}&e=${mappedData.episode ?: 1}"
"$mainUrl/embed/$site/tv?id=$suffix"
}
val document = app.get(embedUrl).document

View File

@ -233,4 +233,4 @@ class SettingsAccount : PreferenceFragmentCompat() {
}
}
}
}
}

View File

@ -477,7 +477,7 @@
"SoaptwoDayProvider": {
"language": "en",
"name": "Soap2Day",
"status": 1,
"status": 0,
"url": "https://secretlink.xyz"
},
"SolarmovieProvider": {
@ -507,7 +507,7 @@
"TheFlixToProvider": {
"language": "en",
"name": "TheFlix.to",
"status": 1,
"status": 0,
"url": "https://theflix.to"
},
"TocanimeProvider": {
@ -526,7 +526,7 @@
"language": "en",
"name": "2Embed",
"status": 1,
"url": "https://2embed.org"
"url": "https://www.2embed.to"
},
"UakinoProvider": {
"language": "uk",

View File

@ -222,7 +222,7 @@
"SoaptwoDayProvider": {
"name": "Soap2Day",
"url": "https://secretlink.xyz",
"status": 1
"status": 0
},
"TenshiProvider": {
"name": "Tenshi.moe",
@ -241,7 +241,7 @@
},
"TwoEmbedProvider": {
"name": "2Embed",
"url": "https://2embed.org",
"url": "https://www.2embed.to",
"status": 1
},
"VMoveeProvider": {