diff --git a/RebahinProvider/build.gradle.kts b/RebahinProvider/build.gradle.kts index 9cf4b8e7..09a8646d 100644 --- a/RebahinProvider/build.gradle.kts +++ b/RebahinProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 3 +version = 4 cloudstream { diff --git a/RebahinProvider/src/main/kotlin/com/hexated/Kitanonton.kt b/RebahinProvider/src/main/kotlin/com/hexated/Kitanonton.kt index 115fe63d..aae0b2fb 100644 --- a/RebahinProvider/src/main/kotlin/com/hexated/Kitanonton.kt +++ b/RebahinProvider/src/main/kotlin/com/hexated/Kitanonton.kt @@ -3,7 +3,7 @@ package com.hexated import com.lagradost.cloudstream3.* class Kitanonton : RebahinProvider() { - override var mainUrl = "https://124.150.139.91" + override var mainUrl = "http://kitanonton.org" override var name = "KitaNonton" override var mainServer = "https://199.87.210.226" diff --git a/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt b/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt index 6a3db062..883fb34f 100644 --- a/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt +++ b/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt @@ -13,7 +13,7 @@ import org.jsoup.nodes.Element import java.net.URI open class RebahinProvider : MainAPI() { - override var mainUrl = "http://104.237.198.196" + override var mainUrl = "http://104.237.198.197" override var name = "Rebahin" override val hasMainPage = true override var lang = "id" diff --git a/RebahinProvider/src/main/kotlin/com/hexated/RebahinProviderPlugin.kt b/RebahinProvider/src/main/kotlin/com/hexated/RebahinProviderPlugin.kt index 4dd5882e..3824f170 100644 --- a/RebahinProvider/src/main/kotlin/com/hexated/RebahinProviderPlugin.kt +++ b/RebahinProvider/src/main/kotlin/com/hexated/RebahinProviderPlugin.kt @@ -10,6 +10,6 @@ class RebahinProviderPlugin: Plugin() { override fun load(context: Context) { // All providers should be added in this manner. Please don't edit the providers list directly. registerMainAPI(RebahinProvider()) - registerMainAPI(Kitanonton()) +// registerMainAPI(Kitanonton()) } } \ No newline at end of file diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index 406aac45..70bd1a88 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 27 +version = 28 cloudstream { diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index d96da150..dc299275 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -11,6 +11,7 @@ import com.lagradost.nicehttp.Session import com.lagradost.nicehttp.requestCreator import okhttp3.HttpUrl.Companion.toHttpUrl import com.google.gson.JsonParser +import com.lagradost.cloudstream3.utils.AppUtils.toJson import kotlinx.coroutines.delay import okhttp3.RequestBody.Companion.toRequestBody import java.net.URI @@ -622,12 +623,8 @@ object SoraExtractor : SoraStream() { name, name, link, - "$noverseAPI/", + "", getQualityFromName("${quality?.substringBefore("p")?.trim()}p"), -// headers = mapOf( -// "Origin" to noverseAPI, -// "Range" to "bytes=0-" -// ) ) ) } @@ -654,7 +651,10 @@ object SoraExtractor : SoraStream() { "PHPSESSID" to filmxyCookies.phpsessid ) - val doc = session.get(url, cookies = cookiesDoc).document + val request = session.get(url, cookies = cookiesDoc) + if(!request.isSuccessful) return + + val doc = request.document val script = doc.selectFirst("script:containsData(var isSingle)")?.data().toString() val sourcesData = Regex("listSE\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1) val sourcesDetail = Regex("linkDetails\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1) @@ -697,7 +697,7 @@ object SoraExtractor : SoraStream() { "X-Requested-With" to "XMLHttpRequest", ), cookies = cookiesJson - ).text.let { JsonParser().parse(it).asJsonObject } + ).text.let { JsonParser.parseString(it).asJsonObject } sources.map { source -> val src = source.asString @@ -819,7 +819,7 @@ object SoraExtractor : SoraStream() { val json = jsonResponse.parsedSafe()?.data?.episodeVo?.first { it.seriesNo == (episode ?: 0) } json?.definitionList?.apmap { video -> - delay(1000) + delay(2000) app.get( "${vipAPI}/media/previewInfo?category=${type}&contentId=${id}&episodeId=${json.id}&definition=${video.code}", headers = headers diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index a8469e19..0bb54b00 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -441,9 +441,9 @@ open class SoraStream : TmdbProvider() { callback ) }, -// { -// invokeFilmxy(res.imdbId, res.season, res.episode, subtitleCallback, callback) -// }, + { + invokeFilmxy(res.imdbId, res.season, res.episode, subtitleCallback, callback) + }, { invokeKimcartoon(res.title, res.season, res.episode, subtitleCallback, callback) },