Merge branch 'recloudstream:master' into AddLogoImage

phisher98 · web-flow · commit 1bb36c7ba8b5 · 2026-01-07T12:51:34.000+05:30
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -353,6 +353,7 @@ object CommonActivity {
 
                 "Dracula" -> R.style.DraculaMode
                 "Lavender" -> R.style.LavenderMode
+                "SilentBlue" -> R.style.SilentBlueMode
 
                 else -> R.style.AppTheme
             }
diff --git a/app/src/main/res/values-b+es/array.xml b/app/src/main/res/values-b+es/array.xml
@@ -233,6 +233,7 @@
         <item>Material You</item>
         <item>Dracula</item>
         <item>Sueños De Lavanda</item>
+        <item>Azul Silencioso</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -243,6 +244,7 @@
         <item>Monet</item>
         <item>Dracula</item>
         <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values-b+pl/array.xml b/app/src/main/res/values-b+pl/array.xml
@@ -242,6 +242,7 @@
         <item>Material You</item>
         <item>Dracula</item>
         <item>Lawendowe Marzenia</item>
+        <item>Cichy Błękit</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -252,6 +253,7 @@
         <item>Monet</item>
         <item>Dracula</item>
         <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values-b+tr/array.xml b/app/src/main/res/values-b+tr/array.xml
@@ -254,6 +254,7 @@
         <item>Material You</item>
         <item>Dracula</item>
         <item>Lavanta Rüyası</item>
+        <item>Sessiz Mavi</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -264,6 +265,7 @@
         <item>Monet</item>
         <item>Dracula</item>
         <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <string-array name="extension_statuses">
diff --git a/app/src/main/res/values-b+vi/array.xml b/app/src/main/res/values-b+vi/array.xml
@@ -234,6 +234,7 @@
         <item>Material You</item>
         <item>Dracula</item>
         <item>Giấc Mơ Oải Hương</item>
+        <item>Xanh Lam Tĩnh Lặng</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -244,6 +245,7 @@
         <item>Monet</item>
         <item>Dracula</item>
         <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <!--https://github.com/videolan/vlc-android/blob/72ccfb93db027b49855760001d1a930fa657c5a8/application/resources/src/main/res/values/arrays.xml#L266-->
diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml
@@ -315,6 +315,7 @@
         <item>Material You</item>
         <item>Dracula</item>
         <item>Lavender Dreams</item>
+        <item>Silent Blue</item>
     </string-array>
     <string-array name="themes_names_values">
         <item>AmoledLight</item>
@@ -325,6 +326,7 @@
         <item>Monet</item>
         <item>Dracula</item>
         <item>Lavender</item>
+        <item>SilentBlue</item>
     </string-array>
 
     <string-array name="extension_statuses">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -84,6 +84,15 @@
     <color name="LavenderGrayTextColor">#9ab3ff</color>
     <color name="LavenderIconColor">#7c3aed</color>
 
+    <!--Silent Blue Theme-->
+    <color name="SilentBluePrimaryGrayBackground">#282f49</color>
+    <color name="SilentBlueBitDarkerGrayBackground">#151a30</color>
+    <color name="SilentBlueGrayBackground">#3A446A</color>
+    <color name="SilentBlueItemBackground">#3A446A</color>
+    <color name="SilentBlueTextColor">#E0E1F3</color>
+    <color name="SilentBlueGrayTextColor">#7B83B0</color>
+    <color name="SilentBlueIconColor">#7B83B0</color>
+
     <!--Other Colors -->
     <color name="colorPrimaryBlue">#5664B7</color>
     <color name="colorPrimaryRed">#D50000</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -102,6 +102,7 @@
         <item name="android:fontFamily">@font/google_sans</item>
         <item name="android:tag">@string/tv_no_focus_tag</item>
         <item name="chipMinTouchTargetSize">0dp</item>
+        <item name="checkedIconVisible">false</item>
     </style>
 
     <style name="RoundProgressbar">
@@ -192,6 +193,19 @@
         <item name="colorOnPrimary">@color/DraculaTextColor</item>
     </style>
 
