From c66b1bdedb8764cc5b29b01fa089945476ba1633 Mon Sep 17 00:00:00 2001 From: hexated Date: Sat, 17 Jun 2023 14:48:57 +0700 Subject: [PATCH] kuronime: fix search --- KuronimeProvider/build.gradle.kts | 2 +- .../kotlin/com/hexated/KuronimeProvider.kt | 14 ++++++- OploverzProvider/build.gradle.kts | 2 +- .../kotlin/com/hexated/OploverzProvider.kt | 2 +- .../src/main/kotlin/com/hexated/SoraStream.kt | 42 +++++++++---------- 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/KuronimeProvider/build.gradle.kts b/KuronimeProvider/build.gradle.kts index 505056f1..c903bc0b 100644 --- a/KuronimeProvider/build.gradle.kts +++ b/KuronimeProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 12 +version = 13 cloudstream { diff --git a/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt b/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt index abf0f8de..2d050c26 100644 --- a/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt +++ b/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt @@ -9,10 +9,11 @@ import com.lagradost.cloudstream3.utils.getQualityFromName import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.Jsoup import org.jsoup.nodes.Element +import java.net.URI import java.util.ArrayList class KuronimeProvider : MainAPI() { - override var mainUrl = "https://kuronime.lol" + override var mainUrl = "https://kuronime.top" override var name = "Kuronime" override val hasQuickSearch = true override val hasMainPage = true @@ -53,7 +54,9 @@ class KuronimeProvider : MainAPI() { page: Int, request: MainPageRequest ): HomePageResponse { - val document = app.get(request.data + page).document + val req = app.get(request.data + page) + mainUrl = getBaseUrl(req.url) + val document = req.document val home = document.select("article").map { it.toSearchResult() } @@ -98,6 +101,7 @@ class KuronimeProvider : MainAPI() { override suspend fun quickSearch(query: String): List? = search(query) override suspend fun search(query: String): List? { + mainUrl = app.get(mainUrl).url return app.post( "$mainUrl/wp-admin/admin-ajax.php", data = mapOf( "action" to "ajaxy_sf", @@ -205,6 +209,12 @@ class KuronimeProvider : MainAPI() { return true } + private fun getBaseUrl(url: String): String { + return URI(url).let { + "${it.scheme}://${it.host}" + } + } + data class All( @JsonProperty("post_image") var postImage: String? = null, @JsonProperty("post_image_html") var postImageHtml: String? = null, diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts index 75609b39..1be043df 100644 --- a/OploverzProvider/build.gradle.kts +++ b/OploverzProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 16 +version = 17 cloudstream { diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt index 96804613..7d00e9f1 100644 --- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt +++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt @@ -9,7 +9,7 @@ import org.jsoup.Jsoup import org.jsoup.nodes.Element class OploverzProvider : MainAPI() { - override var mainUrl = "https://oploverz.love" + override var mainUrl = "https://oploverz.care" override var name = "Oploverz" override val hasMainPage = true override var lang = "id" diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index e240952a..b7f061ee 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -127,7 +127,6 @@ open class SoraStream : TmdbProvider() { // INDEX SITE const val blackMoviesAPI = "https://dl.blacklistedbois.workers.dev/0:" - const val rinzryMoviesAPI = "https://rinzry.stream/0:" const val codexMoviesAPI = "https://packs.codexcloudx.tech/0:" const val edithxMoviesAPI = "https://index.edithx.ga/0:" const val dahmerMoviesAPI = "https://edytjedhgmdhm.abfhaqrhbnf.workers.dev" @@ -140,15 +139,16 @@ open class SoraStream : TmdbProvider() { base64DecodeAPI("ZXY=LmQ=cnM=a2U=b3I=Lnc=ZXI=ZGQ=bGE=cy0=b2I=YWM=Lmo=YWw=aW4=LWY=cm4=Ym8=cmU=Ly8=czo=dHA=aHQ=") // DEAD SITE - const val chillmovies0API = "https://chill.aicirou.workers.dev/0:" // dead - const val chillmovies1API = "https://chill.aicirou.workers.dev/1:" // dead - const val gamMoviesAPI = "https://drive.gamick.workers.dev/0:" // dead - const val jsMoviesAPI = "https://jsupload.jnsbot.workers.dev/0:" // dead - const val xtremeMoviesAPI = "https://kartik19.xtrememirror0.workers.dev/0:" // dead - const val tgarMovieAPI = "https://tgarchive.eu.org" // dead - const val baymoviesAPI = "https://opengatewayindex.pages.dev" // dead - const val papaonMovies1API = "https://m.papaonwork.workers.dev/0:" // dead - const val papaonMovies2API = "https://m.papaonwork.workers.dev/1:" // dead + const val rinzryMoviesAPI = "https://rinzry.stream/0:" + const val chillmovies0API = "https://chill.aicirou.workers.dev/0:" + const val chillmovies1API = "https://chill.aicirou.workers.dev/1:" + const val gamMoviesAPI = "https://drive.gamick.workers.dev/0:" + const val jsMoviesAPI = "https://jsupload.jnsbot.workers.dev/0:" + const val xtremeMoviesAPI = "https://kartik19.xtrememirror0.workers.dev/0:" + const val tgarMovieAPI = "https://tgarchive.eu.org" + const val baymoviesAPI = "https://opengatewayindex.pages.dev" + const val papaonMovies1API = "https://m.papaonwork.workers.dev/0:" + const val papaonMovies2API = "https://m.papaonwork.workers.dev/1:" fun getType(t: String?): TvType { return when (t) { @@ -646,17 +646,17 @@ open class SoraStream : TmdbProvider() { callback ) }, - { - invokeRinzrymovies( - rinzryMoviesAPI, - "RinzryMovies", - res.title, - res.year, - res.season, - res.episode, - callback, - ) - }, +// { +// invokeRinzrymovies( +// rinzryMoviesAPI, +// "RinzryMovies", +// res.title, +// res.year, +// res.season, +// res.episode, +// callback, +// ) +// }, { if (!res.isAnime) invokeCodexmovies( codexMoviesAPI,