From 464046aaea6f17e8ed32a9d28ba229753a316d69 Mon Sep 17 00:00:00 2001 From: hexated Date: Sun, 22 Oct 2023 16:52:23 +0700 Subject: [PATCH] fix --- SoraStream/build.gradle.kts | 2 +- SoraStream/src/main/kotlin/com/hexated/Extractors.kt | 5 +++++ SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 5 ++++- SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 5 +++-- SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt | 3 ++- SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index ecbc6d01..a873dd7b 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.konan.properties.Properties // use an integer for version numbers -version = 186 +version = 187 android { defaultConfig { diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt index dcc65e32..85d37ba8 100644 --- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt +++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt @@ -392,4 +392,9 @@ class MultimoviesSB : StreamSB() { class Yipsu : Voe() { override val name = "Yipsu" override var mainUrl = "https://yip.su" +} + +class Embedwish : Filesim() { + override val name = "Embedwish" + override var mainUrl = "https://embedwish.com" } \ No newline at end of file diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index 677dabb1..8b660dc7 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -223,7 +223,10 @@ object SoraExtractor : SoraStream() { } else { "$multimoviesAPI/episodes/$fixTitle-${season}x${episode}" } - invokeWpmovies(null, url, subtitleCallback, callback, true) + val req = app.get(url) + val directUrl = getBaseUrl(req.url) + val iframe = req.document.selectFirst("div.pframe iframe")?.attr("src") + loadCustomExtractor("Multimovies", iframe ?: return, "$directUrl/", subtitleCallback, callback) } suspend fun invokeNetmovies( diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index 9b79d9d6..2a8f3a4c 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -113,7 +113,7 @@ open class SoraStream : TmdbProvider() { const val navyAPI = "https://navy-issue-i-239.site" const val emoviesAPI = "https://emovies.si" const val pobmoviesAPI = "https://pobmovies.cam" - const val multimoviesAPI = "https://multimovies.live" + const val multimoviesAPI = "https://multimovies.info" const val netmoviesAPI = "https://netmovies.to" const val momentAPI = "https://moment-explanation-i-244.site" const val doomoviesAPI = "https://doomovies.net" @@ -612,8 +612,9 @@ open class SoraStream : TmdbProvider() { }, { if (!res.isAnime && res.season == null) invokeRidomovies( + res.id, + res.imdbId, res.title, - res.year, callback ) }, diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt index b6cb58d9..8d49be6b 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt @@ -228,8 +228,9 @@ class SoraStreamLite : SoraStream() { }, { if (!res.isAnime && res.season == null) invokeRidomovies( + res.id, + res.imdbId, res.title, - res.year, callback ) }, diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt index 130922d7..d6d06b09 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt @@ -25,5 +25,6 @@ class SoraStreamPlugin: Plugin() { registerExtractorAPI(Streamruby()) registerExtractorAPI(Streamwish()) registerExtractorAPI(FilelionsTo()) + registerExtractorAPI(Embedwish()) } } \ No newline at end of file