diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts index c19dafb2..125f0ff5 100644 --- a/OploverzProvider/build.gradle.kts +++ b/OploverzProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 7 +version = 8 cloudstream { diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt index ddfe631e..4d48edfa 100644 --- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt +++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt @@ -25,7 +25,7 @@ class OploverzProvider : MainAPI() { companion object { const val acefile = "https://acefile.co" - const val linkbox = "https://www.linkbox.to" + const val linkbox = "https://lbx.to" fun getType(t: String): TvType { return when { @@ -185,27 +185,6 @@ class OploverzProvider : MainAPI() { } - private suspend fun invokeLinkbox( - url: String, - referer: String, - quality: String? = null, - callback: (ExtractorLink) -> Unit - ) { - val id = Regex("""(/file/|id=)(\S+)""").find(url)?.groupValues?.get(2) - app.get("$linkbox/api/open/get_url?itemId=$id", referer = url) - .parsedSafe()?.data?.rList?.map { link -> - callback.invoke( - ExtractorLink( - "Linkbox", - "Linkbox", - link.url, - referer, - getQualityFromName(quality), - ) - ) - } - } - override suspend fun loadLinks( data: String, isCasting: Boolean, @@ -228,23 +207,19 @@ class OploverzProvider : MainAPI() { if (downloadSources?.isNotEmpty() == true) sources.addAll(downloadSources) sources.apmap { (quality, source) -> - if(source.startsWith(linkbox)) { - invokeLinkbox(source, data, quality, callback) - } else { - loadExtractor(fixedIframe(source), data, subtitleCallback) { link -> - callback.invoke( - ExtractorLink( - link.name, - link.name, - link.url, - link.referer, - if (source.startsWith(acefile)) getQualityFromName(quality) else link.quality, - link.isM3u8, - link.headers, - link.extractorData - ) + loadExtractor(fixedIframe(source), data, subtitleCallback) { link -> + callback.invoke( + ExtractorLink( + link.name, + link.name, + link.url, + link.referer, + if (source.startsWith(acefile)) getQualityFromName(quality) else link.quality, + link.isM3u8, + link.headers, + link.extractorData ) - } + ) } } @@ -252,12 +227,11 @@ class OploverzProvider : MainAPI() { } private fun fixedIframe(url: String): String { - return if (url.startsWith(acefile)) { - Regex("""/f/(\S+)/|/file/(\S+)/""").find(url)?.groupValues?.getOrNull(1).let { id -> - "$acefile/player/$id" - } - } else { - url + val id = Regex("""/f/(\S+)/|/file/(\S+)/""").find(url)?.groupValues?.getOrNull(1) + return when { + url.startsWith(acefile) -> "$acefile/player/$id" + url.startsWith(linkbox) -> "https://www.linkbox.to/a/f/$id" + else -> url } } diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index 27d1ee08..e6f87ce4 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -2628,7 +2628,7 @@ class Sblongvu : StreamSB() { } class Keephealth : StreamSB() { - override var name = "Kimcartoon" + override var name = "Keephealth" override var mainUrl = "https://keephealth.info" }