diff --git a/Anichi/build.gradle.kts b/Anichi/build.gradle.kts index 4201a7b2..c458c780 100644 --- a/Anichi/build.gradle.kts +++ b/Anichi/build.gradle.kts @@ -38,5 +38,5 @@ cloudstream { "OVA", ) - iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1200425504432472176/Anichi.png" + iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1200425504432472176/Anichi.png?ex=65eb0c5f&is=65d8975f&hm=974898b22b08774a5caa835b40546a6419280446b68255147dd1febb3abe9119&" } \ No newline at end of file diff --git a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt index 9433dd00..41dc0087 100644 --- a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt +++ b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt @@ -7,7 +7,9 @@ import com.lagradost.cloudstream3.utils.loadExtractor class DutaMovie : Gomov() { + override var mainUrl = "https://google.dutamovie21.mobi" + override var name = "DutaMovie" override val mainPage = mainPageOf( "category/box-office/page/%d/" to "Box Office", diff --git a/Gomov/src/main/kotlin/com/hexated/Multiplex.kt b/Gomov/src/main/kotlin/com/hexated/Multiplex.kt index 48b19977..99ab80da 100644 --- a/Gomov/src/main/kotlin/com/hexated/Multiplex.kt +++ b/Gomov/src/main/kotlin/com/hexated/Multiplex.kt @@ -4,8 +4,10 @@ import com.lagradost.cloudstream3.mainPageOf class Multiplex : Gomov() { + override var mainUrl = "https://imb-bmi.org/" + override var name = "Multiplex" override val mainPage = mainPageOf( "country/usa/page/%d/" to "Movie", diff --git a/Kinoger/build.gradle.kts b/Kinoger/build.gradle.kts index f7decb7b..116c52bd 100644 --- a/Kinoger/build.gradle.kts +++ b/Kinoger/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 3 +version = 4 cloudstream { diff --git a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt index d53d819f..245799ee 100644 --- a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt +++ b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt @@ -77,7 +77,7 @@ class Kinoger : MainAPI() { it.toSearchResult() } - val script = document.selectFirst("script:containsData(pw.show)")?.data() + val script = document.selectFirst("script:containsData(kinoger.ru)")?.data() val data = script?.substringAfter("[")?.substringBeforeLast("]")?.replace("\'", "\"") val json = AppUtils.tryParseJson>>("[$data]") diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt index b3775ded..3b000c63 100644 --- a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt +++ b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt @@ -9,7 +9,9 @@ import org.jsoup.nodes.Element class LayarKacaProvider : MainAPI() { + override var mainUrl = "https://ayo.lk21official.mom/" + private var seriesUrl = "https://tv12.nontondrama.click/" override var name = "LayarKaca" diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts index 7f643139..6c45e8ca 100644 --- a/Movierulzhd/build.gradle.kts +++ b/Movierulzhd/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 63 +version = 64 cloudstream { diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt b/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt index 11dd68d3..5502fbb2 100644 --- a/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt +++ b/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt @@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.mainPageOf class Animesaga : Movierulzhd() { override var mainUrl = "https://anplay.in" - override var name = "Animesaga" + override var name = "Anplay" override val supportedTypes = setOf( TvType.Anime, TvType.AnimeMovie, @@ -17,5 +17,6 @@ class Animesaga : Movierulzhd() { "movies" to "Movies", "tvshows" to "TV-Shows", "genre/hindi-dub" to "Hindi Dub", + "genre/crunchyroll" to "Crunchyroll", ) -} \ No newline at end of file +} diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt index 9954eb5d..a45157ca 100644 --- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt +++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt @@ -11,7 +11,7 @@ import java.net.URI open class Movierulzhd : MainAPI() { - override var mainUrl = "https://movierulzhd.cafe" + override var mainUrl = "https://movierulzhd.club" var directUrl = "" override var name = "Movierulzhd" override val hasMainPage = true diff --git a/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt b/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt index 2f58bf83..98762e9b 100644 --- a/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt +++ b/RebahinProvider/src/main/kotlin/com/hexated/RebahinProvider.kt @@ -12,7 +12,9 @@ import org.jsoup.nodes.Element import java.net.URI open class RebahinProvider : MainAPI() { + override var mainUrl = "http://37.60.242.22/" + private var directUrl: String? = null override var name = "Rebahin" override val hasMainPage = true diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index 4f2c8e13..b18344b1 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 = 225 +version = 227 android { defaultConfig { @@ -42,5 +42,5 @@ cloudstream { "Movie", ) - iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193122096159674448/2-modified.png" + iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193122096159674448/2-modified.png?ex=65ec2a0a&is=65d9b50a&hm=f1e0b0165e71101e5440b47592d9e15727a6c00cdeb3512108067bfbdbef1af7&" } diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index 3a5873df..a5dd613d 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -202,48 +202,6 @@ object SoraExtractor : SoraStream() { } } - suspend fun invokeMoviefiction( - title: String? = null, - season: Int? = null, - episode: Int? = null, - subtitleCallback: (SubtitleFile) -> Unit, - callback: (ExtractorLink) -> Unit - ) { - val fixTitle = title?.createSlug() - val url = if (season == null) { - "$moviefictionAPI/movies/$fixTitle" - } else { - "$moviefictionAPI/episode/$fixTitle-${season}x${episode}" - } - val req = app.get(url) - val directUrl = getBaseUrl(req.url) - req.document.select("ul.bx-lst.aa-tbs li a").apmap { - val iframe = app.get(base64Decode(it.attr("data-src"))).document.selectFirst("iframe") - ?.attr("src") ?: return@apmap - loadExtractor(iframe, "$directUrl/", subtitleCallback) { link -> - when { - link.name == "Bestx" && link.quality == Qualities.Unknown.value -> { - callback.invoke( - ExtractorLink( - "Moviefiction", - "Moviefiction", - link.url, - link.referer, - Qualities.P1080.value, - link.type, - link.headers, - link.extractorData - ) - ) - } - link.name != "Bestx" -> { - callback.invoke(link) - } - } - } - } - } - suspend fun invokeAoneroom( title: String? = null, year: Int? = null, @@ -899,7 +857,7 @@ object SoraExtractor : SoraStream() { invokeAnimetosho(malId, season, episode, subtitleCallback, callback) }, { - invokeAniwatch(zoroIds, episode, subtitleCallback, callback) + invokeHianime(zoroIds, episode, subtitleCallback, callback) }, { invokeAniwave(aniwaveId, episode, subtitleCallback, callback) @@ -997,7 +955,7 @@ object SoraExtractor : SoraStream() { } - private suspend fun invokeAniwatch( + private suspend fun invokeHianime( animeIds: List? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, @@ -1008,17 +966,17 @@ object SoraExtractor : SoraStream() { ) animeIds?.apmap { id -> val episodeId = app.get( - "$aniwatchAPI/ajax/v2/episode/list/${id ?: return@apmap}", + "$hianimeAPI/ajax/v2/episode/list/${id ?: return@apmap}", headers = headers - ).parsedSafe()?.html?.let { + ).parsedSafe()?.html?.let { Jsoup.parse(it) }?.select("div.ss-list a")?.find { it.attr("data-number") == "${episode ?: 1}" } ?.attr("data-id") val servers = app.get( - "$aniwatchAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}", + "$hianimeAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}", headers = headers - ).parsedSafe()?.html?.let { Jsoup.parse(it) } + ).parsedSafe()?.html?.let { Jsoup.parse(it) } ?.select("div.item.server-item")?.map { Triple( it.text(), @@ -1029,15 +987,15 @@ object SoraExtractor : SoraStream() { servers?.apmap servers@{ server -> val iframe = app.get( - "$aniwatchAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}", + "$hianimeAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}", headers = headers - ).parsedSafe()?.link + ).parsedSafe()?.link ?: return@servers val audio = if (server.third == "sub") "Raw" else "English Dub" loadCustomExtractor( "${server.first} [$audio]", iframe, - "$aniwatchAPI/", + "$hianimeAPI/", subtitleCallback, callback, ) @@ -1377,14 +1335,16 @@ object SoraExtractor : SoraStream() { ) { val slugTitle = title?.createSlug() val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode) - val req = app.get("$m4uhdAPI/search/$slugTitle.html", timeout = 20) + val req = app.get("$m4uhdAPI/search/$slugTitle", timeout = 20) val referer = getBaseUrl(req.url) - val media = req.document.select("div.row div.item > a").map { it.attr("href") } - val mediaUrl = if(media.size == 1) { + val media = req.document.select("div.row div.item a").map { it.attr("href") } + val mediaUrl = if (media.size == 1) { media.first() } else { - media.find { it.contains("-$slugTitle-") && it.contains("-$year-") } + media.find { + if(season == null) it.startsWith("movies/$slugTitle-$year.") else it.startsWith("tv-series/$slugTitle-$year.") + } } val link = fixUrl(mediaUrl ?: return, referer) @@ -1398,7 +1358,7 @@ object SoraExtractor : SoraStream() { doc.select("div.le-server span").map { it.attr("data") } } else { val idepisode = - doc.selectFirst("div.season > p:matches((?i)S$seasonSlug-E$episodeSlug) button") + doc.selectFirst("button[class=episode]:matches(S$seasonSlug-E$episodeSlug)") ?.attr("idepisode") ?: return val requestEmbed = app.post( @@ -2420,7 +2380,7 @@ object SoraExtractor : SoraStream() { season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit, - host: String = "https://dozzlegram-duj-i-280.site", + host: String = "https://guinsters286nedril.com", ) { val res = app.get( "$host/play/$imdbId", diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt index 0fdb7778..029d0af6 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt @@ -274,7 +274,7 @@ data class MALSyncResponses( @JsonProperty("Sites") val sites: MALSyncSites? = null, ) -data class AniwatchResponses( +data class HianimeResponses( @JsonProperty("html") val html: String? = null, @JsonProperty("link") val link: String? = null, ) diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index 8df050d4..029d46dc 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -85,12 +85,12 @@ open class SoraStream : TmdbProvider() { const val noverseAPI = "https://www.nollyverse.com" const val filmxyAPI = "https://www.filmxy.vip" const val kimcartoonAPI = "https://kimcartoon.li" - const val aniwatchAPI = "https://aniwatch.to" + const val hianimeAPI = "https://hianime.to" const val aniwaveAPI = "https://aniwave.to" const val crunchyrollAPI = "https://beta-api.crunchyroll.com" const val kissKhAPI = "https://kisskh.co" const val lingAPI = "https://ling-online.net" - const val m4uhdAPI = "https://m4umv.org" + const val m4uhdAPI = "https://ww1.streamm4u.ws" const val rStreamAPI = "https://remotestream.cc" const val flixonAPI = "https://flixon.lol" const val smashyStreamAPI = "https://embed.smashystream.com" @@ -115,9 +115,9 @@ open class SoraStream : TmdbProvider() { const val mMoviesAPI = "https://multimovies.uno" const val watchCartoonAPI = "https://www1.watchcartoononline.bz" const val moflixAPI = "https://moflix-stream.xyz" - const val moviefictionAPI = "https://moviefiction.com" const val zoechipAPI = "https://zoechip.org" const val nepuAPI = "https://nepu.to" + const val fdMoviesAPI = "https://freedrivemovie.com" const val uhdmoviesAPI = "https://uhdmovies.asia" const val hdmovies4uAPI = "https://hdmovies4u.day" diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt index 122f4c45..e261fc26 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt @@ -29,7 +29,6 @@ import com.hexated.SoraExtractor.invokeVidsrcto import com.hexated.SoraExtractor.invokeCinemaTv import com.hexated.SoraExtractor.invokeMoflix import com.hexated.SoraExtractor.invokeGhostx -import com.hexated.SoraExtractor.invokeMoviefiction import com.hexated.SoraExtractor.invokeNepu import com.hexated.SoraExtractor.invokeWatchCartoon import com.hexated.SoraExtractor.invokeWatchsomuch diff --git a/Superstream/build.gradle.kts b/Superstream/build.gradle.kts index 2bf7d8a9..057e3884 100644 --- a/Superstream/build.gradle.kts +++ b/Superstream/build.gradle.kts @@ -38,5 +38,5 @@ cloudstream { ) - iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1196694385061003334/icon.png" + iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1196694385061003334/icon.png?ex=65efee7e&is=65dd797e&hm=18fa57323826d0cbf3cf5ce7d3f5705de640f2f8d08739d41f95882d2ae0a3e0&" } \ No newline at end of file diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts index a28f5bbf..6ed08fe4 100644 --- a/TimefourTv/build.gradle.kts +++ b/TimefourTv/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 23 +version = 24 cloudstream { @@ -21,5 +21,5 @@ cloudstream { "Live", ) - iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193088870212976640/Untitled.jpg" + iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193088870212976640/Untitled.jpg?ex=65ec0b19&is=65d99619&hm=0eaf0f1926b6eb787b80c2eb3000ec9d77e2e706ab0601cad053ad8f677b8cc8&" } diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt index 53eef45d..d3bbe57f 100644 --- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt +++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt @@ -17,10 +17,9 @@ class TimefourTv : MainAPI() { TvType.Live ) - private val homePoster = - "https://cdn.discordapp.com/attachments/1109266606292488297/1193060449193840681/Screenshot_2024-01-06_at_12-14-16_Logo_Maker_Used_By_2.3_Million_Startups.png" + private val homePoster = "https://cdn.discordapp.com/attachments/1109266606292488297/1193060449193840681/Screenshot_2024-01-06_at_12-14-16_Logo_Maker_Used_By_2.3_Million_Startups.png?ex=65ebf0a1&is=65d97ba1&hm=aa4018534090d5dc69cf16a15ab4663d6f84a742d3f3b5ccad4be779c26517d7&" private val detailPoster = - "https://cdn.discordapp.com/attachments/1109266606292488297/1193060448929595454/Screenshot_2024-01-06_at_12-13-02_Logo_Maker_Used_By_2.3_Million_Startups.png" + "https://cdn.discordapp.com/attachments/1109266606292488297/1193060448929595454/Screenshot_2024-01-06_at_12-13-02_Logo_Maker_Used_By_2.3_Million_Startups.png?ex=65ebf0a1&is=65d97ba1&hm=2dc35d2fcc09530f6d9fc963ecf6b9a28eeec1a7c76a083711379c7280dd34dc&" override val mainPage = mainPageOf( "$mainUrl/24-7-channels.php" to "24/7 Channels", diff --git a/settings.gradle.kts b/settings.gradle.kts index 5df21340..c969792c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,7 @@ rootProject.name = "CloudstreamPlugins" // This file sets what projects are included. All new projects should get automatically included unless specified in "disabled" variable. -val disabled = listOf("Animixplay","Kickassanime") +val disabled = listOf("Animixplay","Kickassanime","Hdfilmcehennemi") File(rootDir, ".").eachDir { dir -> if (!disabled.contains(dir.name) && File(dir, "build.gradle.kts").exists()) {