From 2c82e903e8d8331a204a2f4a21acc143cf438af6 Mon Sep 17 00:00:00 2001 From: hexated Date: Tue, 21 Feb 2023 03:35:47 +0700 Subject: [PATCH] fix --- .../main/kotlin/com/hexated/SoraExtractor.kt | 21 +++++++++++-------- .../src/main/kotlin/com/hexated/SoraUtils.kt | 6 ------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index 26b0f92d..42f91f17 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -327,7 +327,6 @@ object SoraExtractor : SoraStream() { ), headers = mapOf("X-Requested-With" to "XMLHttpRequest") ).parsedSafe()?.apiIframe ?: return - delay(1000) val iframe = app.get(iframeUrl, referer = "$hdMovieBoxAPI/").document.selectFirst("iframe") ?.attr("src") val base = getBaseUrl(iframe ?: return) @@ -947,19 +946,23 @@ object SoraExtractor : SoraStream() { resDetail.episodes?.find { it.number == episode }?.id } - delay(2000) app.get( "$kissKhAPI/api/DramaList/Episode/$epsId.png?err=false&ts=&time=", referer = "$kissKhAPI/Drama/${getKisskhTitle(contentTitle)}/Episode-${episode ?: 0}?id=$id&ep=$epsId&page=0&pageSize=100" ).parsedSafe()?.let { source -> listOf(source.video, source.thirdParty).apmap { link -> if (link?.contains(".m3u8") == true) { - M3u8Helper.generateM3u8( - "Kisskh", - link, - referer = "$kissKhAPI/", - headers = mapOf("Origin" to kissKhAPI) - ).forEach(callback) + callback.invoke( + ExtractorLink( + "Kisskh", + "Kisskh", + link, + referer = "$kissKhAPI/", + Qualities.P720.value, + true, + headers = mapOf("Origin" to kissKhAPI) + ) + ) } else { loadExtractor( link?.substringBefore("=http") ?: return@apmap null, @@ -1246,7 +1249,6 @@ object SoraExtractor : SoraStream() { } sources.apmap { (quality, link) -> - delay(2000) val driveLink = bypassHrefli(link ?: return@apmap null) val base = getBaseUrl(driveLink ?: return@apmap null) val resDoc = app.get(driveLink).text.substringAfter("replace(\"") @@ -2383,6 +2385,7 @@ object SoraExtractor : SoraStream() { val files = app.get( "https://api.telegram.d1.zindex.eu.org/search?name=${encode(query)}&page=1", referer = tgarMovieAPI, + verify = false ).parsedSafe()?.results?.filter { media -> (if (season == null) { media.name?.contains("$year") == true diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt index 1202ac0d..3ff2c039 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt @@ -730,17 +730,11 @@ var arrayofworkers = (.*)""".toRegex() return BaymoviesConfig(country, downloadTime, workers) } -/** taken from https://github.com/821938089/cloudstream-extensions/blob/6e41697cbf816d2f57d9922d813c538e3192f708/PiousIndexProvider/src/main/kotlin/com/horis/cloudstreamplugins/PiousIndexProvider.kt#L175-L179 -- Credits to Horis -**/ fun decodeIndexJson(json: String): String { val slug = json.reversed().substring(24) return base64Decode(slug.substring(0, slug.length - 20)) } -/** taken from https://github.com/821938089/cloudstream-extensions/blob/23dae833a48fb329d4c67dd77ac1e8bb592ac5a9/Movie123Provider/src/main/kotlin/com/horis/cloudstreamplugins/Movie123Provider.kt#L138-L150 -- Credits to Horis -**/ fun String.decryptGomoviesJson(key: String = "123"): String { val sb = StringBuilder() var i = 0