diff --git a/JavFreeProvider/build.gradle.kts b/JavFreeProvider/build.gradle.kts index efafd53..c1759e9 100644 --- a/JavFreeProvider/build.gradle.kts +++ b/JavFreeProvider/build.gradle.kts @@ -21,4 +21,6 @@ cloudstream { // You can find a list of avaliable types here: // https://recloudstream.github.io/cloudstream/html/app/com.lagradost.cloudstream3/-tv-type/index.html tvTypes = listOf("NSFW") + + iconUrl = "https://www.google.com/s2/favicons?domain=javfree.sh&sz=%size%" } diff --git a/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt b/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt index c4195d5..76c7497 100644 --- a/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt +++ b/JavFreeProvider/src/main/kotlin/com/jacekun/JavFreeProvider.kt @@ -27,7 +27,9 @@ class JavFreeProvider : MainAPI() { @JsonProperty("active") val active: Int? ) - fun String.cleanText() : String = this.trim().removePrefix("Watch JAV Free").removeSuffix("HD Free Online on JAVFree.SH").trim() + fun String.cleanText() : String = this.trim().removePrefix("Watch JAV Free") + .removeSuffix("HD Free Online on JAVFree.SH").trim() + .removePrefix("Watch JAV").trim() override suspend fun getMainPage( page: Int, @@ -149,7 +151,6 @@ class JavFreeProvider : MainAPI() { callback: (ExtractorLink) -> Unit ): Boolean { - var success = false try { // GET request to: https://player.javfree.sh/stream/687234424271726c val id = data.substring(data.indexOf("#")).substring(1) diff --git a/JavSubProvider/build.gradle.kts b/JavSubProvider/build.gradle.kts index d815975..4a87390 100644 --- a/JavSubProvider/build.gradle.kts +++ b/JavSubProvider/build.gradle.kts @@ -21,4 +21,6 @@ cloudstream { // You can find a list of avaliable types here: // https://recloudstream.github.io/cloudstream/html/app/com.lagradost.cloudstream3/-tv-type/index.html tvTypes = listOf("NSFW") + + iconUrl = "https://www.google.com/s2/favicons?domain=javsub.co&sz=%size%" } diff --git a/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt b/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt index 40d536e..7ecf566 100644 --- a/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt +++ b/JavSubProvider/src/main/kotlin/com/jacekun/JavSubProvider.kt @@ -3,7 +3,6 @@ package com.jacekun import android.util.Log import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.extractors.FEmbed import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import com.lagradost.cloudstream3.utils.ExtractorLink @@ -211,11 +210,12 @@ class JavSubProvider : MainAPI() { private suspend fun extractStreamLink( link: String, subtitleCallback: (SubtitleFile) -> Unit, - callback: (ExtractorLink) -> Unit) - : Boolean { + callback: (ExtractorLink) -> Unit) : Boolean { + if (link.isNotBlank()) { when { link.contains("watch-jav") -> { + /* //TODO: Add extractor val extractor = FEmbed() extractor.domainUrl = "embedsito.com" extractor.getSafeUrl( @@ -225,6 +225,8 @@ class JavSubProvider : MainAPI() { callback = callback ) return true + */ + return false } else -> { return loadExtractor( diff --git a/XvideosProvider/build.gradle.kts b/XvideosProvider/build.gradle.kts index fdb3c6c..5f51fd0 100644 --- a/XvideosProvider/build.gradle.kts +++ b/XvideosProvider/build.gradle.kts @@ -21,4 +21,6 @@ cloudstream { // You can find a list of avaliable types here: // https://recloudstream.github.io/cloudstream/html/app/com.lagradost.cloudstream3/-tv-type/index.html tvTypes = listOf("NSFW") + + iconUrl = "https://www.google.com/s2/favicons?domain=xvideos.com&sz=%size%" } diff --git a/cs3/JavFreeProvider.cs3 b/cs3/JavFreeProvider.cs3 index d241107..8168ea0 100644 Binary files a/cs3/JavFreeProvider.cs3 and b/cs3/JavFreeProvider.cs3 differ diff --git a/cs3/JavSubProvider.cs3 b/cs3/JavSubProvider.cs3 new file mode 100644 index 0000000..8abb20a Binary files /dev/null and b/cs3/JavSubProvider.cs3 differ diff --git a/cs3/plugins.json b/cs3/plugins.json index a42e139..6e20291 100644 --- a/cs3/plugins.json +++ b/cs3/plugins.json @@ -1,7 +1,9 @@ [ { + "iconUrl": "https://www.google.com/s2/favicons?domain=javfree.sh&sz=%size%", "apiVersion": 1, "repositoryUrl": "https://github.com/Jacekun/cs3xxx-repo", + "fileSize": 11551, "status": 1, "authors": [ "Jace" @@ -16,8 +18,10 @@ "name": "JavFreeProvider" }, { + "iconUrl": "https://www.google.com/s2/favicons?domain=javsub.co&sz=%size%", "apiVersion": 1, "repositoryUrl": "https://github.com/Jacekun/cs3xxx-repo", + "fileSize": 13987, "status": 1, "authors": [ "Jace" @@ -32,8 +36,10 @@ "name": "JavSubProvider" }, { + "iconUrl": "https://www.google.com/s2/favicons?domain=xvideos.com&sz=%size%", "apiVersion": 1, "repositoryUrl": "https://github.com/Jacekun/cs3xxx-repo", + "fileSize": 11939, "status": 1, "authors": [ "Jace" diff --git a/cs3/repo.json b/cs3/repo.json new file mode 100644 index 0000000..71838cc --- /dev/null +++ b/cs3/repo.json @@ -0,0 +1,8 @@ +{ + "name": "NSFW Providers", + "description": "For the coomers and degenerates", + "manifestVersion": 1, + "pluginLists": [ + "https://raw.githubusercontent.com/Jacekun/cs3xxx-repo/dev/cs3/plugins.json" + ] +} \ No newline at end of file