diff --git a/Gomov/build.gradle.kts b/Gomov/build.gradle.kts index 52127f19..70675fa4 100644 --- a/Gomov/build.gradle.kts +++ b/Gomov/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.konan.properties.Properties // use an integer for version numbers -version = 13 +version = 14 android { defaultConfig { diff --git a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt index e98038c2..f383db56 100644 --- a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt +++ b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt @@ -17,21 +17,4 @@ open class DutaMovie : Gomov() { "country/indonesia/page/%d/" to "Serial TV Indonesia", ) - override suspend fun loadLinks( - data: String, - isCasting: Boolean, - subtitleCallback: (SubtitleFile) -> Unit, - callback: (ExtractorLink) -> Unit - ): Boolean { - - app.get(data).document.select("ul.muvipro-player-tabs li a").apmap { - val iframe = app.get(fixUrl(it.attr("href"))).document.selectFirst("div.gmr-embed-responsive iframe") - ?.attr("src") - loadExtractor(httpsify(iframe ?: return@apmap ), "$mainUrl/", subtitleCallback, callback) - } - - return true - } - - } \ No newline at end of file diff --git a/Gomov/src/main/kotlin/com/hexated/Gomov.kt b/Gomov/src/main/kotlin/com/hexated/Gomov.kt index 6fc1892e..f539fb76 100644 --- a/Gomov/src/main/kotlin/com/hexated/Gomov.kt +++ b/Gomov/src/main/kotlin/com/hexated/Gomov.kt @@ -151,15 +151,23 @@ open class Gomov : MainAPI() { ): Boolean { val document = app.get(data).document - val id = document.selectFirst("div#muvipro_player_content_id")!!.attr("data-id") + val id = document.selectFirst("div#muvipro_player_content_id")?.attr("data-id") - document.select("div.tab-content-ajax").apmap { - val server = app.post( - "$directUrl/wp-admin/admin-ajax.php", - data = mapOf("action" to "muvipro_player_content", "tab" to it.attr("id"), "post_id" to id) - ).document.select("iframe").attr("src") + if(id.isNullOrEmpty()) { + document.select("ul.muvipro-player-tabs li a").apmap { + val iframe = app.get(fixUrl(it.attr("href"))).document.selectFirst("div.gmr-embed-responsive iframe") + ?.attr("src") + loadExtractor(httpsify(iframe ?: return@apmap ), "$directUrl/", subtitleCallback, callback) + } + } else { + document.select("div.tab-content-ajax").apmap { + val server = app.post( + "$directUrl/wp-admin/admin-ajax.php", + data = mapOf("action" to "muvipro_player_content", "tab" to it.attr("id"), "post_id" to "$id") + ).document.select("iframe").attr("src") - loadExtractor(httpsify(server), "$directUrl/", subtitleCallback, callback) + loadExtractor(httpsify(server), "$directUrl/", subtitleCallback, callback) + } } return true diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt index af5e20ab..c83502b5 100644 --- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt +++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt @@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.loadExtractor class Ngefilm : Gomov() { - override var mainUrl = "https://nge-film21.site" + override var mainUrl = "https://ngefilm21.us" override var name = "Ngefilm" override val mainPage = mainPageOf(