+
+    <style name="SilentBlueMode">
+        <item name="primaryGrayBackground">@color/SilentBluePrimaryGrayBackground</item>
+        <item name="primaryBlackBackground">@color/SilentBlueBitDarkerGrayBackground</item>
+        <item name="iconGrayBackground">@color/SilentBlueGrayBackground</item>
+        <item name="boxItemBackground">@color/SilentBlueItemBackground</item>
+        <item name="textColor">@color/SilentBlueTextColor</item>
+        <item name="iconColor">@color/SilentBlueIconColor</item>
+        <item name="white">@color/SilentBlueTextColor</item>
+        <item name="black">@color/SilentBluePrimaryGrayBackground</item>
+        <item name="colorOnPrimary">@color/SilentBlueTextColor</item>
+    </style>
+
     <style name="LavenderMode">
         <item name="primaryGrayBackground">@color/LavenderPrimaryGrayBackground</item>
         <item name="primaryBlackBackground">@color/LavenderBitDarkerGrayBackground</item>
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt
@@ -4,9 +4,12 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
-import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
+
+class Vidnest : AsianLoad() {
+    override var name = "Vidnest"
+    override var mainUrl = "https://vidnest.io"
+}
 
 open class AsianLoad : ExtractorApi() {
     override var name = "AsianLoad"
@@ -20,7 +23,7 @@ open class AsianLoad : ExtractorApi() {
             sourceRegex.findAll(this.text).forEach { sourceMatch ->
                 val extractedUrl = sourceMatch.groupValues[1]
                 // Trusting this isn't mp4, may fuck up stuff
-                if (URI(extractedUrl).path.endsWith(".m3u8")) {
+                if (extractedUrl.contains(".m3u8")) {
                     M3u8Helper.generateM3u8(
                         name,
                         extractedUrl,
@@ -29,15 +32,14 @@ open class AsianLoad : ExtractorApi() {
                     ).forEach { link ->
                         extractedLinksList.add(link)
                     }
-                } else if (extractedUrl.endsWith(".mp4")) {
+                } else if (extractedUrl.contains(".mp4")) {
                     extractedLinksList.add(
                         newExtractorLink(
                             source = name,
                             name = name,
                             url = extractedUrl,
                         ) {
                             this.referer = url.replace(" ", "%20")
-                            this.quality = getQualityFromName(sourceMatch.groupValues[2])
                         }
                     )
                 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
@@ -21,6 +21,18 @@ class Bysezejataos  : ByseSX() {
     override var mainUrl = "https://bysezejataos.com"
 }
 
+@Prerelease
+class ByseBuho : ByseSX() {
+    override var name = "ByseBuho"
+    override var mainUrl = "https://bysebuho.com"
+}
+
+@Prerelease
+class ByseVepoin : ByseSX() {
+    override var name = "ByseVepoin"
+    override var mainUrl = "https://bysevepoin.com"
+}
+
 @Prerelease
 open class ByseSX : ExtractorApi() {
     override var name = "Byse"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -73,6 +73,10 @@ class Ds2video : DoodLaExtractor() {
     override var mainUrl = "https://ds2video.com"
 }
 
+class MyVidPlay : DoodLaExtractor() {
+    override var mainUrl = "https://myvidplay.com"
+}
+
 open class DoodLaExtractor : ExtractorApi() {
     override var name = "DoodStream"
     override var mainUrl = "https://dood.la"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt
@@ -0,0 +1,54 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getQualityFromName
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+open class GUpload: ExtractorApi() {
+    override val name: String = "GUpload"
+    override val mainUrl: String = "https://gupload.xyz"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, referer = referer).text
+
+        val playerConfigEncoded = response.substringAfter("decodePayload('").substringBefore("');")
+        val playerConfigString = base64Decode(playerConfigEncoded).substringAfter("|")
+
+        val playerConfig = AppUtils.parseJson<VideoInfo>(playerConfigString)
+
+        callback.invoke(
+            newExtractorLink(
+                source = name,
+                name = name,
+                url = playerConfig.videoUrl.replace("\\", ""),
+            ) {
+                Regex("/(\\d+p)\\.").find(playerConfig.videoUrl)?.groupValues?.get(1)?.let {
+                    quality = getQualityFromName(it)
+                }
+            }
+        )
+    }
+
+    private data class VideoInfo(
+        @JsonProperty("videoUrl") val videoUrl: String,
+        @JsonProperty("posterUrl") val posterUrl: String? = null,
+        @JsonProperty("videoId") val videoId: String? = null,
+        @JsonProperty("primaryColor") val primaryColor: String? = null,
+        @JsonProperty("audioTracks") val audioTracks: List<Any?> = emptyList(),
+        @JsonProperty("subtitleTracks") val subtitleTracks: List<Any?> = emptyList(),
+        @JsonProperty("vastFallbackList") val vastFallbackList: List<String> = emptyList(),
+        @JsonProperty("videoOwnerId") val videoOwnerId: Long = 0,
+    )
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt
@@ -0,0 +1,43 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+
+open class StreamEmbed : ExtractorApi() {
+    override var name = "StreamEmbed"
+    override var mainUrl = "https://watch.gxplayer.xyz"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val jsonString = app.get(url, referer = mainUrl).text
+            .substringAfter("var video = ").substringBefore(";")
+        val video = parseJson<Details>(jsonString)
+
+        M3u8Helper.generateM3u8(
+            this.name,
+            "$mainUrl/m3u8/${video.uid}/${video.md5}/master.txt?s=1&id=${video.id}&cache=${video.status}",
+            referer = "$mainUrl/",
+        ).forEach(callback)
+    }
+
+    private data class Details(
+        @JsonProperty("id") val id: String,
+        @JsonProperty("uid") val uid: String,
+        @JsonProperty("slug") val slug: String,
+        @JsonProperty("title") val title: String,
+        @JsonProperty("quality") val quality: String,
+        @JsonProperty("type") val type: String,
+        @JsonProperty("status") val status: String,
+        @JsonProperty("md5") val md5: String,
+    )
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt
@@ -0,0 +1,60 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.JsUnpacker
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.fixUrl
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.coroutines.delay
+
+class Up4FunTop : Up4Stream() {
+    override var mainUrl: String = "https://up4fun.top"
+}
+
+open class Up4Stream : ExtractorApi() {
+    override var name = "Up4Stream"
+    override var mainUrl = "https://up4stream.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+        val movieId = url.substringAfterLast("/").substringBefore(".html")
+
+        // redirect from "wait 5 seconds" page to actual movie page
+        val redirectResponse = app.get(url, cookies = mapOf("id" to movieId))
+        val redirectForm = redirectResponse.document.selectFirst("form[method=POST]") ?: return null
+        val redirectUrl = fixUrl(redirectForm.attr("action"))
+        val redirectParams = redirectForm.select("input[type=hidden]").associate { input ->
+            input.attr("name") to input.attr("value")
+        }
+
+        // wait for 5 seconds, otherwise the below md5 hash is invalid
+        delay(5000)
+        val response = app.post(redirectUrl, data = redirectParams).document
+
+        // starting here, this works similar to many other extractors like StreamWish
+        val extractedpack =
+            response.selectFirst("script:containsData(function(p,a,c,k,e,d))")?.data()
+        if (extractedpack == null) {
+            Log.e("up4stream", "file not ready: delay too short")
+        }
+
+        JsUnpacker(extractedpack).unpack()?.let { unPacked ->
+            Regex("sources:\\[\\{file:\"(.*?)\"").find(unPacked)?.groupValues?.get(1)?.let { link ->
+                return listOf(
+                    newExtractorLink(
+                        this.name,
+                        this.name,
+                        link,
+                    ) {
+                        this.referer = referer.orEmpty()
+                        this.quality = Qualities.Unknown.value
+                    }
+                )
+            }
+        }
+        return null
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@ object CommonActivity {`
`353`	`353`
`354`	`354`	`"Dracula" -> R.style.DraculaMode`
`355`	`355`	`"Lavender" -> R.style.LavenderMode`
	`356`	`+ "SilentBlue" -> R.style.SilentBlueMode`
`356`	`357`
`357`	`358`	`else -> R.style.AppTheme`
`358`	`359`	`}`