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, link,
this.mainUrl, this.mainUrl,
quality!!, quality!!,
true, true
headers = mapOf("range" to "bytes=0-"),
) )
) )
} }

View file

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

View file

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

View file

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

View file

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

View file

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