From a8211f6259c18e2863ada23cd0c174585be3ec96 Mon Sep 17 00:00:00 2001 From: Saksham Shekher <95137948+OshekharO@users.noreply.github.com> Date: Wed, 27 Jul 2022 23:26:59 +0530 Subject: [PATCH 1/2] Disabled Providers (#1316) * Update providers.json * Update providers.json * switched to kotlinx serialization, failing build due to failure of on primitive types * Reverted to 2embed.to * Update providers.json * Update providers.json * Updated url * Revert "Merge branch 'LagradOst:master' into patch-1" This reverts commit d95b2b46066576ed910d7c5f18775333fb6707ec, reversing changes made to 8c8bd3a510ca08ff49dcb517c174ad9478e563bc. * Update SettingsAccount.kt Revert changes made to SettingsAccount.kt Co-authored-by: LagradOst <11805592+LagradOst@users.noreply.github.com> Co-authored-by: Blatzar <46196380+Blatzar@users.noreply.github.com> --- .../cloudstream3/movieproviders/EgyBestProvider.kt | 3 +-- .../com/lagradost/cloudstream3/movieproviders/HDMovie5.kt | 2 +- .../cloudstream3/movieproviders/TwoEmbedProvider.kt | 8 ++++---- .../lagradost/cloudstream3/ui/settings/SettingsAccount.kt | 2 +- docs/providers.json | 8 ++++---- providers.json | 4 ++-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt index f12c97ad..d79de800 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/EgyBestProvider.kt @@ -226,8 +226,7 @@ class EgyBestProvider : MainAPI() { link, this.mainUrl, quality!!, - true, - headers = mapOf("range" to "bytes=0-"), + true ) ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMovie5.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMovie5.kt index 68d91f47..6de7363d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMovie5.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/HDMovie5.kt @@ -152,4 +152,4 @@ class HDMovie5 : MainAPI() { loadExtractor(httpsify(link), "$mainUrl/", subtitleCallback, callback) }.contains(true) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/TwoEmbedProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/TwoEmbedProvider.kt index 6d589533..9a2c6029 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/TwoEmbedProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/TwoEmbedProvider.kt @@ -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 diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt index 2be8c8b4..367c3557 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt @@ -233,4 +233,4 @@ class SettingsAccount : PreferenceFragmentCompat() { } } } -} \ No newline at end of file +} diff --git a/docs/providers.json b/docs/providers.json index 441a2f37..b3f3e5da 100644 --- a/docs/providers.json +++ b/docs/providers.json @@ -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", @@ -600,4 +600,4 @@ "status": 1, "url": "https://zoro.to" } -} \ No newline at end of file +} diff --git a/providers.json b/providers.json index 7573c234..aefab6fc 100644 --- a/providers.json +++ b/providers.json @@ -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": { From 30b250de78fe79587cb66adf5b1025c3a8d0eb6d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 27 Jul 2022 17:57:12 +0000 Subject: [PATCH 2/2] chore(docs): update list of sites --- docs/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/providers.json b/docs/providers.json index b3f3e5da..b48d3c1c 100644 --- a/docs/providers.json +++ b/docs/providers.json @@ -600,4 +600,4 @@ "status": 1, "url": "https://zoro.to" } -} +} \ No newline at end of file