From 2d5ab87eebe8edb5383f58ca0f263e134ef1c92a Mon Sep 17 00:00:00 2001 From: Jace <54625750+Jacekun@users.noreply.github.com> Date: Sun, 16 Oct 2022 16:11:19 +0800 Subject: [PATCH] Fix TvType for all plugins --- Hahomoe/build.gradle.kts | 2 +- .../src/main/kotlin/com/jacekun/Hahomoe.kt | 6 ++-- Hanime/build.gradle.kts | 2 +- Hanime/src/main/kotlin/com/jacekun/Hanime.kt | 2 +- HentaiHaven/build.gradle.kts | 2 +- .../main/kotlin/com/jacekun/HentaiHaven.kt | 26 +++++++------- HpJav/build.gradle.kts | 2 +- HpJav/src/main/kotlin/com/jacekun/HpJav.kt | 2 +- JavFreeProvider/build.gradle.kts | 2 +- .../kotlin/com/jacekun/JavFreeProvider.kt | 36 +++++++++---------- JavGuru/build.gradle.kts | 2 +- .../src/main/kotlin/com/jacekun/JavGuru.kt | 2 +- JavHD/build.gradle.kts | 2 +- JavMost/build.gradle.kts | 2 +- .../src/main/kotlin/com/jacekun/JavMost.kt | 4 +-- JavSubProvider/build.gradle.kts | 2 +- .../main/kotlin/com/jacekun/JavSubProvider.kt | 2 +- JavTube/build.gradle.kts | 2 +- .../src/main/kotlin/com/jacekun/JavTube.kt | 2 +- OpJav/build.gradle.kts | 2 +- OpJav/src/main/kotlin/com/jacekun/OpJav.kt | 2 +- Pornhub/build.gradle.kts | 2 +- .../src/main/kotlin/com/jacekun/Pornhub.kt | 2 +- Vlxx/build.gradle.kts | 2 +- Vlxx/src/main/kotlin/com/jacekun/Vlxx.kt | 2 +- XvideosProvider/build.gradle.kts | 2 +- .../kotlin/com/jacekun/XvideosProvider.kt | 6 ++-- 27 files changed, 61 insertions(+), 61 deletions(-) diff --git a/Hahomoe/build.gradle.kts b/Hahomoe/build.gradle.kts index e1aa530..9536cac 100644 --- a/Hahomoe/build.gradle.kts +++ b/Hahomoe/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/Hahomoe/src/main/kotlin/com/jacekun/Hahomoe.kt b/Hahomoe/src/main/kotlin/com/jacekun/Hahomoe.kt index 16c2f0f..2688b08 100644 --- a/Hahomoe/src/main/kotlin/com/jacekun/Hahomoe.kt +++ b/Hahomoe/src/main/kotlin/com/jacekun/Hahomoe.kt @@ -30,9 +30,9 @@ class Hahomoe : MainAPI() { private val globalTvType = TvType.NSFW override var mainUrl = "https://haho.moe" override var name = "Haho moe" - override val hasQuickSearch: Boolean get() = false - override val hasMainPage: Boolean get() = true - override val supportedTypes: Set get() = setOf(TvType.NSFW) + override val hasQuickSearch = false + override val hasMainPage = true + override val supportedTypes = setOf(TvType.NSFW) private fun loadToken(): Boolean { return try { diff --git a/Hanime/build.gradle.kts b/Hanime/build.gradle.kts index e818800..a37ed84 100644 --- a/Hanime/build.gradle.kts +++ b/Hanime/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/Hanime/src/main/kotlin/com/jacekun/Hanime.kt b/Hanime/src/main/kotlin/com/jacekun/Hanime.kt index a3e85f6..fe2bb5e 100644 --- a/Hanime/src/main/kotlin/com/jacekun/Hanime.kt +++ b/Hanime/src/main/kotlin/com/jacekun/Hanime.kt @@ -19,7 +19,7 @@ import kotlin.collections.ArrayList class Hanime : MainAPI() { private val globalTvType = TvType.NSFW - private val interceptor = CloudflareKiller() + //private val interceptor = CloudflareKiller() private var globalHeaders = mapOf() private val DEV = "DevDebug" diff --git a/HentaiHaven/build.gradle.kts b/HentaiHaven/build.gradle.kts index 96932ef..227a832 100644 --- a/HentaiHaven/build.gradle.kts +++ b/HentaiHaven/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/HentaiHaven/src/main/kotlin/com/jacekun/HentaiHaven.kt b/HentaiHaven/src/main/kotlin/com/jacekun/HentaiHaven.kt index e96b40a..e88f9fe 100644 --- a/HentaiHaven/src/main/kotlin/com/jacekun/HentaiHaven.kt +++ b/HentaiHaven/src/main/kotlin/com/jacekun/HentaiHaven.kt @@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.utils.getQualityFromName import org.jsoup.select.Elements class HentaiHaven : MainAPI() { - private val globalTvType = TvType.TvSeries + private val globalTvType = TvType.NSFW override var name = "Hentai Haven" override var mainUrl = "https://hentaihaven.xxx" override val supportedTypes = setOf(TvType.NSFW) @@ -17,18 +17,6 @@ class HentaiHaven : MainAPI() { override val hasMainPage= true override val hasQuickSearch = false - private data class ResponseJson( - @JsonProperty("data") val data: ResponseData? - ) - private data class ResponseData( - @JsonProperty("sources") val sources: List? = listOf() - ) - private data class ResponseSources( - @JsonProperty("src") val src: String?, - @JsonProperty("type") val type: String?, - @JsonProperty("label") val label: String? - ) - override suspend fun getMainPage( page: Int, request: MainPageRequest @@ -221,4 +209,16 @@ class HentaiHaven : MainAPI() { ) } ?: listOf() } + + private data class ResponseJson( + @JsonProperty("data") val data: ResponseData? + ) + private data class ResponseData( + @JsonProperty("sources") val sources: List? = listOf() + ) + private data class ResponseSources( + @JsonProperty("src") val src: String?, + @JsonProperty("type") val type: String?, + @JsonProperty("label") val label: String? + ) } \ No newline at end of file diff --git a/HpJav/build.gradle.kts b/HpJav/build.gradle.kts index 2c61ba7..510d41b 100644 --- a/HpJav/build.gradle.kts +++ b/HpJav/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/HpJav/src/main/kotlin/com/jacekun/HpJav.kt b/HpJav/src/main/kotlin/com/jacekun/HpJav.kt index 02ce649..eed8331 100644 --- a/HpJav/src/main/kotlin/com/jacekun/HpJav.kt +++ b/HpJav/src/main/kotlin/com/jacekun/HpJav.kt @@ -8,7 +8,7 @@ import org.jsoup.Jsoup class HpJav : MainAPI() { private val DEV = "DevDebug" - private val globaltvType = TvType.Movie + private val globaltvType = TvType.NSFW override var name = "HpJav TV" override var mainUrl = "https://hpjav.tv" diff --git a/JavFreeProvider/build.gradle.kts b/JavFreeProvider/build.gradle.kts index 26775f0..2598c3c 100644 --- a/JavFreeProvider/build.gradle.kts +++ b/JavFreeProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 3 +version = 4 cloudstream { diff --git a/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt b/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt index 02b8da7..683cace 100644 --- a/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt +++ b/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt @@ -10,26 +10,13 @@ import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.Jsoup class JavFreeProvider : MainAPI() { - private val globalTvType = TvType.Movie + private val globalTvType = TvType.NSFW override var name = "JavFree" override var mainUrl = "https://javfree.sh" - override val supportedTypes: Set get() = setOf(TvType.NSFW) - override val hasDownloadSupport: Boolean get() = false - override val hasMainPage: Boolean get() = true - override val hasQuickSearch: Boolean get() = false - - private data class ResponseJson( - @JsonProperty("list") val list: List? - ) - private data class ResponseData( - @JsonProperty("url") val file: String?, - @JsonProperty("server") val server: String?, - @JsonProperty("active") val active: Int? - ) - - private fun String.cleanText() : String = this.trim().removePrefix("Watch JAV Free") - .removeSuffix("HD Free Online on JAVFree.SH").trim() - .removePrefix("Watch JAV").trim() + override val supportedTypes = setOf(TvType.NSFW) + override val hasDownloadSupport = false + override val hasMainPage = true + override val hasQuickSearch = false override suspend fun getMainPage( page: Int, @@ -181,4 +168,17 @@ class JavFreeProvider : MainAPI() { } return false } + + private data class ResponseJson( + @JsonProperty("list") val list: List? + ) + private data class ResponseData( + @JsonProperty("url") val file: String?, + @JsonProperty("server") val server: String?, + @JsonProperty("active") val active: Int? + ) + + private fun String.cleanText() : String = this.trim().removePrefix("Watch JAV Free") + .removeSuffix("HD Free Online on JAVFree.SH").trim() + .removePrefix("Watch JAV").trim() } \ No newline at end of file diff --git a/JavGuru/build.gradle.kts b/JavGuru/build.gradle.kts index c8b0c6c..a46f1ab 100644 --- a/JavGuru/build.gradle.kts +++ b/JavGuru/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/JavGuru/src/main/kotlin/com/jacekun/JavGuru.kt b/JavGuru/src/main/kotlin/com/jacekun/JavGuru.kt index a429d57..837d804 100644 --- a/JavGuru/src/main/kotlin/com/jacekun/JavGuru.kt +++ b/JavGuru/src/main/kotlin/com/jacekun/JavGuru.kt @@ -8,7 +8,7 @@ import org.jsoup.Jsoup class JavGuru : MainAPI() { private val DEV = "DevDebug" - private val globaltvType = TvType.Movie + private val globaltvType = TvType.NSFW override var name = "Jav Guru" override var mainUrl = "https://jav.guru" diff --git a/JavHD/build.gradle.kts b/JavHD/build.gradle.kts index 4d5d063..e0f3ace 100644 --- a/JavHD/build.gradle.kts +++ b/JavHD/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 2 +version = 3 cloudstream { diff --git a/JavMost/build.gradle.kts b/JavMost/build.gradle.kts index 7317acf..ab88082 100644 --- a/JavMost/build.gradle.kts +++ b/JavMost/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/JavMost/src/main/kotlin/com/jacekun/JavMost.kt b/JavMost/src/main/kotlin/com/jacekun/JavMost.kt index 035325a..ca74527 100644 --- a/JavMost/src/main/kotlin/com/jacekun/JavMost.kt +++ b/JavMost/src/main/kotlin/com/jacekun/JavMost.kt @@ -8,9 +8,9 @@ import org.jsoup.Jsoup class JavMost : MainAPI() { private val DEV = "DevDebug" - private val globaltvType = TvType.Movie + private val globaltvType = TvType.NSFW - override var name = "JAVMost.com" + override var name = "JavMost" override var mainUrl = "https://www5.javmost.com" override val supportedTypes = setOf(TvType.NSFW) override val hasDownloadSupport = false diff --git a/JavSubProvider/build.gradle.kts b/JavSubProvider/build.gradle.kts index 04cc1bf..e90a2cb 100644 --- a/JavSubProvider/build.gradle.kts +++ b/JavSubProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 2 +version = 3 cloudstream { diff --git a/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt b/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt index 19462d8..8dad390 100644 --- a/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt +++ b/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt @@ -18,7 +18,7 @@ class JavSubProvider : MainAPI() { override val hasQuickSearch: Boolean get() = false private val prefixTag = "dummyTag" //For use on stream links to differentiate links - private val globalTvType = TvType.Movie + private val globalTvType = TvType.NSFW data class ResponseMovieDetails( @JsonProperty("name") val name: String?, diff --git a/JavTube/build.gradle.kts b/JavTube/build.gradle.kts index e2109d4..17e1566 100644 --- a/JavTube/build.gradle.kts +++ b/JavTube/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/JavTube/src/main/kotlin/com/jacekun/JavTube.kt b/JavTube/src/main/kotlin/com/jacekun/JavTube.kt index acc42e7..9e14737 100644 --- a/JavTube/src/main/kotlin/com/jacekun/JavTube.kt +++ b/JavTube/src/main/kotlin/com/jacekun/JavTube.kt @@ -13,7 +13,7 @@ import org.jsoup.Jsoup class JavTube : MainAPI() { private val DEV = "DevDebug" - private val globaltvType = TvType.Movie + private val globaltvType = TvType.NSFW override var name = "JavTube" override var mainUrl = "https://javtube.watch" override val supportedTypes = setOf(TvType.NSFW) diff --git a/OpJav/build.gradle.kts b/OpJav/build.gradle.kts index 7f52e7a..4c3da01 100644 --- a/OpJav/build.gradle.kts +++ b/OpJav/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 2 +version = 3 cloudstream { diff --git a/OpJav/src/main/kotlin/com/jacekun/OpJav.kt b/OpJav/src/main/kotlin/com/jacekun/OpJav.kt index b02f4cd..64dafba 100644 --- a/OpJav/src/main/kotlin/com/jacekun/OpJav.kt +++ b/OpJav/src/main/kotlin/com/jacekun/OpJav.kt @@ -12,7 +12,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.nodes.Element class OpJav : MainAPI() { - private val globalTvType = TvType.Movie + private val globalTvType = TvType.NSFW override var name = "OpJAV" override var mainUrl = "https://opjav.com" override val supportedTypes = setOf(TvType.NSFW) diff --git a/Pornhub/build.gradle.kts b/Pornhub/build.gradle.kts index 4a79585..68739b9 100644 --- a/Pornhub/build.gradle.kts +++ b/Pornhub/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/Pornhub/src/main/kotlin/com/jacekun/Pornhub.kt b/Pornhub/src/main/kotlin/com/jacekun/Pornhub.kt index f6c8f3c..4ab7001 100644 --- a/Pornhub/src/main/kotlin/com/jacekun/Pornhub.kt +++ b/Pornhub/src/main/kotlin/com/jacekun/Pornhub.kt @@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.utils.* import org.jsoup.nodes.Element class Pornhub : MainAPI() { - private val globalTvType = TvType.Movie + private val globalTvType = TvType.NSFW override var mainUrl = "https://www.pornhub.com" override var name = "Pornhub" diff --git a/Vlxx/build.gradle.kts b/Vlxx/build.gradle.kts index 0595da9..0804181 100644 --- a/Vlxx/build.gradle.kts +++ b/Vlxx/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/Vlxx/src/main/kotlin/com/jacekun/Vlxx.kt b/Vlxx/src/main/kotlin/com/jacekun/Vlxx.kt index 69ab8fa..4dbb480 100644 --- a/Vlxx/src/main/kotlin/com/jacekun/Vlxx.kt +++ b/Vlxx/src/main/kotlin/com/jacekun/Vlxx.kt @@ -14,7 +14,7 @@ import com.lagradost.nicehttp.NiceResponse class Vlxx : MainAPI() { private val DEV = "DevDebug" - private val globaltvType = TvType.Movie + private val globaltvType = TvType.NSFW override var name = "Vlxx" override var mainUrl = "https://vlxx.sex" diff --git a/XvideosProvider/build.gradle.kts b/XvideosProvider/build.gradle.kts index 7cf9dec..e9b4ee5 100644 --- a/XvideosProvider/build.gradle.kts +++ b/XvideosProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 2 +version = 3 cloudstream { diff --git a/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt b/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt index acfd395..7d55f75 100644 --- a/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt +++ b/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt @@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.* class XvideosProvider : MainAPI() { - private val globalTvType = TvType.Movie + private val globalTvType = TvType.NSFW override var mainUrl = "https://www.xvideos.com" override var name = "Xvideos" override val hasMainPage = true @@ -106,7 +106,7 @@ class XvideosProvider : MainAPI() { name = title ?: "", url = url, apiName = this.name, - type = tvType, + type = globalTvType, episodes = episodes, posterUrl = poster, plot = title, @@ -119,7 +119,7 @@ class XvideosProvider : MainAPI() { name = title ?: "", url = url, apiName = this.name, - type = tvType, + type = globalTvType, dataUrl = url, posterUrl = poster, plot = title,