diff --git a/JavFreeProvider/build.gradle.kts b/JavFreeProvider/build.gradle.kts index ddd4083..26775f0 100644 --- a/JavFreeProvider/build.gradle.kts +++ b/JavFreeProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 2 +version = 3 cloudstream { diff --git a/JavFreeProvider/src/main/AndroidManifest.xml b/JavFreeProvider/src/main/AndroidManifest.xml index 1863f02..29aec9d 100644 --- a/JavFreeProvider/src/main/AndroidManifest.xml +++ b/JavFreeProvider/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt b/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt index 005e58f..02b8da7 100644 --- a/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt +++ b/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt @@ -10,10 +10,10 @@ import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.Jsoup class JavFreeProvider : MainAPI() { - private val tvType = TvType.NSFW + private val globalTvType = TvType.Movie override var name = "JavFree" override var mainUrl = "https://javfree.sh" - override val supportedTypes: Set get() = setOf(tvType) + 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 @@ -65,7 +65,7 @@ class JavFreeProvider : MainAPI() { name = name, url = link, apiName = this.name, - type = tvType, + type = globalTvType, posterUrl = image, year = year ) @@ -103,7 +103,7 @@ class JavFreeProvider : MainAPI() { name = title, url = url, apiName = this.name, - type = tvType, + type = globalTvType, posterUrl = image, year = year ) @@ -138,7 +138,7 @@ class JavFreeProvider : MainAPI() { name = title, url = url, apiName = this.name, - type = tvType, + type = globalTvType, dataUrl = streamUrl, posterUrl = poster, year = year, diff --git a/JavSubProvider/build.gradle.kts b/JavSubProvider/build.gradle.kts index 105ec04..04cc1bf 100644 --- a/JavSubProvider/build.gradle.kts +++ b/JavSubProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/JavSubProvider/src/main/AndroidManifest.xml b/JavSubProvider/src/main/AndroidManifest.xml index 1863f02..29aec9d 100644 --- a/JavSubProvider/src/main/AndroidManifest.xml +++ b/JavSubProvider/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt b/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt index 95c240e..19462d8 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 tvType = TvType.NSFW + private val globalTvType = TvType.Movie data class ResponseMovieDetails( @JsonProperty("name") val name: String?, @@ -55,7 +55,7 @@ class JavSubProvider : MainAPI() { name = name, url = link, apiName = this.name, - type = tvType, + type = globalTvType, posterUrl = image, year = year ) @@ -96,7 +96,7 @@ class JavSubProvider : MainAPI() { name = title, url = link, apiName = this.name, - type = tvType, + type = globalTvType, posterUrl = image, year = year ) @@ -158,7 +158,7 @@ class JavSubProvider : MainAPI() { name = title, url = url, apiName = this.name, - type = tvType, + type = globalTvType, dataUrl = playerIframes.toJson(), posterUrl = poster, year = year, diff --git a/XvideosProvider/build.gradle.kts b/XvideosProvider/build.gradle.kts index 5f51fd0..836c1dc 100644 --- a/XvideosProvider/build.gradle.kts +++ b/XvideosProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { diff --git a/XvideosProvider/src/main/AndroidManifest.xml b/XvideosProvider/src/main/AndroidManifest.xml index 1863f02..29aec9d 100644 --- a/XvideosProvider/src/main/AndroidManifest.xml +++ b/XvideosProvider/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt b/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt index 663fdc6..acfd395 100644 --- a/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt +++ b/XvideosProvider/src/main/kotlin/com/jacekun/XvideosProvider.kt @@ -6,13 +6,13 @@ import com.lagradost.cloudstream3.utils.* class XvideosProvider : MainAPI() { - private val globalTvType = TvType.NSFW + private val globalTvType = TvType.Movie override var mainUrl = "https://www.xvideos.com" override var name = "Xvideos" override val hasMainPage = true override val hasChromecastSupport = true override val hasDownloadSupport = true - override val supportedTypes = setOf(globalTvType) + override val supportedTypes = setOf(TvType.NSFW) override val mainPage = mainPageOf( Pair(mainUrl, "Main Page"), @@ -81,7 +81,7 @@ class XvideosProvider : MainAPI() { }.toList() } - override suspend fun load(url: String): LoadResponse? { + override suspend fun load(url: String): LoadResponse { val soup = app.get(url).document val title = if (url.contains("channels")||url.contains("pornstars")) soup.selectFirst("html.xv-responsive.is-desktop head title")?.text() else soup.selectFirst(".page-title")?.text() @@ -106,7 +106,7 @@ class XvideosProvider : MainAPI() { name = title ?: "", url = url, apiName = this.name, - type = globalTvType, + type = tvType, episodes = episodes, posterUrl = poster, plot = title, @@ -114,7 +114,7 @@ class XvideosProvider : MainAPI() { tags = tags, ) } - TvType.NSFW -> { + else -> { MovieLoadResponse( name = title ?: "", url = url, @@ -126,7 +126,6 @@ class XvideosProvider : MainAPI() { tags = tags, ) } - else -> null } } override suspend fun loadLinks(