more robust date parsing (#3068)

Co-authored-by: Aishik Mukherjee <aishikm2002@gmail.com>
Co-authored-by: Kie Takaba <takabakie@gmail.com>
Co-authored-by: Man <thebroker2308@gmail.com>
Co-authored-by: Nori Masomi (Mystical) <mysticalkeyall@users.noreply.hosted.weblate.org>
Co-authored-by: Saleh ALHarbi <alfraidigamerofficial@gmail.com>
Co-authored-by: caviaz <sverrebesteman@gmail.com>
Co-authored-by: gabix <gabi1xperson@gmail.com>
Co-authored-by: hou1234 <gjqmgjsl3@gmail.com>
Co-authored-by: trodiz <neptune32@protonmail.com>
Co-authored-by: ℂ𝕠𝕠𝕠𝕝 (𝕘𝕚𝕥𝕙𝕦𝕓.𝕔𝕠𝕞/ℂ𝕠𝕠𝕠𝕝) <coool@mail.lv>

.github/workflows/pull_request.yml

@@ -26,6 +26,11 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
         cache-read-only: false
 
+    - name: Ensure binary compatibility
+      # This is to ensure that your code is backwards compatible.
+      # If this fails you need to add a @Prerelease annotation to new code.
+      run: ./gradlew library:checkKotlinAbi
+
     - name: Run Gradle
       run: ./gradlew assemblePrereleaseDebug lint check
 

COMPOSE.md

@@ -0,0 +1,21 @@
+# Migration guide to Compose
+
+### 1. MVI instead of MVVM 
+
+The current design of CloudStream loosely uses the MVVM architecture.
+
+This means that the UI invokes the viewmodel with function calls, and it responds with LiveData fields that are observed. While this has worked, it generates a lot of boilerplate and has created some friction.
+
+To make it easier to work with Compose, the new architecture will be based on MVI. In short this means that the viewmodel exposes a singular immutable class that is observed, and receives all UI events with a singular event that is a sealed class. All the UI should be able to be recreated based on this singular state class, and all interactions should be able to be replayed using only the event callback.
+
+For a more detailed overview, see: https://www.youtube.com/watch?v=b2z1jvD4VMQ
+
+This is part of the effort to make CloudStream cross platform, as it allows us to decouple UI and logic.
+
+### 2. KMP-compatible libraries
+
+We plan to leverage Kotlin's KMP project to compile our code to different architectures. However, this requires us to only use KMP-compatible libraries, no Java. Therefore any pull requests must ensure that they use KMP-compatible libraries only.
+
+### 3. UI Changes
+
+While migrating to the new compose UI, you also have the opportunity to change the UI. However, this should only be to freshen up the UI, not completely redesign it. It is also important to stress that this process should not lose any features of the old UI, and be very conservative with adding new features.

app/build.gradle.kts

@@ -323,11 +323,9 @@ tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
         jvmDefault.set(JvmDefaultMode.ENABLE)
-        freeCompilerArgs.add("-Xannotation-default-target=param-property")
         optIn.addAll(
             "com.lagradost.cloudstream3.InternalAPI",
             "com.lagradost.cloudstream3.Prerelease",
-            "kotlin.uuid.ExperimentalUuidApi",
         )
     }
 }

app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt

@@ -1,157 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import android.net.Uri
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = NonEmptyData.Serializer::class)
-data class NonEmptyData(
-    val title: String = "",
-    val tags: List<String> = emptyList(),
-    val meta: Map<String, String> = emptyMap(),
-    val name: String = "hello",
-) {
-    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = WriteOnlyData.Serializer::class)
-data class WriteOnlyData(
-    val fieldA: String = "",
-    val fieldB: String = "",
-) {
-    object Serializer : WriteOnlySerializer<WriteOnlyData>(
-        WriteOnlyData.generatedSerializer(),
-        setOf("fieldB"),
-    )
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = MultiWriteOnly.Serializer::class)
-data class MultiWriteOnly(
-    val fieldA: String = "",
-    val fieldB: String = "",
-    val fieldC: String = "",
-) {
-    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
-        MultiWriteOnly.generatedSerializer(),
-        setOf("fieldB", "fieldC"),
-    )
-}
-
-@Serializable
-data class UriData(
-    @Serializable(with = UriSerializer::class)
-    val uri: Uri = Uri.EMPTY,
-)
-
-class SerializerTest {
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyStrings() {
-        val data = NonEmptyData(title = "", name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("title"))
-        assertTrue(result.contains("name"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyLists() {
-        val data = NonEmptyData(tags = emptyList(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("tags"))
-    }
-
-    @Test
-    fun nonEmptySerializerOmitsEmptyMaps() {
-        val data = NonEmptyData(meta = emptyMap(), name = "hello")
-        val result = data.toJson()
-        assertFalse(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerKeepsNonEmptyFields() {
-        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
-        val result = data.toJson()
-        assertTrue(result.contains("title"))
-        assertTrue(result.contains("tags"))
-        assertTrue(result.contains("meta"))
-    }
-
-    @Test
-    fun nonEmptySerializerDoesNotAffectDeserialization() {
-        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
-        val result = parseJson<NonEmptyData>(input)
-        assertEquals("hello", result.title)
-        assertEquals(listOf("a"), result.tags)
-        assertEquals(mapOf("k" to "v"), result.meta)
-        assertEquals("world", result.name)
-    }
-
-    @Test
-    fun writeOnlySerializerOmitsFieldOnSerialize() {
-        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesNormally() {
-        val input = """{"fieldA":"hello","fieldB":"secret"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("secret", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerDeserializesMissingAsDefault() {
-        val input = """{"fieldA":"hello"}"""
-        val result = parseJson<WriteOnlyData>(input)
-        assertEquals("hello", result.fieldA)
-        assertEquals("", result.fieldB)
-    }
-
-    @Test
-    fun writeOnlySerializerHandlesMultipleKeys() {
-        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
-        val result = data.toJson()
-        assertTrue(result.contains("fieldA"))
-        assertFalse(result.contains("fieldB"))
-        assertFalse(result.contains("fieldC"))
-    }
-
-    @Test
-    fun uriSerializerSerializesUriToString() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val result = data.toJson()
-        assertTrue(result.contains("https://example.com/path?query=1"))
-    }
-
-    @Test
-    fun uriSerializerDeserializesStringToUri() {
-        val input = """{"uri":"https://example.com/path?query=1"}"""
-        val result = parseJson<UriData>(input)
-        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
-    }
-
-    @Test
-    fun uriSerializerRoundtripsCorrectly() {
-        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
-        val encoded = data.toJson()
-        val decoded = parseJson<UriData>(encoded)
-        assertEquals(data.uri, decoded.uri)
-    }
-}

app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/UriSerializerTest.kt

@@ -0,0 +1,41 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import android.net.Uri
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+@Serializable
+data class UriData(
+    @Serializable(with = UriSerializer::class)
+    @SerialName("uri") val uri: Uri = Uri.EMPTY,
+)
+
+class UriSerializerTest {
+
+    @Test
+    fun uriSerializerSerializesUriToString() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val result = data.toJson()
+        assertTrue(result.contains("https://example.com/path?query=1"))
+    }
+
+    @Test
+    fun uriSerializerDeserializesStringToUri() {
+        val input = """{"uri":"https://example.com/path?query=1"}"""
+        val result = parseJson<UriData>(input)
+        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
+    }
+
+    @Test
+    fun uriSerializerRoundtripsCorrectly() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val encoded = data.toJson()
+        val decoded = parseJson<UriData>(encoded)
+        assertEquals(data.uri, decoded.uri)
+    }
+}

app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt

@@ -113,7 +113,7 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
             get() = _context?.get()
             private set(value) {
                 _context = WeakReference(value)
-                setContext(WeakReference(value))
+                setContext(value)
             }
 
         fun <T : Any> getKeyClass(path: String, valueType: Class<T>): T? {

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -171,6 +171,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
+import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
@@ -1214,7 +1215,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting?
         safe {
             val appVer = BuildConfig.VERSION_NAME
-            val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: ""
+            val lastAppAutoBackup: String = getKey<String>("VERSION_NAME") ?: ""
             if (appVer != lastAppAutoBackup) {
                 setKey("VERSION_NAME", BuildConfig.VERSION_NAME)
                 if (lastAppAutoBackup.isEmpty()) return@safe
@@ -1428,8 +1429,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
                     else -> {
                         resultviewPreviewBookmark.isEnabled = false
-                        resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
+                        resultviewPreviewBookmark.showProgress()
-                        resultviewPreviewBookmark.setText(R.string.loading)
+                        //resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24)
+                        //resultviewPreviewBookmark.setText(R.string.loading)
                     }
                 }
             }
@@ -2016,7 +2018,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
 
         try {
-            if (getKey(HAS_DONE_SETUP_KEY, false) != true) {
+            if (getKey<Boolean>(HAS_DONE_SETUP_KEY, false) != true) {
                 navController.navigate(R.id.navigation_setup_language)
                 // If no plugins bring up extensions screen
             } else if (PluginManager.getPluginsOnline().isEmpty()

app/src/main/java/com/lagradost/cloudstream3/actions/temp/VlcPackage.kt

@@ -60,7 +60,7 @@ open class VlcPackage: OpenInAppAction(
         intent.putExtra("secure_uri", true)
         intent.putExtra("title", video.name)
 
-        val subsLang = getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+        val subsLang = getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         result.subs.firstOrNull {
             subsLang == it.languageCode
         }?.let {

app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt

@@ -22,7 +22,6 @@ fun Requests.initClient(context: Context) {
 }
 
 /** Only use ignoreSSL if you know what you are doing*/
-@Prerelease
 fun Requests.initClient(context: Context, ignoreSSL: Boolean = false) {
     this.baseClient = buildDefaultClient(context, ignoreSSL)
 }
@@ -34,7 +33,6 @@ fun buildDefaultClient(context: Context): OkHttpClient {
 }
 
 /** Only use ignoreSSL if you know what you are doing*/
-@Prerelease
 fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClient {
     safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     

app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt

@@ -176,11 +176,11 @@ object PluginManager {
 
 
     fun getPluginsOnline(): Array<PluginData> {
-        return getKey(PLUGINS_KEY) ?: emptyArray()
+        return getKey<Array<PluginData>>(PLUGINS_KEY) ?: emptyArray()
     }
 
     fun getPluginsLocal(): Array<PluginData> {
-        return getKey(PLUGINS_KEY_LOCAL) ?: emptyArray()
+        return getKey<Array<PluginData>>(PLUGINS_KEY_LOCAL) ?: emptyArray()
     }
 
     private val CLOUD_STREAM_FOLDER =
@@ -512,6 +512,9 @@ object PluginManager {
             val res = dir.mkdirs()
             if (!res) {
                 Log.w(TAG, "Failed to create local directories")
+                // We have tried to load local plugins, but exit early.
+                // This needs to be true to prevent the downloader waiting for plugins.
+                loadedLocalPlugins = true
                 return
             }
         }

app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt

@@ -98,7 +98,7 @@ data class PluginWrapper(
 object RepositoryManager {
     const val ONLINE_PLUGINS_FOLDER = "Extensions"
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
-        getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
+        getKey<Array<RepositoryData>>("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
     private val GH_REGEX =
         Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
@@ -141,12 +141,20 @@ object RepositoryManager {
             }
         } else if (fixedUrl.matches("^[a-zA-Z0-9!_-]+$".toRegex())) {
             safeAsync {
+                if (fixedUrl.startsWith("!")) {
+                    val response = app.get("https://py.md/${fixedUrl.removePrefix("!")}", allowRedirects = false)
+                    val url = response.headers["Location"] ?: return@safeAsync null
+                    if (url.startsWith("https://py.md/404")) return@safeAsync null
+                    if (url.removeSuffix("/") == "https://py.md") return@safeAsync null
+                    return@safeAsync url
+                } else {
                     val response = app.get("https://cutt.ly/${fixedUrl}", allowRedirects = false)
                     val url = response.headers["Location"] ?: return@safeAsync null
                     if (url.startsWith("https://cutt.ly/404")) return@safeAsync null
                     if (url.removeSuffix("/") == "https://cutt.ly") return@safeAsync null
                     return@safeAsync url
                 }
+            }
         } else null
     }
 
@@ -232,7 +240,7 @@ object RepositoryManager {
     }
 
     fun getRepositories(): Array<RepositoryData> {
-        return getKey(REPOSITORIES_KEY) ?: emptyArray()
+        return getKey<Array<RepositoryData>>(REPOSITORIES_KEY) ?: emptyArray()
     }
 
     // Don't want to read before we write in another thread

app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt

@@ -70,7 +70,8 @@ abstract class AccountManager {
             SubtitleRepo(openSubtitlesApi),
             SubtitleRepo(addic7ed),
             SubtitleRepo(subDlApi),
-            PlainAuthRepo(animeSkipApi)
+            PlainAuthRepo(animeSkipApi),
+            SubtitleRepo(subSourceApi)
         )
 
         fun updateAccountIds() {
@@ -120,7 +121,8 @@ abstract class AccountManager {
         val subtitleProviders = arrayOf(
             SubtitleRepo(openSubtitlesApi),
             SubtitleRepo(addic7ed),
-            SubtitleRepo(subDlApi)
+            SubtitleRepo(subDlApi),
+            SubtitleRepo(subSourceApi)
         )
         val syncApis = arrayOf(
             SyncRepo(malApi),

app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt

@@ -6,13 +6,12 @@ import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.base64Encode
+import com.lagradost.cloudstream3.splitUrlParameters
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
-import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonNames
-import java.net.URI
 import java.security.SecureRandom
 
 data class AuthLoginPage(
@@ -172,10 +171,8 @@ abstract class AuthAPI {
             get() = unixTimeMS
 
         fun splitRedirectUrl(redirectUrl: String): Map<String, String> {
-            return splitQuery(
+            return splitUrlParameters(
-                URI(
                 redirectUrl.replace(APP_STRING, "https").replace("/#", "?")
-                ).toURL()
             )
         }
 

app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt

@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.syncproviders
 
 import androidx.annotation.WorkerThread
 import com.lagradost.cloudstream3.APIHolder.unixTime
-import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
@@ -14,7 +13,8 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
         data class SavedSearchResponse(
             val unixTime: Long,
             val response: List<SubtitleEntity>,
-            val query: SubtitleSearch
+            val query: SubtitleSearch,
+            val idPrefix: String,
         )
 
         data class SavedResourceResponse(
@@ -66,7 +66,7 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
                 var found: List<SubtitleEntity>? = null
                 for (item in searchCache) {
                     // 120 min save
-                    if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
+                    if (item.idPrefix == idPrefix && item.query == query && (unixTime - item.unixTime) < 60 * 120) {
                         found = item.response
                         break
                     }
@@ -79,7 +79,7 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
 
             // only cache valid return values
             if (returnValue.isNotEmpty()) {
-                val add = SavedSearchResponse(unixTime, returnValue, query)
+                val add = SavedSearchResponse(unixTime, returnValue, query, idPrefix)
                 searchCache.withLock {
                     if (searchCache.size > CACHE_SIZE) {
                         searchCache[searchCacheIndex] = add // rolling cache

app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt

@@ -7,11 +7,10 @@ import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
 import com.lagradost.cloudstream3.syncproviders.AuthData
 import com.lagradost.cloudstream3.syncproviders.SubtitleAPI
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import java.util.concurrent.TimeUnit
 
 class SubSourceApi : SubtitleAPI() {
     override val name = "SubSource"
@@ -20,77 +19,70 @@ class SubSourceApi : SubtitleAPI() {
     override val requiresLogin = false
 
     companion object {
-        const val APIURL = "https://api.subsource.net/api"
+        const val APIURL = "https://api.subsource.net/v1"
-        const val DOWNLOADENDPOINT = "https://api.subsource.net/api/downloadSub"
     }
 
     override suspend fun search(
         auth: AuthData?,
         query: AbstractSubtitleEntities.SubtitleSearch
     ): List<AbstractSubtitleEntities.SubtitleEntity>? {
-
         //Only supports Imdb Id search for now
         if (query.imdbId == null) return null
         val queryLang = SubtitleHelper.fromTagToEnglishLanguageName(query.lang)
         val type = if ((query.seasonNumber ?: 0) > 0) TvType.TvSeries else TvType.Movie
 
-        val searchRes = app.post(
+        val searchResponse = app.post(
-            url = "$APIURL/searchMovie",
+            url = "$APIURL/movie/search",
-            data = mapOf(
+            json = mapOf(
-                "query" to query.imdbId!!
+                "includeSeasons" to false,
-            )
+                "limit" to 15,
-        ).parsedSafe<ApiSearch>() ?: return null
+                "query" to query.imdbId!!,
+                "signal" to "{}"
+            ),
+            cacheTime = 120,
+            cacheUnit = TimeUnit.MINUTES,
+        ).parsedSafe<SearchRoot>() ?: return null
 
-        val postData = if (type == TvType.TvSeries) {
+        val firstResult = searchResponse.results.firstOrNull() ?: return null
-            mapOf(
+
-                "langs" to "[]",
+        val apiResponse = app.get(
-                "movieName" to searchRes.found.first().linkName,
+            url = "$APIURL${firstResult.link.replace("series", "subtitles")}",
-                "season" to "season-${query.seasonNumber}"
+            cacheTime = 120,
-            )
+            cacheUnit = TimeUnit.MINUTES,
-        } else {
+        ).parsedSafe<ItemRoot>() ?: return null
-            mapOf(
+
-                "langs" to "[]",
+        val filteredSubtitles = apiResponse.subtitles.filter { sub ->
-                "movieName" to searchRes.found.first().linkName,
+            sub.releaseType != "trailer" &&
-            )
+                    sub.language.equals(queryLang, true)
         }
 
-        val getMovieRes = app.post(
-            url = "$APIURL/getMovie",
-            data = postData
-        ).parsedSafe<ApiResponse>().let {
         // api doesn't has episode number or lang filtering
-            if (type == TvType.Movie) {
+        val subtitles = if (type == TvType.Movie) {
-                it?.subs?.filter { sub ->
+            filteredSubtitles
-                    sub.lang == queryLang
-                }
         } else {
-                it?.subs?.filter { sub ->
+            val shouldContain = String.format(
-                    sub.releaseName!!.contains(
-                        String.format(
                 null,
                 "E%02d",
                 query.epNumber
             )
-                    ) && sub.lang == queryLang
+            filteredSubtitles.filter { sub ->
+                sub.releaseInfo.contains(
+                    shouldContain
+                )
             }
         }
-        } ?: return null
 
-        return getMovieRes.map { subtitle ->
+        return subtitles.map { subtitle ->
             AbstractSubtitleEntities.SubtitleEntity(
                 idPrefix = this.idPrefix,
-                name = subtitle.releaseName!!,
+                name = subtitle.releaseInfo,
-                lang = subtitle.lang!!,
+                lang = subtitle.language,
-                data = SubData(
+                data = subtitle.link,
-                    movie = subtitle.linkName!!,
-                    lang = subtitle.lang,
-                    id = subtitle.subId.toString(),
-                ).toJson(),
                 type = type,
                 source = this.name,
                 epNumber = query.epNumber,
                 seasonNumber = query.seasonNumber,
-                isHearingImpaired = subtitle.hi == 1,
+                isHearingImpaired = subtitle.hearingImpaired == 1,
             )
         }
     }
@@ -99,79 +91,114 @@ class SubSourceApi : SubtitleAPI() {
         auth: AuthData?,
         subtitle: AbstractSubtitleEntities.SubtitleEntity
     ) {
-        val parsedSub = parseJson<SubData>(subtitle.data)
+        val data = app.get("$APIURL/subtitle/${subtitle.data}")
-
+            .parsedSafe<DownloadRoot>()
-        val subRes = app.post(
+            ?: return
-            url = "$APIURL/getSub",
-            data = mapOf(
-                "movie" to parsedSub.movie,
-                "lang" to subtitle.lang,
-                "id" to parsedSub.id
-            )
-        ).parsedSafe<SubTitleLink>() ?: return
 
         this.addZipUrl(
-            "$DOWNLOADENDPOINT/${subRes.sub.downloadToken}"
+            "$APIURL/subtitle/download/${data.subtitle.downloadToken}"
         ) { name, _ ->
             name
         }
     }
 
+
     @Serializable
-    data class ApiSearch(
+    data class SearchRoot(
-        @JsonProperty("success") @SerialName("success") val success: Boolean,
+        @JsonProperty("success") @SerialName("success") var success: Boolean? = null,
-        @JsonProperty("found") @SerialName("found") val found: List<Found>,
+        @JsonProperty("results") @SerialName("results") var results: ArrayList<Results> = arrayListOf(),
+        @JsonProperty("users") @SerialName("users") var users: ArrayList<Users> = arrayListOf()
     )
 
     @Serializable
-    data class Found(
+    data class Users(
-        @JsonProperty("id") @SerialName("id") val id: Long,
+
-        @JsonProperty("title") @SerialName("title") val title: String,
+        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("seasons") @SerialName("seasons") val seasons: Long,
+        @JsonProperty("displayname") @SerialName("displayname") var displayname: String? = null,
-        @JsonProperty("type") @SerialName("type") val type: String,
+        @JsonProperty("avatar") @SerialName("avatar") var avatar: String? = null,
-        @JsonProperty("releaseYear") @SerialName("releaseYear") val releaseYear: Long,
+        @JsonProperty("badges") @SerialName("badges") var badges: ArrayList<String> = arrayListOf()
-        @JsonProperty("linkName") @SerialName("linkName") val linkName: String,
+
     )
 
     @Serializable
-    data class ApiResponse(
+    data class Results(
-        @JsonProperty("success") @SerialName("success") val success: Boolean,
+        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("movie") @SerialName("movie") val movie: Movie,
+        @JsonProperty("title") @SerialName("title") var title: String? = null,
-        @JsonProperty("subs") @SerialName("subs") val subs: List<Sub>,
+        @JsonProperty("type") @SerialName("type") var type: String? = null,
+        @JsonProperty("link") @SerialName("link") var link: String,
+        @JsonProperty("releaseYear") @SerialName("releaseYear") var releaseYear: Int? = null,
+        @JsonProperty("poster") @SerialName("poster") var poster: String? = null,
+        @JsonProperty("subtitleCount") @SerialName("subtitleCount") var subtitleCount: String? = null,
+        @JsonProperty("rating") @SerialName("rating") var rating: Double? = null,
+        @JsonProperty("cast") @SerialName("cast") var cast: ArrayList<String> = arrayListOf(),
+        @JsonProperty("genres") @SerialName("genres") var genres: ArrayList<String> = arrayListOf(),
+        @JsonProperty("score") @SerialName("score") var score: Double? = null
     )
 
     @Serializable
-    data class Movie(
+
-        @JsonProperty("id") @SerialName("id") val id: Long? = null,
+    data class ItemRoot(
-        @JsonProperty("type") @SerialName("type") val type: String? = null,
+
-        @JsonProperty("year") @SerialName("year") val year: Long? = null,
+        // @SerialName("media_type" ) var mediaType : String?              = null,
-        @JsonProperty("fullName") @SerialName("fullName") val fullName: String? = null,
+        @JsonProperty("subtitles") @SerialName("subtitles") var subtitles: ArrayList<Subtitles>,
+        //@SerialName("movie"      ) var movie     : Movie?               = Movie()
+
     )
 
     @Serializable
-    data class Sub(
+    data class Subtitles(
-        @JsonProperty("hi") @SerialName("hi") val hi: Int? = null,
+
-        @JsonProperty("fullLink") @SerialName("fullLink") val fullLink: String? = null,
+        @JsonProperty("id") @SerialName("id") var id: Int? = null,
-        @JsonProperty("linkName") @SerialName("linkName") val linkName: String? = null,
+        @JsonProperty("language") @SerialName("language") var language: String,
-        @JsonProperty("lang") @SerialName("lang") val lang: String? = null,
+        @JsonProperty("release_type") @SerialName("release_type") var releaseType: String? = null,
-        @JsonProperty("releaseName") @SerialName("releaseName") val releaseName: String? = null,
+        @JsonProperty("release_info") @SerialName("release_info") var releaseInfo: String,
-        @JsonProperty("subId") @SerialName("subId") val subId: Long? = null,
+        @JsonProperty("upload_date") @SerialName("upload_date") var uploadDate: String? = null,
+        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Int? = null,
+        @JsonProperty("caption") @SerialName("caption") var caption: String? = null,
+        @JsonProperty("rating") @SerialName("rating") var rating: String? = null,
+        @JsonProperty("uploader_id") @SerialName("uploader_id") var uploaderId: Int? = null,
+        @JsonProperty("uploader_displayname") @SerialName("uploader_displayname") var uploaderDisplayname: String? = null,
+        @JsonProperty("uploader_badges") @SerialName("uploader_badges") var uploaderBadges: ArrayList<String> = arrayListOf(),
+        @JsonProperty("link") @SerialName("link") var link: String,
+        @JsonProperty("production_type") @SerialName("production_type") var productionType: String? = null,
+        @JsonProperty("last_subtitle") @SerialName("last_subtitle") var lastSubtitle: Boolean? = null
+
     )
 
     @Serializable
-    data class SubData(
+    data class DownloadRoot(
-        @JsonProperty("movie") @SerialName("movie") val movie: String,
+        @JsonProperty("subtitle") @SerialName("subtitle") var subtitle: Subtitle,
-        @JsonProperty("lang") @SerialName("lang") val lang: String,
+        //@SerializedName("movie"         ) var movie         : Movie?         = Movie(),
-        @JsonProperty("id") @SerialName("id") val id: String,
+        //@SerializedName("donationLinks" ) var donationLinks : DonationLinks? = DonationLinks(),
+        //@SerializedName("isDownloaded"  ) var isDownloaded  : Boolean?       = null,
+        //@SerializedName("user_rated"    ) var userRated     : String?        = null
     )
 
     @Serializable
-    data class SubTitleLink(
+    data class Subtitle(
-        @JsonProperty("sub") @SerialName("sub") val sub: SubToken,
+
-    )
+        @JsonProperty("id") @SerialName("id") var id: Int? = null,
+        @JsonProperty("uploaded_at") @SerialName("uploaded_at") var uploadedAt: String? = null,
+        @JsonProperty("language") @SerialName("language") var language: String? = null,
+        @JsonProperty("rating") @SerialName("rating") var rating: String? = null,
+        //SerialName("rates"            ) var rates           : Rates?              = Rates(),
+        @JsonProperty("uploaded_by") @SerialName("uploaded_by") var uploadedBy: Int? = null,
+        //@SerialName("contribs"         ) var contribs        : ArrayList<Contribs> = arrayListOf(),
+        @JsonProperty("release_info") @SerialName("release_info") var releaseInfo: ArrayList<String> = arrayListOf(),
+        @JsonProperty("commentary") @SerialName("commentary") var commentary: String? = null,
+        @JsonProperty("files") @SerialName("files") var files: String? = null,
+        @JsonProperty("size") @SerialName("size") var size: String? = null,
+        @JsonProperty("downloads") @SerialName("downloads") var downloads: Int? = null,
+        @JsonProperty("comments") @SerialName("comments") var comments: Int? = null,
+        @JsonProperty("production_type") @SerialName("production_type") var productionType: String? = null,
+        @JsonProperty("release_type") @SerialName("release_type") var releaseType: String? = null,
+        @JsonProperty("episode") @SerialName("episode") var episode: String? = null,
+        @JsonProperty("hearing_impaired") @SerialName("hearing_impaired") var hearingImpaired: Int? = null,
+        @JsonProperty("foreign_parts") @SerialName("foreign_parts") var foreignParts: String? = null,
+        @JsonProperty("framerate") @SerialName("framerate") var framerate: String? = null,
+        @JsonProperty("preview") @SerialName("preview") var preview: String? = null,
+        @JsonProperty("user_uploaded") @SerialName("user_uploaded") var userUploaded: Boolean? = null,
+        @JsonProperty("download_token") @SerialName("download_token") var downloadToken: String
 
-    @Serializable
-    data class SubToken(
-        @JsonProperty("downloadToken") @SerialName("downloadToken") val downloadToken: String,
     )
 }

app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt

@@ -12,6 +12,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.android.gms.cast.MediaLoadOptions
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
@@ -34,35 +35,24 @@ import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.CastHelper.awaitLinks
 import com.lagradost.cloudstream3.utils.CastHelper.getMediaInfo
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.json.JSONObject
 
-/*class SkipOpController(val view: ImageView) : UIController() {
-    init {
-        view.setImageResource(R.drawable.exo_controls_fastforward)
-        view.setOnClickListener {
-            remoteMediaClient?.let {
-                val options = MediaSeekOptions.Builder()
-                    .setPosition(it.approximateStreamPosition + 85000)
-                it.seek(options.build())
-            }
-        }
-    }
-}*/
-
 private fun RemoteMediaClient.getItemIndex(): Int? {
     return try {
         val index = this.mediaQueue.itemIds.indexOf(this.currentItem?.itemId ?: 0)
         if (index < 0) null else index
-    } catch (e: Exception) {
+    } catch (_: Exception) {
         null
     }
 }
@@ -89,48 +79,41 @@ class SkipNextEpisodeController(val view: ImageView) : UIController() {
     }
 }
 
+@Serializable
 data class MetadataHolder(
-    val apiName: String,
+    @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-    val isMovie: Boolean,
+    @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
-    val title: String?,
+    @JsonProperty("title") @SerialName("title") val title: String?,
-    val poster: String?,
+    @JsonProperty("poster") @SerialName("poster") val poster: String?,
-    val currentEpisodeIndex: Int,
+    @JsonProperty("currentEpisodeIndex") @SerialName("currentEpisodeIndex") val currentEpisodeIndex: Int,
-    val episodes: List<ResultEpisode>,
+    @JsonProperty("episodes") @SerialName("episodes") val episodes: List<ResultEpisode>,
-    val currentLinks: List<ExtractorLink>,
+    @JsonProperty("currentLinks") @SerialName("currentLinks") val currentLinks: List<ExtractorLink>,
-    val currentSubtitles: List<SubtitleData>
+    @JsonProperty("currentSubtitles") @SerialName("currentSubtitles") val currentSubtitles: List<SubtitleData>,
 )
 
-class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
+class SelectSourceController(val view: ImageView, val activity: ControllerActivity) : UIController() {
-    UIController() {
     init {
         view.setImageResource(R.drawable.ic_baseline_playlist_play_24)
         view.setOnClickListener {
-            //  lateinit var dialog: AlertDialog
             val holder = getCurrentMetaData()
-
             if (holder != null) {
                 val items = holder.currentLinks
                 if (items.isNotEmpty() && remoteMediaClient?.currentItem != null) {
-                    val subTracks =
+                    val subTracks = remoteMediaClient?.mediaInfo?.mediaTracks?.filter { it.type == MediaTrack.TYPE_TEXT }
-                        remoteMediaClient?.mediaInfo?.mediaTracks?.filter { it.type == MediaTrack.TYPE_TEXT }
                         ?: ArrayList()
 
-                    val bottomSheetDialogBuilder =
+                    val bottomSheetDialogBuilder = AlertDialog.Builder(view.context, R.style.AlertDialogCustomBlack)
-                        AlertDialog.Builder(view.context, R.style.AlertDialogCustomBlack)
                     bottomSheetDialogBuilder.setView(R.layout.sort_bottom_sheet)
+
                     val bottomSheetDialog = bottomSheetDialogBuilder.create()
                     bottomSheetDialog.show()
-                    //  bottomSheetDialog.setContentView(R.layout.sort_bottom_sheet)
+
-                    val providerList =
+                    val providerList = bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
-                        bottomSheetDialog.findViewById<ListView>(R.id.sort_providers)!!
+                    val subtitleList = bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
-                    val subtitleList =
-                        bottomSheetDialog.findViewById<ListView>(R.id.sort_subtitles)!!
                     if (subTracks.isEmpty()) {
-                        bottomSheetDialog.findViewById<LinearLayout>(R.id.sort_subtitles_holder)?.visibility =
+                        bottomSheetDialog.findViewById<LinearLayout>(R.id.sort_subtitles_holder)?.visibility = GONE
-                            GONE
                     } else {
-                        val arrayAdapter =
+                        val arrayAdapter = ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
-                            ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
                         arrayAdapter.add(view.context.getString(R.string.no_subtitles))
                         arrayAdapter.addAll(subTracks.mapNotNull { it.name })
 
@@ -138,9 +121,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                         subtitleList.adapter = arrayAdapter
 
                         val currentTracks = remoteMediaClient?.mediaStatus?.activeTrackIds
-
+                        val subtitleIndex = if (currentTracks == null) 0 else subTracks.map { it.id }
-                        val subtitleIndex =
-                            if (currentTracks == null) 0 else subTracks.map { it.id }
                             .indexOfFirst { currentTracks.contains(it) } + 1
 
                         subtitleList.setSelection(subtitleIndex)
@@ -153,9 +134,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 ChromecastSubtitlesFragment.getCurrentSavedStyle().apply {
                                     val font = TextTrackStyle()
                                     font.setFontFamily(fontFamily ?: "Google Sans")
-                                    fontGenericFamily?.let {
+                                    fontGenericFamily?.let { font.fontGenericFamily = it }
-                                        font.fontGenericFamily = it
-                                    }
                                     font.windowColor = windowColor
                                     font.backgroundColor = backgroundColor
 
@@ -185,13 +164,11 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     val contentUrl = (remoteMediaClient?.currentItem?.media?.contentUrl
                         ?: remoteMediaClient?.currentItem?.media?.contentId)
 
-                    val sortingMethods =
+                    val sortingMethods = items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
-                        items.map { "${it.name} ${Qualities.getStringByInt(it.quality)}" }
                         .toTypedArray()
                     val sotringIndex = items.indexOfFirst { it.url == contentUrl }
 
-                    val arrayAdapter =
+                    val arrayAdapter = ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
-                        ArrayAdapter<String>(view.context, R.layout.sort_bottom_single_choice)
                     arrayAdapter.addAll(sortingMethods.toMutableList())
 
                     providerList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -201,10 +178,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
                     providerList.setOnItemClickListener { _, _, which, _ ->
                         val epData = holder.episodes[holder.currentEpisodeIndex]
-
                         fun loadMirror(index: Int) {
                             if (holder.currentLinks.size <= index) return
-
                             val mediaItem = getMediaInfo(
                                 epData,
                                 holder,
@@ -214,25 +189,21 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             )
 
                             val startAt = remoteMediaClient?.approximateStreamPosition ?: 0
-
-                            //remoteMediaClient.load(mediaItem, true, startAt)
                             try { // THIS IS VERY IMPORTANT BECAUSE WE NEVER WANT TO AUTOLOAD THE NEXT EPISODE
                                 val currentIdIndex = remoteMediaClient?.getItemIndex()
-
                                 val nextId = remoteMediaClient?.mediaQueue?.itemIds?.get(
                                     currentIdIndex?.plus(1) ?: 0
                                 )
+
                                 if (currentIdIndex == null && nextId != null) {
                                     awaitLinks(
                                         remoteMediaClient?.queueInsertAndPlayItem(
                                             MediaQueueItem.Builder(mediaItem).build(),
                                             nextId,
                                             startAt,
-                                            JSONObject()
+                                            JSONObject(),
                                         )
-                                    ) {
+                                    ) { loadMirror(index + 1) }
-                                        loadMirror(index + 1)
-                                    }
                                 } else {
                                     val mediaLoadOptions =
                                         MediaLoadOptions.Builder()
@@ -244,11 +215,9 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                             mediaItem,
                                             mediaLoadOptions
                                         )
-                                    ) {
+                                    ) { loadMirror(index + 1) }
-                                        loadMirror(index + 1)
                                 }
-                                }
+                            } catch (_: Exception) {
-                            } catch (e: Exception) {
                                 val mediaLoadOptions =
                                     MediaLoadOptions.Builder()
                                         .setPlayPosition(startAt)
@@ -259,8 +228,8 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }
                             }
                         }
-                        loadMirror(which)
 
+                        loadMirror(which)
                         bottomSheetDialog.dismissSafe(activity)
                     }
                 }
@@ -270,23 +239,19 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
     private fun getCurrentMetaData(): MetadataHolder? {
         return try {
-            val data = remoteMediaClient?.mediaInfo?.customData?.toString()
+            val data = remoteMediaClient?.mediaInfo?.customData?.toString() ?: return null
-            data?.toKotlinObject()
+            parseJson<MetadataHolder>(data)
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             null
         }
     }
 
     var isLoadingMore = false
-
-
     override fun onMediaStatusUpdated() {
         super.onMediaStatusUpdated()
         val meta = getCurrentMetaData()
+        view.visibility = if ((meta?.currentLinks?.size ?: 0) > 1) VISIBLE else INVISIBLE
 
-        view.visibility = if ((meta?.currentLinks?.size
-                ?: 0) > 1
-        ) VISIBLE else INVISIBLE
         try {
             if (meta != null && meta.episodes.size > meta.currentEpisodeIndex + 1) {
                 val currentIdIndex = remoteMediaClient?.getItemIndex() ?: return
@@ -303,7 +268,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                             currentPosition,
                             currentDuration,
                             epData,
-                            meta.episodes.getOrNull(index + 1)
+                            meta.episodes.getOrNull(index + 1),
                         )
                 } catch (t: Throwable) {
                     logError(t)
@@ -314,9 +279,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                     ioSafe {
                         val currentLinks = mutableSetOf<ExtractorLink>()
                         val currentSubs = mutableSetOf<SubtitleData>()
-
                         val generator = RepoLinkGenerator(listOf(epData))
-
                         val isSuccessful = safeApiCall {
                             generator.generateLinks(
                                 clearCache = false,
@@ -329,7 +292,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                     currentSubs.add(it)
                                 },
                                 offset = 0,
-                                isCasting = true
+                                isCasting = true,
                             )
                         }
 
@@ -340,32 +303,18 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 val jsonCopy = meta.copy(
                                     currentLinks = sortedLinks,
                                     currentSubtitles = sortedSubs,
-                                    currentEpisodeIndex = index
+                                    currentEpisodeIndex = index,
                                 )
 
-                                val done =
+                                val done = JSONObject(jsonCopy.toJson())
-                                    JSONObject(jsonCopy.toJson())
-
                                 val mediaInfo = getMediaInfo(
                                     epData,
                                     jsonCopy,
                                     0,
                                     done,
-                                    sortedSubs
+                                    sortedSubs,
                                 )
 
-                                /*fun loadIndex(index: Int) {
-                                    println("LOAD INDEX::::: $index")
-                                    if (meta.currentLinks.size <= index) return
-                                    val info = getMediaInfo(
-                                        epData,
-                                        meta,
-                                        index,
-                                        done)
-                                    awaitLinks(remoteMediaClient?.load(info, true, 0)) {
-                                        loadIndex(index + 1)
-                                    }
-                                }*/
                                 activity.runOnUiThread {
                                     awaitLinks(
                                         remoteMediaClient?.queueAppendItem(
@@ -374,7 +323,6 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                         )
                                     ) {
                                         println("FAILED TO LOAD NEXT ITEM")
-                                        //  loadIndex(1)
                                     }
                                     isLoadingMore = false
                                 }
@@ -397,10 +345,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
 
 class SkipTimeController(val view: ImageView, forwards: Boolean) : UIController() {
     init {
-        //val settingsManager = PreferenceManager.getDefaultSharedPreferences()
-        //val time = settingsManager?.getInt("chromecast_tap_time", 30) ?: 30
         val time = 30
-        //view.setImageResource(if (forwards) R.drawable.netflix_skip_forward else R.drawable.netflix_skip_back)
         view.setImageResource(if (forwards) R.drawable.go_forward_30 else R.drawable.go_back_30)
         view.setOnClickListener {
             remoteMediaClient?.let {

app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt

@@ -37,8 +37,10 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod
+import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 
 object AccountHelper {
     fun showAccountEditDialog(
@@ -164,7 +166,7 @@ object AccountHelper {
 
         canSetPin = true
 
-        binding.editProfilePhotoButton.setOnClickListener({
+        binding.editProfilePhotoButton.setOnClickListener {
             val bottomSheetDialog = BottomSheetDialog(context)
             val sheetBinding = BottomInputDialogBinding.inflate(LayoutInflater.from(context))
             bottomSheetDialog.setContentView(sheetBinding.root)
@@ -174,9 +176,13 @@ object AccountHelper {
                 text1.text = context.getString(R.string.edit_profile_image_title)
                 nginxTextInput.hint = context.getString(R.string.edit_profile_image_hint)
 
-                applyBtt.setOnClickListener({
+                applyBtt.setOnClickListener {
                     val url = sheetBinding.nginxTextInput.text.toString()
-                    if (url.isNotEmpty()) {
+                    if (url.isEmpty()) {
+                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
+                        return@setOnClickListener
+                    }
+                    applyBtt.showProgress()
                     val imageLoader = ImageLoader(context)
                     val request = ImageRequest.Builder(context)
                         .data(url)
@@ -189,27 +195,27 @@ object AccountHelper {
                                     R.string.edit_profile_image_success,
                                     Toast.LENGTH_SHORT
                                 )
-                                    bottomSheetDialog.dismiss()
+                                bottomSheetDialog.dismissSafe()
                             },
                             onError = { _, _ ->
                                 showToast(
                                     R.string.edit_profile_image_error_invalid,
                                     Toast.LENGTH_SHORT
                                 )
+                                applyBtt.hideProgress()
+                            },
+                            onCancel = {
+                                applyBtt.hideProgress()
                             }
                         )
                         .build()
                     imageLoader.enqueue(request)
-                    } else {
-                        showToast(R.string.edit_profile_image_error_empty, Toast.LENGTH_SHORT)
                 }
+                sheetBinding.cancelBtt.setOnClickListener {
                     bottomSheetDialog.dismissSafe()
-                })
-                sheetBinding.cancelBtt.setOnClickListener({
-                    bottomSheetDialog.dismissSafe()
-                })
                 }
-        })
+            }
+        }
     }
 
     fun showPinInputDialog(

app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt

@@ -10,6 +10,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.lagradost.api.Log
+import com.lagradost.cloudstream3.CloudStreamApp
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.isEpisodeBased
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -36,6 +37,7 @@ import com.lagradost.cloudstream3.utils.ResourceLiveData
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.deleteFilesAndUpdateSettings
+import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.downloadDeleteEvent
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -67,6 +69,17 @@ class DownloadViewModel : ViewModel() {
     private val _selectedItemIds = ConsistentLiveData<Set<Int>?>(null)
     val selectedItemIds: LiveData<Set<Int>?> = _selectedItemIds
 
+    init {
+        // Keep the Downloads list in sync when a download is deleted/cancelled from
+        // anywhere in the app (result page button, queue, notification, etc.). See
+        // onDownloadDeleted for the rationale (issue #1227).
+        downloadDeleteEvent += ::onDownloadDeleted
+    }
+
+    override fun onCleared() {
+        downloadDeleteEvent -= ::onDownloadDeleted
+        super.onCleared()
+    }
 
     fun cancelSelection() {
         updateSelectedItems { null }
@@ -389,6 +402,18 @@ class DownloadViewModel : ViewModel() {
         postChildren(_childCards.success?.filter { it.data.id !in idsToRemove })
     }
 
+    /**
+     * Refreshes the Downloads screen in real time when a download is deleted/cancelled.
+     */
+    private fun onDownloadDeleted(id: Int) {
+        // Keep multi-select state consistent: forget the removed id if it was selected.
+        updateSelectedItems { it?.minus(id) }
+
+        val context = CloudStreamApp.context ?: return
+        updateHeaderList(context)
+        postChildren(_childCards.success?.filterNot { it.data.id == id })
+    }
+
     private fun updateStorageStats(visual: List<VisualDownloadCached.Header>) {
         try {
             val stat = StatFs(Environment.getExternalStorageDirectory().path)

app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt

@@ -164,9 +164,11 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
         }
     }
 
-    /*fun downloadDeleteEvent(data: Int) {
+    fun downloadDeleteEvent(data: Int) {
-
+        if (data == persistentId) {
-    }*/
+            resetView()
+        }
+    }
 
     /*fun downloadEvent(data: Pair<Int, VideoDownloadManager.DownloadActionType>) {
         val (id, action) = data
@@ -185,7 +187,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     override fun onAttachedToWindow() {
         VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent
-        // VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
+        VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent
         // VideoDownloadManager.downloadEvent += ::downloadEvent
         VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent
 
@@ -200,7 +202,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
 
     override fun onDetachedFromWindow() {
         VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent
-        // VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
+        VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent
         // VideoDownloadManager.downloadEvent -= ::downloadEvent
         VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent
 

app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt

@@ -451,7 +451,14 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     arrayAdapter.clear()
                     val sortedApis = validAPIs
                         .filter {
-                            it.hasMainPage && (pinnedphashset.contains(it.name) || it.supportedTypes.any(
+                            val isPinned = pinnedphashset.contains(it.name)
+
+                            // Hide pinned NSFW when NSFW not selected. NSFW is distracting when not chosen.
+                            if (isPinned && !preSelectedTypes.contains(TvType.NSFW)) {
+                                if (it.supportedTypes.all { type -> type == TvType.NSFW }) return@filter false
+                            }
+
+                            it.hasMainPage && (isPinned || it.supportedTypes.any(
                                 preSelectedTypes::contains
                             ))
                         }
@@ -665,7 +672,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
                     fromUI = true
                 )
                 showToast(R.string.action_reload, Toast.LENGTH_SHORT)
-                true
             }
 
             homePreviewSearchButton.setOnClickListener { _ ->

app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt

@@ -719,7 +719,7 @@ class CS3IPlayer : IPlayer {
          **/
         var preferredAudioTrackLanguage: String? = null
             get() {
-                return field ?: getKey(
+                return field ?: getKey<String>(
                     "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY",
                     field
                 )?.also {

app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt

@@ -1202,6 +1202,10 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             }
 
             skipChapterButton.setOnClickListener {
+                // Switch focus for a better UX, as otherwise it is reset to a random button like "back button"
+                if(skipChapterButton.hasFocus()) {
+                    playerPausePlay.requestFocus()
+                }
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt

@@ -117,8 +117,10 @@ import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
+import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
 import com.lagradost.cloudstream3.utils.setText
@@ -507,7 +509,8 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         showDownloadProgress(DownloadEvent(0, 0, 0, null))
 
-        uiReset()
+        // uiReset() // Removed due to UX
+        
         currentSelectedLink = link
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
         setPlayerDimen(null)
@@ -790,11 +793,24 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         binding.applyBtt.setOnClickListener {
-            currentSubtitle?.let { currentSubtitle ->
+            val currentSubtitle = currentSubtitle
-                providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api ->
+            if (currentSubtitle == null) {
+                dialog.dismissSafe()
+                return@setOnClickListener
+            }
+
+            val api = providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }
+            if (api == null) {
+                dialog.dismissSafe()
+                return@setOnClickListener
+            }
+
+            binding.applyBtt.showProgress()
             ioSafe {
-                        when (val apiResource =
+                val apiResource =
-                            Resource.fromResult(api.resource(currentSubtitle))) {
+                    Resource.fromResult(api.resource(currentSubtitle))
+                binding.applyBtt.hideProgress()
+                when (apiResource) {
                     is Resource.Success -> {
                         val subtitles = apiResource.value.getSubtitles().map { resource ->
                             SubtitleData(
@@ -814,6 +830,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                             showToast(R.string.no_subtitles)
                             return@ioSafe
                         }
+                        dialog.dismissSafe()
                         runOnMainThread {
                             addAndSelectSubtitles(*subtitles.toTypedArray())
                         }
@@ -829,9 +846,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
             }
         }
-            }
-            dialog.dismissSafe()
-        }
 
         dialog.setOnDismissListener {
             dismissCallback.invoke()

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt

@@ -8,11 +8,14 @@ import androidx.annotation.OptIn
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.SubtitleView
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.setSubtitleViewStyle
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 enum class SubtitleStatus {
     IS_ACTIVE,
@@ -32,17 +35,19 @@ enum class SubtitleOrigin {
  * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend id
  * @param headers if empty it will use the base onlineDataSource headers else only the specified headers
  * @param languageCode usually, tags such as "en", "es-mx", or "zh-hant-TW". But it could be something like "English 4"
- * */
+ */
+@Serializable
 data class SubtitleData(
-    val originalName: String,
+    @SerialName("originalName") val originalName: String,
-    val nameSuffix: String,
+    @SerialName("nameSuffix") val nameSuffix: String,
-    val url: String,
+    @SerialName("url") val url: String,
-    val origin: SubtitleOrigin,
+    @SerialName("origin") val origin: SubtitleOrigin,
-    val mimeType: String,
+    @SerialName("mimeType") val mimeType: String,
-    val headers: Map<String, String>,
+    @SerialName("headers") val headers: Map<String, String>,
-    val languageCode: String?,
+    @SerialName("languageCode") val languageCode: String?,
 ) {
-    /** Internal ID for exoplayer, unique for each link*/
+    /** Internal ID for media3, unique for each link. */
+    @JsonIgnore
     fun getId(): String {
         return if (origin == SubtitleOrigin.EMBEDDED_IN_VIDEO) url
         else "$url|$name"
@@ -54,22 +59,22 @@ data class SubtitleData(
     }
 
     /** Tries hard to figure out a valid IETF tag based on language code and name. Will return null if not found. */
+    @JsonIgnore
     fun getIETF_tag(): String? {
         return fromLanguageToTagIETF(this.languageCode) ?: fromLanguageToTagIETF(this.originalName, halfMatch = true)
     }
 
-    val name = "$originalName $nameSuffix"
+    @SerialName("name") val name = "$originalName $nameSuffix"
 
     /**
      * Gets the URL, but tries to fix it if it is malformed.
      */
+    @JsonIgnore
     fun getFixedUrl(): String {
         // Some extensions fail to include the protocol, this helps with that.
         val fixedSubUrl = if (this.url.startsWith("//")) {
             "https:${this.url}"
-        } else {
+        } else this.url
-            this.url
-        }
         return fixedSubUrl
     }
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/Torrent.kt

@@ -9,6 +9,8 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import torrServer.TorrServer
 import java.io.File
 import java.net.ConnectException
@@ -39,7 +41,7 @@ object Torrent {
             app.get(
                 "$TORRENT_SERVER_URL/echo",
             ).text.isNotEmpty()
-        } catch (e: ConnectException) {
+        } catch (_: ConnectException) {
             // `Failed to connect to /127.0.0.1:8090` if the server is down
             false
         } catch (t: Throwable) {
@@ -164,9 +166,7 @@ object Torrent {
     /** Gets all the metadata of a torrent, will throw if that hash does not exists
      * https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L126 */
     @Throws
-    suspend fun get(
+    suspend fun get(hash: String): TorrentStatus {
-        hash: String,
-    ): TorrentStatus {
         if (TORRENT_SERVER_URL.isEmpty()) {
             throw ErrorLoadingException("Not initialized")
         }
@@ -278,94 +278,55 @@ object Torrent {
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/web/api/torrents.go#L18
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/main/web/api/route.go#L7
+    @Serializable
     data class TorrentRequest(
-        @JsonProperty("action")
+        @JsonProperty("action") @SerialName("action") val action: String,
-        val action: String,
+        @JsonProperty("hash") @SerialName("hash") val hash: String = "",
-        @JsonProperty("hash")
+        @JsonProperty("link") @SerialName("link") val link: String = "",
-        val hash: String = "",
+        @JsonProperty("title") @SerialName("title") val title: String = "",
-        @JsonProperty("link")
+        @JsonProperty("poster") @SerialName("poster") val poster: String = "",
-        val link: String = "",
+        @JsonProperty("data") @SerialName("data") val data: String = "",
-        @JsonProperty("title")
+        @JsonProperty("save_to_db") @SerialName("save_to_db") val saveToDB: Boolean = false,
-        val title: String = "",
-        @JsonProperty("poster")
-        val poster: String = "",
-        @JsonProperty("data")
-        val data: String = "",
-        @JsonProperty("save_to_db")
-        val saveToDB: Boolean = false,
     )
 
     // https://github.com/Diegopyl1209/torrentserver-aniyomi/blob/c18f58e51b6738f053261bc863177078aa9c1c98/torr/state/state.go#L33
     // omitempty = nullable
+    @Serializable
     data class TorrentStatus(
-        @JsonProperty("title")
+        @JsonProperty("title") @SerialName("title") var title: String,
-        var title: String,
+        @JsonProperty("poster") @SerialName("poster") var poster: String,
-        @JsonProperty("poster")
+        @JsonProperty("data") @SerialName("data") var data: String?,
-        var poster: String,
+        @JsonProperty("timestamp") @SerialName("timestamp") var timestamp: Long,
-        @JsonProperty("data")
+        @JsonProperty("name") @SerialName("name") var name: String?,
-        var data: String?,
+        @JsonProperty("hash") @SerialName("hash") var hash: String?,
-        @JsonProperty("timestamp")
+        @JsonProperty("stat") @SerialName("stat") var stat: Int,
-        var timestamp: Long,
+        @JsonProperty("stat_string") @SerialName("stat_string") var statString: String,
-        @JsonProperty("name")
+        @JsonProperty("loaded_size") @SerialName("loaded_size") var loadedSize: Long?,
-        var name: String?,
+        @JsonProperty("torrent_size") @SerialName("torrent_size") var torrentSize: Long?,
-        @JsonProperty("hash")
+        @JsonProperty("preloaded_bytes") @SerialName("preloaded_bytes") var preloadedBytes: Long?,
-        var hash: String?,
+        @JsonProperty("preload_size") @SerialName("preload_size") var preloadSize: Long?,
-        @JsonProperty("stat")
+        @JsonProperty("download_speed") @SerialName("download_speed") var downloadSpeed: Double?,
-        var stat: Int,
+        @JsonProperty("upload_speed") @SerialName("upload_speed") var uploadSpeed: Double?,
-        @JsonProperty("stat_string")
+        @JsonProperty("total_peers") @SerialName("total_peers") var totalPeers: Int?,
-        var statString: String,
+        @JsonProperty("pending_peers") @SerialName("pending_peers") var pendingPeers: Int?,
-        @JsonProperty("loaded_size")
+        @JsonProperty("active_peers") @SerialName("active_peers") var activePeers: Int?,
-        var loadedSize: Long?,
+        @JsonProperty("connected_seeders") @SerialName("connected_seeders") var connectedSeeders: Int?,
-        @JsonProperty("torrent_size")
+        @JsonProperty("half_open_peers") @SerialName("half_open_peers") var halfOpenPeers: Int?,
-        var torrentSize: Long?,
+        @JsonProperty("bytes_written") @SerialName("bytes_written") var bytesWritten: Long?,
-        @JsonProperty("preloaded_bytes")
+        @JsonProperty("bytes_written_data") @SerialName("bytes_written_data") var bytesWrittenData: Long?,
-        var preloadedBytes: Long?,
+        @JsonProperty("bytes_read") @SerialName("bytes_read") var bytesRead: Long?,
-        @JsonProperty("preload_size")
+        @JsonProperty("bytes_read_data") @SerialName("bytes_read_data") var bytesReadData: Long?,
-        var preloadSize: Long?,
+        @JsonProperty("bytes_read_useful_data") @SerialName("bytes_read_useful_data") var bytesReadUsefulData: Long?,
-        @JsonProperty("download_speed")
+        @JsonProperty("chunks_written") @SerialName("chunks_written") var chunksWritten: Long?,
-        var downloadSpeed: Double?,
+        @JsonProperty("chunks_read") @SerialName("chunks_read") var chunksRead: Long?,
-        @JsonProperty("upload_speed")
+        @JsonProperty("chunks_read_useful") @SerialName("chunks_read_useful") var chunksReadUseful: Long?,
-        var uploadSpeed: Double?,
+        @JsonProperty("chunks_read_wasted") @SerialName("chunks_read_wasted") var chunksReadWasted: Long?,
-        @JsonProperty("total_peers")
+        @JsonProperty("pieces_dirtied_good") @SerialName("pieces_dirtied_good") var piecesDirtiedGood: Long?,
-        var totalPeers: Int?,
+        @JsonProperty("pieces_dirtied_bad") @SerialName("pieces_dirtied_bad") var piecesDirtiedBad: Long?,
-        @JsonProperty("pending_peers")
+        @JsonProperty("duration_seconds") @SerialName("duration_seconds") var durationSeconds: Double?,
-        var pendingPeers: Int?,
+        @JsonProperty("bit_rate") @SerialName("bit_rate") var bitRate: String?,
-        @JsonProperty("active_peers")
+        @JsonProperty("file_stats") @SerialName("file_stats") var fileStats: List<TorrentFileStat>?,
-        var activePeers: Int?,
+        @JsonProperty("trackers") @SerialName("trackers") var trackers: List<String>?,
-        @JsonProperty("connected_seeders")
-        var connectedSeeders: Int?,
-        @JsonProperty("half_open_peers")
-        var halfOpenPeers: Int?,
-        @JsonProperty("bytes_written")
-        var bytesWritten: Long?,
-        @JsonProperty("bytes_written_data")
-        var bytesWrittenData: Long?,
-        @JsonProperty("bytes_read")
-        var bytesRead: Long?,
-        @JsonProperty("bytes_read_data")
-        var bytesReadData: Long?,
-        @JsonProperty("bytes_read_useful_data")
-        var bytesReadUsefulData: Long?,
-        @JsonProperty("chunks_written")
-        var chunksWritten: Long?,
-        @JsonProperty("chunks_read")
-        var chunksRead: Long?,
-        @JsonProperty("chunks_read_useful")
-        var chunksReadUseful: Long?,
-        @JsonProperty("chunks_read_wasted")
-        var chunksReadWasted: Long?,
-        @JsonProperty("pieces_dirtied_good")
-        var piecesDirtiedGood: Long?,
-        @JsonProperty("pieces_dirtied_bad")
-        var piecesDirtiedBad: Long?,
-        @JsonProperty("duration_seconds")
-        var durationSeconds: Double?,
-        @JsonProperty("bit_rate")
-        var bitRate: String?,
-        @JsonProperty("file_stats")
-        var fileStats: List<TorrentFileStat>?,
-        @JsonProperty("trackers")
-        var trackers: List<String>?,
     ) {
         fun streamUrl(url: String): String {
             val fileName =
@@ -381,12 +342,10 @@ object Torrent {
         }
     }
 
+    @Serializable
     data class TorrentFileStat(
-        @JsonProperty("id")
+        @JsonProperty("id") @SerialName("id") val id: Int?,
-        val id: Int?,
+        @JsonProperty("path") @SerialName("path") val path: String?,
-        @JsonProperty("path")
+        @JsonProperty("length") @SerialName("length") val length: Long?,
-        val path: String?,
-        @JsonProperty("length")
-        val length: Long?,
     )
 }

app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt

@@ -55,7 +55,7 @@ object QualityDataHelper {
 
     fun getSourcePriority(profile: Int, name: String?): Int {
         if (name == null) return DEFAULT_SOURCE_PRIORITY
-        return getKey(
+        return getKey<Int>(
             "$currentAccount/$VIDEO_SOURCE_PRIORITY/$profile",
             name,
             DEFAULT_SOURCE_PRIORITY
@@ -94,7 +94,7 @@ object QualityDataHelper {
     }
 
     fun getQualityPriority(profile: Int, quality: Qualities): Int {
-        return getKey(
+        return getKey<Int>(
             "$currentAccount/$VIDEO_QUALITY_PRIORITY/$profile",
             quality.value.toString(),
             quality.defaultPriority

app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt

@@ -5,6 +5,9 @@ import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.Animation
+import android.view.animation.OvershootInterpolator
+import android.view.animation.ScaleAnimation
 import androidx.core.view.isVisible
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
@@ -46,6 +49,24 @@ class ActorAdaptor(
         }
     }
 
+    override fun onUpdateContent(holder: ViewHolderState<Any>, item: ActorData, position: Int) {
+        when (val binding = holder.view) {
+            is CastItemBinding -> {
+                val anim: Animation = ScaleAnimation(
+                    0.8f, 1f,
+                    0.8f, 1f,
+                    Animation.RELATIVE_TO_SELF, 0.5f,
+                    Animation.RELATIVE_TO_SELF, 0.5f
+                )
+                anim.fillAfter = true
+                anim.duration = 200
+                anim.interpolator = OvershootInterpolator()
+                binding.voiceActorImageHolder2.startAnimation(anim)
+            }
+        }
+        super.onUpdateContent(holder, item, position)
+    }
+
     override fun onBindContent(holder: ViewHolderState<Any>, item: ActorData, position: Int) {
         when (val binding = holder.view) {
             is CastItemBinding -> {

app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt

@@ -21,6 +21,8 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UiImage
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 const val START_ACTION_RESUME_LATEST = 1
 const val START_ACTION_LOAD_EP = 2
@@ -34,33 +36,32 @@ enum class VideoWatchState {
     Watched
 }
 
+@Serializable
 data class ResultEpisode(
-    val headerName: String,
+    @SerialName("headerName") val headerName: String,
-    val name: String?,
+    @SerialName("name") val name: String?,
-    val poster: String?,
+    @SerialName("poster") val poster: String?,
-    val episode: Int,
+    @SerialName("episode") val episode: Int,
-    val seasonIndex: Int?,  // this is the "season" index used season names
+    @SerialName("seasonIndex") val seasonIndex: Int?, // this is the "season" index used season names
-    val season: Int?, // this is the display
+    @SerialName("season") val season: Int?, // this is the display
-    val data: String,
+    @SerialName("data") val data: String,
-    val apiName: String,
+    @SerialName("apiName") val apiName: String,
-    val id: Int,
+    @SerialName("id") val id: Int,
-    val index: Int,
+    @SerialName("index") val index: Int,
-    val position: Long, // time in MS
+    @SerialName("position") val position: Long, // time in MS
-    val duration: Long, // duration in MS
+    @SerialName("duration") val duration: Long, // duration in MS
-    val score: Score?,
+    @SerialName("score") val score: Score?,
-    val description: String?,
+    @SerialName("description") val description: String?,
-    val isFiller: Boolean?,
+    @SerialName("isFiller") val isFiller: Boolean?,
-    val tvType: TvType,
+    @SerialName("tvType") val tvType: TvType,
-    val parentId: Int,
+    @SerialName("parentId") val parentId: Int,
-    /**
+    /** Conveys if the episode itself is marked as watched. */
-     * Conveys if the episode itself is marked as watched
+    @SerialName("videoWatchState") val videoWatchState: VideoWatchState,
-     **/
+    /** Sum of all previous season episode counts + episode. */
-    val videoWatchState: VideoWatchState,
+    @SerialName("totalEpisodeIndex") val totalEpisodeIndex: Int? = null,
-    /** Sum of all previous season episode counts + episode */
+    @SerialName("airDate") val airDate: Long? = null,
-    val totalEpisodeIndex: Int? = null,
+    @SerialName("runTime") val runTime: Int? = null,
-    val airDate: Long? = null,
+    @SerialName("seasonData") val seasonData: SeasonData? = null,
-    val runTime: Int? = null,
-    val seasonData: SeasonData? = null,
 )
 
 fun ResultEpisode.getRealPosition(): Long {

app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt

@@ -182,6 +182,7 @@ class SyncViewModel : ViewModel() {
     fun publishUserData() = ioSafe {
         Log.i(TAG, "publishUserData")
         val user = userData.value
+        _userDataResponse.postValue(Resource.Loading())
         if (user is Resource.Success) {
             syncs.forEach { (prefix, id) ->
                 repos.firstOrNull { it.idPrefix == prefix }?.updateStatus(id, user.value)

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt

@@ -65,6 +65,8 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogTe
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
+import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
+import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
 import qrcode.QRCode
@@ -348,6 +350,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
                     email = if (req.email) binding.loginEmailInput.text?.toString() else null,
                     server = if (req.server) binding.loginServerInput.text?.toString() else null,
                 )
+                binding.applyBtt.showProgress()
                 ioSafe {
                     try {
                         if (api.login(loginData)) {
@@ -377,6 +380,8 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
                                 api.name
                             )
                         )
+                    } finally {
+                        binding.applyBtt.hideProgress()
                     }
                 }
             }

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt

@@ -249,7 +249,7 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
 
         val appVersion = BuildConfig.VERSION_NAME
         val commitHash = activity?.currentCommitHash() ?: ""
-        val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
+        val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM,
             Locale.getDefault()
         ).apply { timeZone = TimeZone.getTimeZone("UTC")
         }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")

app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt

@@ -359,7 +359,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
             } ?: emptyList()
         }
 
-        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
+        settingsManager.edit { putBoolean(getString(R.string.jsdelivr_proxy_key), getKey<Boolean>(getString(R.string.jsdelivr_proxy_key), false) ?: false) }
         getPref(R.string.jsdelivr_proxy_key)?.setOnPreferenceChangeListener { _, newValue ->
             setKey(getString(R.string.jsdelivr_proxy_key), newValue)
             return@setOnPreferenceChangeListener true

app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt

@@ -39,6 +39,8 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.hideProgress
+import com.lagradost.cloudstream3.utils.UIHelper.showProgress
 import com.lagradost.cloudstream3.utils.setText
 
 class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
@@ -282,7 +284,9 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
                     showToast(R.string.error_invalid_url, Toast.LENGTH_SHORT)
                     return@secondListener
                 }
+                binding.applyBtt.showProgress()
                 ioSafe {
+                    try {
                         val url = RepositoryManager.parseRepoUrl(urlInput)
                         if (url.isNullOrBlank()) {
                             showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
@@ -314,6 +318,9 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
                         this@ExtensionsFragment.activity?.addRepositoryDialog(
                             newRepo
                         )
+                    } finally {
+                        binding.applyBtt.hideProgress()
+                    }
                 }
             }
             binding.cancelBtt.setOnClickListener {
@@ -321,6 +328,7 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             }
         }
 
+
         val isTv = isLayout(TV)
         binding.apply {
             addRepoButton.isGone = isTv

app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt

@@ -101,7 +101,7 @@ class ChromecastSubtitlesFragment : BaseFragment<ChromecastSubtitleSettingsBindi
         }
 
         fun getCurrentSavedStyle(): SaveChromeCaptionStyle {
-            return getKey(CHROME_SUBTITLE_KEY) ?: defaultState
+            return getKey<SaveChromeCaptionStyle>(CHROME_SUBTITLE_KEY) ?: defaultState
         }
 
         private val defaultState = SaveChromeCaptionStyle()

app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt

@@ -261,7 +261,7 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getCurrentSavedStyle(): SaveCaptionStyle {
-            return cachedSubtitleStyle ?: (getKey(SUBTITLE_KEY) ?: SaveCaptionStyle(
+            return cachedSubtitleStyle ?: (getKey<SaveCaptionStyle>(SUBTITLE_KEY) ?: SaveCaptionStyle(
                 foregroundColor = getDefColor(0),
                 backgroundColor = getDefColor(2),
                 windowColor = getDefColor(3),
@@ -293,11 +293,11 @@ class SubtitlesFragment : BaseDialogFragment<SubtitleSettingsBinding>(
         }
 
         fun getDownloadSubsLanguageTagIETF(): List<String> {
-            return getKey(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
+            return getKey<List<String>>(SUBTITLE_DOWNLOAD_KEY) ?: listOf("en")
         }
 
         fun getAutoSelectLanguageTagIETF(): String {
-            return getKey(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
+            return getKey<String>(SUBTITLE_AUTO_SELECT_KEY) ?: "en"
         }
     }
 

app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt

@@ -90,12 +90,9 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okhttp3.Cache
 import java.io.File
-import java.net.URL
-import java.net.URLDecoder
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
-
 object AppContextUtils {
     fun RecyclerView.isRecyclerScrollable(): Boolean {
         val layoutManager =
@@ -635,16 +632,17 @@ object AppContextUtils {
         }
     }
 
-    fun splitQuery(url: URL): Map<String, String> {
+    // Deprecate after next stable
-        val queryPairs: MutableMap<String, String> = LinkedHashMap()
+    /* @Deprecated(
-        val query: String = url.query
+        message = "Use splitUrlParameters instead.",
-        val pairs = query.split("&").toTypedArray()
+        replaceWith = ReplaceWith(
-        for (pair in pairs) {
+            expression = "splitUrlParameters(url.toString())",
-            val idx = pair.indexOf("=")
+            imports = ["com.lagradost.cloudstream3.splitUrlParameters"],
-            queryPairs[URLDecoder.decode(pair.substring(0, idx), "UTF-8")] =
+        ),
-                URLDecoder.decode(pair.substring(idx + 1), "UTF-8")
+        level = DeprecationLevel.WARNING,
-        }
+    ) */
-        return queryPairs
+    fun splitQuery(url: java.net.URL): Map<String, String> {
+        return com.lagradost.cloudstream3.splitUrlParameters(url.toString())
     }
 
     /**| S1:E2 Hello World

app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt

@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import android.content.Context
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
@@ -31,6 +32,12 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.VideoWatchState
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KeepGeneratedSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 import java.util.Calendar
 import java.util.Date
 import java.util.GregorianCalendar
@@ -43,17 +50,18 @@ const val RESULT_WATCH_STATE = "result_watch_state"
 const val RESULT_WATCH_STATE_DATA = "result_watch_state_data"
 const val RESULT_SUBSCRIBED_STATE_DATA = "result_subscribed_state_data"
 const val RESULT_FAVORITES_STATE_DATA = "result_favorites_state_data"
-const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes
+const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // Changed due to id changes
 const val RESULT_RESUME_WATCHING_OLD = "result_resume_watching"
 const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated"
 const val RESULT_EPISODE = "result_episode"
 const val RESULT_SEASON = "result_season"
 const val RESULT_DUB = "result_dub"
 const val KEY_RESULT_SORT = "result_sort"
-const val USER_PINNED_PROVIDERS = "user_pinned_providers" //key for pinned user set
+const val USER_PINNED_PROVIDERS = "user_pinned_providers" // Key for pinned user set
 
 class UserPreferenceDelegate<T : Any>(
-    private val key: String, private val default: T //, private val klass: KClass<T>
+    private val key: String,
+    private val default: T,
 ) {
     private val klass: KClass<out T> = default::class
     private val realKey get() = "${DataStoreHelper.currentAccount}/$key"
@@ -63,7 +71,7 @@ class UserPreferenceDelegate<T : Any>(
     operator fun setValue(
         self: Any?,
         property: KProperty<*>,
-        t: T?
+        t: T?,
     ) {
         if (t == null) {
             removeKey(realKey)
@@ -82,7 +90,7 @@ object DataStoreHelper {
         R.drawable.profile_bg_pink,
         R.drawable.profile_bg_purple,
         R.drawable.profile_bg_red,
-        R.drawable.profile_bg_teal
+        R.drawable.profile_bg_teal,
     )
 
     private var searchPreferenceProvidersStrings: List<String> by UserPreferenceDelegate(
@@ -112,16 +120,17 @@ object DataStoreHelper {
     private var searchPreferenceTagsStrings: List<String> by UserPreferenceDelegate(
         "search_pref_tags",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
+
     var searchPreferenceTags: List<TvType>
         get() = deserializeTv(searchPreferenceTagsStrings)
         set(value) {
             searchPreferenceTagsStrings = serializeTv(value)
         }
 
-
     private var homePreferenceStrings: List<String> by UserPreferenceDelegate(
         "home_pref_homepage",
         listOf(TvType.Movie, TvType.TvSeries).map { it.name })
+
     var homePreference: List<TvType>
         get() = deserializeTv(homePreferenceStrings)
         set(value) {
@@ -132,38 +141,38 @@ object DataStoreHelper {
         "home_bookmarked_last_list",
         IntArray(0)
     )
+
     var playBackSpeed: Float by UserPreferenceDelegate("playback_speed", 1.0f)
     var resizeMode: Int by UserPreferenceDelegate("resize_mode", 0)
     var librarySortingMode: Int by UserPreferenceDelegate(
         "library_sorting_mode",
         ListSorting.AlphabeticalA.ordinal
     )
+
     private var _resultsSortingMode: Int by UserPreferenceDelegate(
         "results_sorting_mode",
         EpisodeSortType.NUMBER_ASC.ordinal
     )
+
     var resultsSortingMode: EpisodeSortType
         get() = EpisodeSortType.entries.getOrNull(_resultsSortingMode) ?: EpisodeSortType.NUMBER_ASC
         set(value) {
             _resultsSortingMode = value.ordinal
         }
 
+    @Serializable
     data class Account(
-        @JsonProperty("keyIndex")
+        @JsonProperty("keyIndex") @SerialName("keyIndex") val keyIndex: Int,
-        val keyIndex: Int,
+        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("name")
+        @JsonProperty("customImage") @SerialName("customImage") val customImage: String? = null,
-        val name: String,
+        @JsonProperty("defaultImageIndex") @SerialName("defaultImageIndex") val defaultImageIndex: Int,
-        @JsonProperty("customImage")
+        @JsonProperty("lockPin") @SerialName("lockPin") val lockPin: String? = null,
-        val customImage: String? = null,
-        @JsonProperty("defaultImageIndex")
-        val defaultImageIndex: Int,
-        @JsonProperty("lockPin")
-        val lockPin: String? = null,
     ) {
-        val image
+        @get:JsonIgnore
-            get() = customImage?.let { UiImage.Image(it) } ?: profileImages.getOrNull(
+        val image get() = customImage?.let { UiImage.Image(it) } ?:
-                defaultImageIndex
+            profileImages.getOrNull(defaultImageIndex)?.let {
-            )?.let { UiImage.Drawable(it) } ?: UiImage.Drawable(profileImages.first())
+                UiImage.Drawable(it)
+            } ?: UiImage.Drawable(profileImages.first())
     }
 
     const val TAG = "data_store_helper"
@@ -176,7 +185,7 @@ object DataStoreHelper {
      * Setting this does not automatically reload the homepage.
      */
     var currentHomePage: String?
-        get() = getKey("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
+        get() = getKey<String>("$currentAccount/$USER_SELECTED_HOMEPAGE_API")
         set(value) {
             val key = "$currentAccount/$USER_SELECTED_HOMEPAGE_API"
             if (value == null) {
@@ -188,7 +197,6 @@ object DataStoreHelper {
 
     fun setAccount(account: Account) {
         val homepage = currentHomePage
-
         selectedKeyIndex = account.keyIndex
         AccountManager.updateAccountIds()
         showToast(context?.getString(R.string.logged_account, account.name) ?: account.name)
@@ -206,7 +214,7 @@ object DataStoreHelper {
             currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account(
                 keyIndex = 0,
                 name = context.getString(R.string.default_account),
-                defaultImageIndex = 0
+                defaultImageIndex = 0,
             )
         }
     }
@@ -232,18 +240,21 @@ object DataStoreHelper {
         }
     }
 
+    @Serializable
     data class PosDur(
-        @JsonProperty("position") val position: Long,
+        @JsonProperty("position") @SerialName("position") val position: Long,
-        @JsonProperty("duration") val duration: Long
+        @JsonProperty("duration") @SerialName("duration") val duration: Long,
     )
 
     fun PosDur.fixVisual(): PosDur {
         if (duration <= 0) return PosDur(0, duration)
         val percentage = position * 100 / duration
-        if (percentage <= 1) return PosDur(0, duration)
+        return when {
-        if (percentage <= 5) return PosDur(5 * duration / 100, duration)
+            percentage <= 1 -> PosDur(0, duration)
-        if (percentage >= 95) return PosDur(duration, duration)
+            percentage <= 5 -> PosDur(5 * duration / 100, duration)
-        return this
+            percentage >= 95 -> PosDur(duration, duration)
+            else -> this
+        }
     }
 
     fun Int.toYear(): Date =
@@ -251,28 +262,38 @@ object DataStoreHelper {
 
     /**
      * Used to display notifications on new episodes and posters in library.
-     **/
+     */
+    @Serializable
     abstract class LibrarySearchResponse(
-        @JsonProperty("id") override var id: Int?,
+       /**
-        @JsonProperty("latestUpdatedTime") open val latestUpdatedTime: Long,
+        * These fields are marked @Transient because this class is only ever serialized through
-        @JsonProperty("name") override val name: String,
+        * through its subclasses, which redeclare each property with their own @SerialName
-        @JsonProperty("url") override val url: String,
+        * annotations. Without @Transient here, kotlinx.serialization would try to
-        @JsonProperty("apiName") override val apiName: String,
+        * generate a serializer for the abstract base class itself (or double-serialize
-        @JsonProperty("type") override var type: TvType?,
+        * these fields), which fails/conflicts since these are meant to be overridden,
-        @JsonProperty("posterUrl") override var posterUrl: String?,
+        * not serialized directly from the parent.
-        @JsonProperty("year") open val year: Int?,
+        */
-        @JsonProperty("syncData") open val syncData: Map<String, String>?,
+        @Transient override var id: Int? = null,
-        @JsonProperty("quality") override var quality: SearchQuality?,
+        @Transient open val latestUpdatedTime: Long = 0L,
-        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>?,
+        @Transient override val name: String = "",
-        @JsonProperty("plot") open val plot: String? = null,
+        @Transient override val url: String = "",
-        @JsonProperty("score") override var score: Score? = null,
+        @Transient override val apiName: String = "",
-        @JsonProperty("tags") open val tags: List<String>? = null,
+        @Transient override var type: TvType? = null,
+        @Transient override var posterUrl: String? = null,
+        @Transient open val year: Int? = null,
+        @Transient open val syncData: Map<String, String>? = null,
+        @Transient override var quality: SearchQuality? = null,
+        @Transient override var posterHeaders: Map<String, String>? = null,
+        @Transient open val plot: String? = null,
+        @Transient override var score: Score? = null,
+        @Transient open val tags: List<String>? = null,
     ) : SearchResponse {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
+        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR
+            level = DeprecationLevel.ERROR,
         )
         var rating: Int? = null
             set(value) {
@@ -283,23 +304,26 @@ object DataStoreHelper {
             }
     }
 
+    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+    @KeepGeneratedSerializer
+    @Serializable(with = SubscribedData.Serializer::class)
     data class SubscribedData(
-        @JsonProperty("subscribedTime") val subscribedTime: Long,
+        @JsonProperty("subscribedTime") @SerialName("subscribedTime") val subscribedTime: Long,
-        @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
+        @JsonProperty("lastSeenEpisodeCount") @SerialName("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map<DubStatus, Int?>,
-        override var id: Int?,
+        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        override val latestUpdatedTime: Long,
+        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        override val name: String,
+        @JsonProperty("name") @SerialName("name") override val name: String,
-        override val url: String,
+        @JsonProperty("url") @SerialName("url") override val url: String,
-        override val apiName: String,
+        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        override var type: TvType?,
+        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        override var posterUrl: String?,
+        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        override val year: Int?,
+        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        override val syncData: Map<String, String>? = null,
+        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        override var quality: SearchQuality? = null,
+        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        override val plot: String? = null,
+        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        override var score: Score? = null,
+        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        override val tags: List<String>? = null,
+        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -314,8 +338,13 @@ object DataStoreHelper {
         posterHeaders,
         plot,
         score,
-        tags
+        tags,
     ) {
+        object Serializer : WriteOnlySerializer<SubscribedData>(
+            SubscribedData.generatedSerializer(),
+            setOf("rating"),
+        )
+
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -334,27 +363,30 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags
+                tags = this.tags,
             )
         }
     }
 
+    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+    @KeepGeneratedSerializer
+    @Serializable(with = BookmarkedData.Serializer::class)
     data class BookmarkedData(
-        @JsonProperty("bookmarkedTime") val bookmarkedTime: Long,
+        @JsonProperty("bookmarkedTime") @SerialName("bookmarkedTime") val bookmarkedTime: Long,
-        override var id: Int?,
+        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        override val latestUpdatedTime: Long,
+        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        override val name: String,
+        @JsonProperty("name") @SerialName("name") override val name: String,
-        override val url: String,
+        @JsonProperty("url") @SerialName("url") override val url: String,
-        override val apiName: String,
+        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        override var type: TvType?,
+        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        override var posterUrl: String?,
+        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        override val year: Int?,
+        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        override val syncData: Map<String, String>? = null,
+        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        override var quality: SearchQuality? = null,
+        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        override val plot: String? = null,
+        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        override var score: Score? = null,
+        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        override val tags: List<String>? = null,
+        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -367,8 +399,13 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot
+        plot,
     ) {
+        object Serializer : WriteOnlySerializer<BookmarkedData>(
+            BookmarkedData.generatedSerializer(),
+            setOf("rating"),
+        )
+
         fun toLibraryItem(id: String): SyncAPI.LibraryItem {
             return SyncAPI.LibraryItem(
                 name,
@@ -387,27 +424,30 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags
+                tags = this.tags,
             )
         }
     }
 
+    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
+    @KeepGeneratedSerializer
+    @Serializable(with = FavoritesData.Serializer::class)
     data class FavoritesData(
-        @JsonProperty("favoritesTime") val favoritesTime: Long,
+        @JsonProperty("favoritesTime") @SerialName("favoritesTime") val favoritesTime: Long,
-        override var id: Int?,
+        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        override val latestUpdatedTime: Long,
+        @JsonProperty("latestUpdatedTime") @SerialName("latestUpdatedTime") override val latestUpdatedTime: Long,
-        override val name: String,
+        @JsonProperty("name") @SerialName("name") override val name: String,
-        override val url: String,
+        @JsonProperty("url") @SerialName("url") override val url: String,
-        override val apiName: String,
+        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        override var type: TvType?,
+        @JsonProperty("type") @SerialName("type") override var type: TvType?,
-        override var posterUrl: String?,
+        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        override val year: Int?,
+        @JsonProperty("year") @SerialName("year") override val year: Int?,
-        override val syncData: Map<String, String>? = null,
+        @JsonProperty("syncData") @SerialName("syncData") override val syncData: Map<String, String>? = null,
-        override var quality: SearchQuality? = null,
+        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        override val plot: String? = null,
+        @JsonProperty("plot") @SerialName("plot") override val plot: String? = null,
-        override var score: Score? = null,
+        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
-        override val tags: List<String>? = null,
+        @JsonProperty("tags") @SerialName("tags") override val tags: List<String>? = null,
     ) : LibrarySearchResponse(
         id,
         latestUpdatedTime,
@@ -420,8 +460,13 @@ object DataStoreHelper {
         syncData,
         quality,
         posterHeaders,
-        plot
+        plot,
     ) {
+        object Serializer : WriteOnlySerializer<FavoritesData>(
+            FavoritesData.generatedSerializer(),
+            setOf("rating"),
+        )
+
         fun toLibraryItem(): SyncAPI.LibraryItem? {
             return SyncAPI.LibraryItem(
                 name,
@@ -440,31 +485,32 @@ object DataStoreHelper {
                 this.id,
                 plot = this.plot,
                 score = this.score,
-                tags = this.tags
+                tags = this.tags,
             )
         }
     }
 
+    @Serializable
     data class ResumeWatchingResult(
-        @JsonProperty("name") override val name: String,
+        @JsonProperty("name") @SerialName("name") override val name: String,
-        @JsonProperty("url") override val url: String,
+        @JsonProperty("url") @SerialName("url") override val url: String,
-        @JsonProperty("apiName") override val apiName: String,
+        @JsonProperty("apiName") @SerialName("apiName") override val apiName: String,
-        @JsonProperty("type") override var type: TvType? = null,
+        @JsonProperty("type") @SerialName("type") override var type: TvType? = null,
-        @JsonProperty("posterUrl") override var posterUrl: String?,
+        @JsonProperty("posterUrl") @SerialName("posterUrl") override var posterUrl: String?,
-        @JsonProperty("watchPos") val watchPos: PosDur?,
+        @JsonProperty("watchPos") @SerialName("watchPos") val watchPos: PosDur?,
-        @JsonProperty("id") override var id: Int?,
+        @JsonProperty("id") @SerialName("id") override var id: Int?,
-        @JsonProperty("parentId") val parentId: Int?,
+        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int?,
-        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("season") val season: Int?,
+        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
-        @JsonProperty("quality") override var quality: SearchQuality? = null,
+        @JsonProperty("quality") @SerialName("quality") override var quality: SearchQuality? = null,
-        @JsonProperty("posterHeaders") override var posterHeaders: Map<String, String>? = null,
+        @JsonProperty("posterHeaders") @SerialName("posterHeaders") override var posterHeaders: Map<String, String>? = null,
-        @JsonProperty("score") override var score: Score? = null,
+        @JsonProperty("score") @SerialName("score") override var score: Score? = null,
     ) : SearchResponse
 
     /**
      * A datastore wide account for future implementations of a multiple account system
-     **/
+     */
 
     fun getAllWatchStateIds(): List<Int>? {
         val folder = "$currentAccount/$RESULT_WATCH_STATE"
@@ -500,7 +546,7 @@ object DataStoreHelper {
     }
 
     fun migrateResumeWatching() {
-        // if (getKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
+        // if (getKey<Boolean>(RESULT_RESUME_WATCHING_HAS_MIGRATED, false) != true) {
         setKey(RESULT_RESUME_WATCHING_HAS_MIGRATED, true)
         getAllResumeStateIdsOld()?.forEach { id ->
             getLastWatchedOld(id)?.let {
@@ -510,7 +556,7 @@ object DataStoreHelper {
                     it.episode,
                     it.season,
                     it.isFromDownload,
-                    it.updateTime
+                    it.updateTime,
                 )
                 removeLastWatchedOld(it.parentId)
             }
@@ -536,7 +582,7 @@ object DataStoreHelper {
                 episode,
                 season,
                 updateTime ?: System.currentTimeMillis(),
-                isFromDownload
+                isFromDownload,
             )
         )
     }
@@ -553,7 +599,7 @@ object DataStoreHelper {
 
     fun getLastWatched(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey(
+        return getKey<DownloadObjects.ResumeWatching>(
             "$currentAccount/$RESULT_RESUME_WATCHING",
             id.toString(),
         )
@@ -561,7 +607,7 @@ object DataStoreHelper {
 
     private fun getLastWatchedOld(id: Int?): DownloadObjects.ResumeWatching? {
         if (id == null) return null
-        return getKey(
+        return getKey<DownloadObjects.ResumeWatching>(
             "$currentAccount/$RESULT_RESUME_WATCHING_OLD",
             id.toString(),
         )
@@ -575,18 +621,18 @@ object DataStoreHelper {
 
     fun getBookmarkedData(id: Int?): BookmarkedData? {
         if (id == null) return null
-        return getKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
+        return getKey<BookmarkedData>("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString())
     }
 
     fun getAllBookmarkedData(): List<BookmarkedData> {
         return getKeys("$currentAccount/$RESULT_WATCH_STATE_DATA")?.mapNotNull {
-            getKey(it)
+            getKey<BookmarkedData>(it)
         } ?: emptyList()
     }
 
     fun getAllSubscriptions(): List<SubscribedData> {
         return getKeys("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA")?.mapNotNull {
-            getKey(it)
+            getKey<SubscribedData>(it)
         } ?: emptyList()
     }
 
@@ -598,12 +644,12 @@ object DataStoreHelper {
 
     /**
      * Set new seen episodes and update time
-     **/
+     */
     fun updateSubscribedData(id: Int?, data: SubscribedData?, episodeResponse: EpisodeResponse?) {
         if (id == null || data == null || episodeResponse == null) return
         val newData = data.copy(
             latestUpdatedTime = unixTimeMS,
-            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes()
+            lastSeenEpisodeCount = episodeResponse.getLatestEpisodes(),
         )
         setKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString(), newData)
     }
@@ -616,12 +662,12 @@ object DataStoreHelper {
 
     fun getSubscribedData(id: Int?): SubscribedData? {
         if (id == null) return null
-        return getKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
+        return getKey<SubscribedData>("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString())
     }
 
     fun getAllFavorites(): List<FavoritesData> {
         return getKeys("$currentAccount/$RESULT_FAVORITES_STATE_DATA")?.mapNotNull {
-            getKey(it)
+            getKey<FavoritesData>(it)
         } ?: emptyList()
     }
 
@@ -639,7 +685,7 @@ object DataStoreHelper {
 
     fun getFavoritesData(id: Int?): FavoritesData? {
         if (id == null) return null
-        return getKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
+        return getKey<FavoritesData>("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString())
     }
 
     fun setViewPos(id: Int?, pos: Long, dur: Long) {
@@ -648,10 +694,10 @@ object DataStoreHelper {
         setKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), PosDur(pos, dur))
     }
 
-    /** Sets the position, duration, and resume data of an episode/movie,
+    /**
-     *
+     * Sets the position, duration, and resume data of an episode/movie,
-     * if nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
+     * If nextEpisode is not specified it will not be able to set the next episode as resumable if progress > NEXT_WATCH_EPISODE_PERCENTAGE
-     * */
+     */
     fun setViewPosAndResume(id: Int?, position: Long, duration: Long, currentEpisode: Any?, nextEpisode: Any?) {
         setViewPos(id, position, duration)
         if (id != null) {
@@ -687,7 +733,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = false
+                        isFromDownload = false,
                     )
                 }
 
@@ -697,7 +743,7 @@ object DataStoreHelper {
                         resumeMeta.id,
                         resumeMeta.episode,
                         resumeMeta.season,
-                        isFromDownload = true
+                        isFromDownload = true,
                     )
                 }
             }
@@ -706,17 +752,16 @@ object DataStoreHelper {
 
     fun getViewPos(id: Int?): PosDur? {
         if (id == null) return null
-        return getKey("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
+        return getKey<PosDur>("$currentAccount/$VIDEO_POS_DUR", id.toString(), null)
     }
 
     fun getVideoWatchState(id: Int?): VideoWatchState? {
         if (id == null) return null
-        return getKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
+        return getKey<VideoWatchState>("$currentAccount/$VIDEO_WATCH_STATE", id.toString(), null)
     }
 
     fun setVideoWatchState(id: Int?, watchState: VideoWatchState) {
         if (id == null) return
-
         // None == No key
         if (watchState == VideoWatchState.None) {
             removeKey("$currentAccount/$VIDEO_WATCH_STATE", id.toString())
@@ -727,7 +772,7 @@ object DataStoreHelper {
 
     fun getDub(id: Int): DubStatus? {
         return DubStatus.entries
-            .getOrNull(getKey("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
+            .getOrNull(getKey<Int>("$currentAccount/$RESULT_DUB", id.toString(), -1) ?: -1)
     }
 
     fun setDub(id: Int, status: DubStatus) {
@@ -748,13 +793,13 @@ object DataStoreHelper {
             getKey<Int>(
                 "$currentAccount/$RESULT_WATCH_STATE",
                 id.toString(),
-                null
+                null,
             )
         )
     }
 
     fun getResultSeason(id: Int): Int? {
-        return getKey("$currentAccount/$RESULT_SEASON", id.toString(), null)
+        return getKey<Int>("$currentAccount/$RESULT_SEASON", id.toString(), null)
     }
 
     fun setResultSeason(id: Int, value: Int?) {
@@ -762,7 +807,7 @@ object DataStoreHelper {
     }
 
     fun getResultEpisode(id: Int): Int? {
-        return getKey("$currentAccount/$RESULT_EPISODE", id.toString(), null)
+        return getKey<Int>("$currentAccount/$RESULT_EPISODE", id.toString(), null)
     }
 
     fun setResultEpisode(id: Int, value: Int?) {
@@ -775,12 +820,11 @@ object DataStoreHelper {
 
     fun getSync(id: Int, idPrefixes: List<String>): List<String?> {
         return idPrefixes.map { idPrefix ->
-            getKey("${idPrefix}_sync", id.toString())
+            getKey<String>("${idPrefix}_sync", id.toString())
         }
     }
 
     var pinnedProviders: Array<String>
-        get() = getKey(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
+        get() = getKey<Array<String>>(USER_PINNED_PROVIDERS) ?: emptyArray<String>()
         set(value) = setKey(USER_PINNED_PROVIDERS, value)
-
 }

app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt

@@ -72,7 +72,7 @@ object SyncUtil {
             // Gogoanime, Twistmoe and 9anime
             val url = "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/pages/$site/$slug.json"
             val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).text
-            val mapped = tryParseJson<MalSyncPage?>(response)
+            val mapped = tryParseJson<MalSyncPage>(response)
 
             val overrideMal = mapped?.malId ?: mapped?.mal?.id ?: mapped?.anilist?.malId
             val overrideAnilist = mapped?.aniId ?: mapped?.anilist?.id

app/src/main/java/com/lagradost/cloudstream3/utils/TvChannelUtils.kt

@@ -23,15 +23,15 @@ const val PROGRAM_ID_LIST_KEY = "persistent_program_ids"
 
 object TvChannelUtils {
     fun Context.saveProgramId(programId: Long) {
-        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = (existing + programId).distinct()
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }
     fun Context.getStoredProgramIds(): List<Long> {
-        return getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        return getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
     }
     fun Context.removeProgramId(programId: Long) {
-        val existing: List<Long> = getKey(PROGRAM_ID_LIST_KEY) ?: emptyList()
+        val existing: List<Long> = getKey<List<Long>>(PROGRAM_ID_LIST_KEY) ?: emptyList()
         val updated = existing.filter { it != programId }
         setKey(PROGRAM_ID_LIST_KEY, updated)
     }

app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt

@@ -65,9 +65,12 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.palette.graphics.Palette
 import androidx.preference.PreferenceManager
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
+import com.google.android.material.progressindicator.CircularProgressIndicatorSpec
+import com.google.android.material.progressindicator.IndeterminateDrawable
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
@@ -583,6 +586,43 @@ object UIHelper {
         }
     }
 
+    /**
+     * Source: https://stackoverflow.com/questions/70954321/circular-progress-indicator-inside-buttons-android-material-design
+     *
+     * Shows indeterminate progress bar on this button in place of where icon would be.
+     * By default the tint of progress bar is the same as iconTint.
+     *
+     * @param tintColor (@ColorInt Int) Sets custom progress bar tint color.
+     */
+    fun MaterialButton.showProgress(@ColorInt tintColor: Int = this.iconTint.defaultColor) =
+        // Use runOnMainThreadNative to allow process on io threads, to make the code a bit cleaner
+        runOnMainThreadNative {
+            // No need to set it again, as then it will reset the animation
+            if(this.icon is IndeterminateDrawable<*>) {
+                return@runOnMainThreadNative
+            }
+            val spec = CircularProgressIndicatorSpec(
+                context, null, 0,
+                com.google.android.material.R.style.Widget_Material3_CircularProgressIndicator_ExtraSmall
+            )
+
+            spec.indicatorColors = intArrayOf(tintColor)
+
+            val progressIndicatorDrawable =
+                IndeterminateDrawable.createCircularDrawable(context, spec)
+
+            this.icon = progressIndicatorDrawable
+            if (this.getTag(R.id.text1) == null)
+                this.setTag(R.id.text1, this.text)
+            this.text = ""
+        }
+
+    fun MaterialButton.hideProgress() =
+        runOnMainThreadNative {
+            this.text = this.getTag(R.id.text1) as? String
+            this.icon = null
+        }
+
     /**id, stringRes */
     @SuppressLint("RestrictedApi")
     fun View.popupMenuNoIcons(

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt

@@ -1640,11 +1640,11 @@ object VideoDownloadManager {
     }
 
     fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? {
-        return context.getKey(KEY_RESUME_PACKAGES, id.toString())
+        return context.getKey<DownloadResumePackage>(KEY_RESUME_PACKAGES, id.toString())
     }
 
     fun getDownloadQueuePackage(context: Context, id: Int): DownloadQueueWrapper? {
-        return context.getKey(KEY_RESUME_IN_QUEUE, id.toString())
+        return context.getKey<DownloadQueueWrapper>(KEY_RESUME_IN_QUEUE, id.toString())
     }
 
     fun getDownloadEpisodeMetadata(

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt

@@ -1,23 +1,32 @@
 package com.lagradost.cloudstream3.utils.downloader
 
 import android.net.Uri
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SkipSerializationTest
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.services.DownloadQueueService
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.serializers.UriSerializer
+import com.lagradost.cloudstream3.utils.serializers.WriteOnlySerializer
 import com.lagradost.safefile.SafeFile
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KeepGeneratedSerializer
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.io.IOException
 import java.io.OutputStream
 import java.util.Objects
 
 object DownloadObjects {
     /** An item can either be something to resume or something new to start */
+    @Serializable
     data class DownloadQueueWrapper(
-        @JsonProperty("resumePackage") val resumePackage: DownloadResumePackage?,
+        @JsonProperty("resumePackage") @SerialName("resumePackage") val resumePackage: DownloadResumePackage?,
-        @JsonProperty("downloadItem") val downloadItem: DownloadQueueItem?,
+        @JsonProperty("downloadItem") @SerialName("downloadItem") val downloadItem: DownloadQueueItem?,
     ) {
         init {
             assert(resumePackage != null || downloadItem != null) {
@@ -26,56 +35,66 @@ object DownloadObjects {
         }
 
         /** Loop through the current download instances to see if it is currently downloading. Also includes link loading. */
+        @JsonIgnore
         fun isCurrentlyDownloading(): Boolean {
             return DownloadQueueService.downloadInstances.value.any { it.downloadQueueWrapper.id == this.id }
         }
 
-        @JsonProperty("id")
+        @JsonProperty("id") @SerialName("id")
         val id = resumePackage?.item?.ep?.id ?: downloadItem!!.episode.id
 
-        @JsonProperty("parentId")
+        @JsonProperty("parentId") @SerialName("parentId")
         val parentId = resumePackage?.item?.ep?.parentId ?: downloadItem!!.episode.parentId
     }
 
     /** General data about the episode and show to start a download from. */
+    @Serializable
     data class DownloadQueueItem(
-        @JsonProperty("episode") val episode: ResultEpisode,
+        @JsonProperty("episode") @SerialName("episode") val episode: ResultEpisode,
-        @JsonProperty("isMovie") val isMovie: Boolean,
+        @JsonProperty("isMovie") @SerialName("isMovie") val isMovie: Boolean,
-        @JsonProperty("resultName") val resultName: String,
+        @JsonProperty("resultName") @SerialName("resultName") val resultName: String,
-        @JsonProperty("resultType") val resultType: TvType,
+        @JsonProperty("resultType") @SerialName("resultType") val resultType: TvType,
-        @JsonProperty("resultPoster") val resultPoster: String?,
+        @JsonProperty("resultPoster") @SerialName("resultPoster") val resultPoster: String?,
-        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-        @JsonProperty("resultId") val resultId: Int,
+        @JsonProperty("resultId") @SerialName("resultId") val resultId: Int,
-        @JsonProperty("resultUrl") val resultUrl: String,
+        @JsonProperty("resultUrl") @SerialName("resultUrl") val resultUrl: String,
-        @JsonProperty("links") val links: List<ExtractorLink>? = null,
+        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>? = null,
-        @JsonProperty("subs") val subs: List<SubtitleData>? = null,
+        @JsonProperty("subs") @SerialName("subs") val subs: List<SubtitleData>? = null,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(null, this)
         }
     }
 
+    interface DownloadCached {
+        val id: Int
+    }
 
-    abstract class DownloadCached(
+    @OptIn(ExperimentalSerializationApi::class) // KeepGeneratedSerializer is an experimental annotation for now
-        @JsonProperty("id") open val id: Int,
+    @KeepGeneratedSerializer
+    @Serializable(with = DownloadEpisodeCached.Serializer::class)
+    data class DownloadEpisodeCached(
+        @JsonProperty("name") @SerialName("name") val name: String?,
+        @JsonProperty("poster") @SerialName("poster") val poster: String?,
+        @JsonProperty("episode") @SerialName("episode") val episode: Int,
+        @JsonProperty("season") @SerialName("season") val season: Int?,
+        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
+        @JsonProperty("score") @SerialName("score") var score: Score? = null,
+        @JsonProperty("description") @SerialName("description") val description: String?,
+        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
+        @JsonProperty("id") @SerialName("id") override val id: Int,
+    ) : DownloadCached {
+        object Serializer : WriteOnlySerializer<DownloadEpisodeCached>(
+            DownloadEpisodeCached.generatedSerializer(),
+            setOf("rating"),
         )
 
-    data class DownloadEpisodeCached(
-        @JsonProperty("name") val name: String?,
-        @JsonProperty("poster") val poster: String?,
-        @JsonProperty("episode") val episode: Int,
-        @JsonProperty("season") val season: Int?,
-        @JsonProperty("parentId") val parentId: Int,
-        @JsonProperty("score") var score: Score? = null,
-        @JsonProperty("description") val description: String?,
-        @JsonProperty("cacheTime") val cacheTime: Long,
-        override val id: Int,
-    ) : DownloadCached(id) {
         @JsonProperty("rating", access = JsonProperty.Access.WRITE_ONLY)
+        @SerialName("rating")
         @Deprecated(
             "`rating` is the old scoring system, use score instead",
             replaceWith = ReplaceWith("score"),
-            level = DeprecationLevel.ERROR
+            level = DeprecationLevel.ERROR,
         )
         var rating: Int? = null
             set(value) {
@@ -87,74 +106,81 @@ object DownloadObjects {
     }
 
     /** What to display to the user for a downloaded show/movie. Includes info such as name, poster and url */
+    @Serializable
     data class DownloadHeaderCached(
-        @JsonProperty("apiName") val apiName: String,
+        @JsonProperty("apiName") @SerialName("apiName") val apiName: String,
-        @JsonProperty("url") val url: String,
+        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("type") val type: TvType,
+        @JsonProperty("type") @SerialName("type") val type: TvType,
-        @JsonProperty("name") val name: String,
+        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("cacheTime") val cacheTime: Long,
+        @JsonProperty("cacheTime") @SerialName("cacheTime") val cacheTime: Long,
-        override val id: Int,
+        @JsonProperty("id") @SerialName("id") override val id: Int,
-    ) : DownloadCached(id)
+    ) : DownloadCached
 
+    @Serializable
     data class DownloadResumePackage(
-        @JsonProperty("item") val item: DownloadItem,
+        @JsonProperty("item") @SerialName("item") val item: DownloadItem,
         /** Tills which link should get resumed */
-        @JsonProperty("linkIndex") val linkIndex: Int?,
+        @JsonProperty("linkIndex") @SerialName("linkIndex") val linkIndex: Int?,
     ) {
         fun toWrapper(): DownloadQueueWrapper {
             return DownloadQueueWrapper(this, null)
         }
     }
 
+    @Serializable
     data class DownloadItem(
-        @JsonProperty("source") val source: String?,
+        @JsonProperty("source") @SerialName("source") val source: String?,
-        @JsonProperty("folder") val folder: String?,
+        @JsonProperty("folder") @SerialName("folder") val folder: String?,
-        @JsonProperty("ep") val ep: DownloadEpisodeMetadata,
+        @JsonProperty("ep") @SerialName("ep") val ep: DownloadEpisodeMetadata,
-        @JsonProperty("links") val links: List<ExtractorLink>,
+        @JsonProperty("links") @SerialName("links") val links: List<ExtractorLink>,
     )
 
     /** Metadata for a specific episode and how to display it. */
+    @Serializable
     data class DownloadEpisodeMetadata(
-        @JsonProperty("id") val id: Int,
+        @JsonProperty("id") @SerialName("id") val id: Int,
-        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("mainName") val mainName: String,
+        @JsonProperty("mainName") @SerialName("mainName") val mainName: String,
-        @JsonProperty("sourceApiName") val sourceApiName: String?,
+        @JsonProperty("sourceApiName") @SerialName("sourceApiName") val sourceApiName: String?,
-        @JsonProperty("poster") val poster: String?,
+        @JsonProperty("poster") @SerialName("poster") val poster: String?,
-        @JsonProperty("name") val name: String?,
+        @JsonProperty("name") @SerialName("name") val name: String?,
-        @JsonProperty("season") val season: Int?,
+        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("type") val type: TvType?,
+        @JsonProperty("type") @SerialName("type") val type: TvType?,
     )
 
-
+    @Serializable
     data class DownloadedFileInfo(
-        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
-        @JsonProperty("relativePath") val relativePath: String,
+        @JsonProperty("relativePath") @SerialName("relativePath") val relativePath: String,
-        @JsonProperty("displayName") val displayName: String,
+        @JsonProperty("displayName") @SerialName("displayName") val displayName: String,
-        @JsonProperty("extraInfo") val extraInfo: String? = null,
+        @JsonProperty("extraInfo") @SerialName("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        @JsonProperty("basePath") @SerialName("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
         // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
-        @JsonProperty("linkHash") val linkHash : Int? = null
+        @JsonProperty("linkHash") @SerialName("linkHash") val linkHash: Int? = null,
     )
 
+    @Serializable
+    @SkipSerializationTest // Uri has issues with Jackson
     data class DownloadedFileInfoResult(
-        @JsonProperty("fileLength") val fileLength: Long,
+        @JsonProperty("fileLength") @SerialName("fileLength") val fileLength: Long,
-        @JsonProperty("totalBytes") val totalBytes: Long,
+        @JsonProperty("totalBytes") @SerialName("totalBytes") val totalBytes: Long,
-        @JsonProperty("path") val path: Uri,
+        @JsonProperty("path") @SerialName("path")
+        @Serializable(with = UriSerializer::class)
+        val path: Uri,
     )
 
-
+    @Serializable
     data class ResumeWatching(
-        @JsonProperty("parentId") val parentId: Int,
+        @JsonProperty("parentId") @SerialName("parentId") val parentId: Int,
-        @JsonProperty("episodeId") val episodeId: Int?,
+        @JsonProperty("episodeId") @SerialName("episodeId") val episodeId: Int?,
-        @JsonProperty("episode") val episode: Int?,
+        @JsonProperty("episode") @SerialName("episode") val episode: Int?,
-        @JsonProperty("season") val season: Int?,
+        @JsonProperty("season") @SerialName("season") val season: Int?,
-        @JsonProperty("updateTime") val updateTime: Long,
+        @JsonProperty("updateTime") @SerialName("updateTime") val updateTime: Long,
-        @JsonProperty("isFromDownload") val isFromDownload: Boolean,
+        @JsonProperty("isFromDownload") @SerialName("isFromDownload") val isFromDownload: Boolean,
     )
 
-
     data class DownloadStatus(
         /** if you should retry with the same args and hope for a better result */
         val retrySame: Boolean,
@@ -164,14 +190,13 @@ object DownloadObjects {
         val success: Boolean,
     )
 
-
     data class CreateNotificationMetadata(
         val type: VideoDownloadManager.DownloadType,
         val bytesDownloaded: Long,
         val bytesTotal: Long,
         val hlsProgress: Long? = null,
         val hlsTotal: Long? = null,
-        val bytesPerSecond: Long
+        val bytesPerSecond: Long,
     )
 
     data class StreamData(
@@ -198,9 +223,11 @@ object DownloadObjects {
         val exists: Boolean get() = file.exists() == true
     }
 
-
+    /**
-    /** bytes have the size end-start where the byte range is [start,end)
+     * Bytes have the size end-start where the byte range is [start,end)
-     * note that ByteArray is a pointer and therefore cant be stored without cloning it */
+     * note that ByteArray is a pointer and therefore can't be stored
+     * without cloning it.
+     */
     data class LazyStreamDownloadResponse(
         val bytes: ByteArray,
         val startByte: Long,

app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt

@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.utils.serializers
 
 import android.net.Uri
+import com.lagradost.cloudstream3.InternalAPI
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
@@ -26,6 +27,7 @@ import kotlinx.serialization.encoding.Encoder
  *       val uri: Uri,
  *   )
  */
+@InternalAPI
 object UriSerializer : KSerializer<Uri> {
     override val descriptor: SerialDescriptor = 
         PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)

app/src/main/res/layout/cast_item.xml

@@ -47,6 +47,7 @@
             </androidx.cardview.widget.CardView>
 
             <androidx.cardview.widget.CardView
+                android:id="@+id/voice_actor_image_holder2"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
                 android:foreground="@drawable/outline_drawable"

app/src/main/res/values-b+bn/strings.xml

@@ -353,4 +353,5 @@
     <string name="play_from_beginning_img_des">শুরু থেকে চালু করুন</string>
     <string name="speech_recognition_unavailable">স্পিচ রিকগনিশন উপলব্ধ নেই</string>
     <string name="begin_speaking">কথা বলা শুরু করুন…</string>
+    <string name="download_queue">ডাউনলোড তালিকা</string>
 </resources>

app/src/main/res/values-b+ja/strings.xml

@@ -730,4 +730,7 @@
     <string name="source_priority">ソースの優先順位</string>
     <string name="source_priority_help">プレイヤーでのビデオソースの並び順を設定します</string>
     <string name="show_player_metadata_overlay">プレイヤーメタデータオーバーレイを表示</string>
+    <string name="video_singular">動画</string>
+    <string name="skip_type_preview">プレビュー</string>
+    <string name="player_is_live">ライブ</string>
 </resources>

app/src/main/res/values-b+lt/strings.xml

@@ -25,18 +25,18 @@
     <string name="sort_copy">Kopijuoti</string>
     <string name="benene_des">Duoti bananai</string>
     <string name="home_more_info">Daugiau informacijos</string>
-    <string name="title_downloads">Atsiuntimai</string>
+    <string name="title_downloads">Atsisiuntimai</string>
     <string name="subs_auto_select_language">Automatiškai pasirinkti kalbą</string>
     <string name="error_loading_links_toast">Klaida kraunant nuorodas</string>
     <string name="go_forward_30">+30</string>
-    <string name="download_done">Atsiuntimas baigtas</string>
+    <string name="download_done">Atsisiuntimas baigtas</string>
     <string name="continue_watching">Tęsti žiūrėjimą</string>
     <string name="new_update_format" formatted="true">Rastas atnaujinimas!\n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Atsisiųsti kalbas</string>
     <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
     <string name="go_back_img_des">Grįžti atgal</string>
     <string name="downloading">Siunčiama</string>
-    <string name="episode_more_options_des">Daugiau pasirinkčiu</string>
+    <string name="episode_more_options_des">Daugiau parinkčių</string>
     <string name="play_episode">Paleisti seriją</string>
     <string name="player_speed">Grotuvo greitis</string>
     <string name="benene_count_text">%d Bananai duoti kūrėjams</string>
@@ -45,7 +45,7 @@
     <string name="result_tags">Žanrai</string>
     <string name="go_back_30">-30</string>
     <string name="episode_poster_img_des">Serijos plakatas</string>
-    <string name="vpn_might_be_needed">Gali reikėti VPN šitam tiekėjui, kad veiktų teisingai</string>
+    <string name="vpn_might_be_needed">Gali reikėti VPN šiam tiekėjui, kad veiktų teisingai</string>
     <string name="search_hint_site" formatted="true">Ieškoti %s…</string>
     <string name="github">Github</string>
     <string name="benene_count_text_none">Nėra duotu bananų</string>
@@ -66,7 +66,7 @@
     <string name="cancel">Atšaukti</string>
     <string name="start">Pradėti</string>
     <string name="cartoons_singular">Filmukas</string>
-    <string name="download_canceled">Atsiuntimas atšauktas</string>
+    <string name="download_canceled">Atsisiuntimas atšauktas</string>
     <string name="advanced_search">Išplėstinė paieška</string>
     <string name="empty_library_logged_in_message">Tuščias sąrašas. Pabandykite pasirinkti kitą sąrašą.</string>
     <string name="chromecast_subtitles_settings">Chromecast subtitrai</string>
@@ -93,10 +93,10 @@
     <string name="type_completed">Užbaigta</string>
     <string name="use_system_brightness_settings_des">Naudoti sistemos ryškumą programos grotuve vietoj tamsumo</string>
     <string name="restore_failed_format" formatted="true">Nepavyko atstatyti duomenis iš failo %s</string>
-    <string name="play_trailer_button">Paleisti anonsa</string>
+    <string name="play_trailer_button">Paleisti anonsą</string>
-    <string name="play_livestream_button">Paleisti gyva transliacija</string>
+    <string name="play_livestream_button">Paleisti gyvą transliaciją</string>
     <string name="no_episodes_found">Nerasta serijų</string>
-    <string name="vpn_torrent">Šis tiekėjas yra iš Torrentų, VPN rekomenduojama naudoti</string>
+    <string name="vpn_torrent">Šis tiekėjas yra iš Torrent\'ų, rekomenduojamas VPN</string>
     <string name="test_failed">Nepavyko</string>
     <string name="result_poster_img_des">Plakatas</string>
     <string name="popup_play_file">Paleisti failą</string>
@@ -108,21 +108,21 @@
     <string name="redo_setup_process">Perdaryti nustatymo procesą</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="benene">Duoti bananą kūrėjams</string>
-    <string name="go_back">Sugryšti</string>
+    <string name="go_back">Sugrįšti</string>
     <string name="copy_link_toast">Nuoroda nukopijuota į iškarpinę</string>
     <string name="search">Paieška</string>
     <string name="settings_info">Informacija</string>
-    <string name="skip_loading">Praleisti įkėlima</string>
+    <string name="skip_loading">Praleisti įkėlimą</string>
     <string name="home_info">Informacija</string>
     <string name="next_episode_format" formatted="true">Serija %d bus išleista</string>
     <string name="sort_save">Išsaugoti</string>
     <string name="clipboard_too_large">Perdaug teksto. Nepavyko išsaugoti i iškarpynę.</string>
-    <string name="download_failed">Atsiuntimas nepavyko</string>
+    <string name="download_failed">Atsisiuntimas nepavyko</string>
     <string name="result_share">Pasidalinti</string>
     <string name="home_main_poster_img_des">Pagrindinis Plakatas</string>
     <string name="pick_source">Šaltiniai</string>
     <string name="title_settings">Nustatymai</string>
-    <string name="title_search">Ieškoti</string>
+    <string name="title_search">Paieška</string>
     <string name="loading">Kraunama…</string>
     <string name="action_remove_watching">Pašalinti</string>
     <string name="action_open_watching">Daugiau informacijos</string>
@@ -138,7 +138,7 @@
     <string name="sort_close">Uždaryti</string>
     <string name="action_add_to_bookmarks">Nustatyti žiūrėjimo statusą</string>
     <string name="play_with_app_name">Paleisti su CloudStream</string>
-    <string name="subs_subtitle_elevation">Subtitrų iškėlimas</string>
+    <string name="subs_subtitle_elevation">Subtitrų lygis</string>
     <string name="episodes">Serijos</string>
     <string name="cast_format" formatted="true">Skleisti: %s</string>
     <string name="season">Sezonas</string>
@@ -248,4 +248,51 @@
     <string name="confirm_exit_dialog">Ar tikrai norite išeiti?</string>
     <string name="action_remove_from_watched">Pašalinti iš žiūrimų</string>
     <string name="audio_tracks">Garso takelis</string>
+    <string name="filler" formatted="true">Užpildymas</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="title_home">Namai</string>
+    <string name="download_queue">Atsisiuntimų eilė</string>
+    <string name="speech_recognition_unavailable">Balso atpažinimas nepasiekiamas</string>
+    <string name="begin_speaking">Pradėkite kalbėti…</string>
+    <string name="type_dropped">Nežiūrimas</string>
+    <string name="play_full_series_button">Paleisti visą seriją</string>
+    <string name="torrent_info">Šis įrašas yra Torrent\'e, tai reiškia, kad tavo įrašo veikla gali būti sekama. Įsitikinkite, kad suprantate Torrenting prieš tęsiant.</string>
+    <string name="reload_error">Atkurti ryšį…</string>
+    <string name="downloads_delete_select">Pasirinkite elementus, kuriuos norite pašalinti</string>
+    <string name="downloads_empty">Šiuo metu atsisiuntimų nėra.</string>
+    <string name="queue_empty_message">Šiuo metu atsisiuntimų eilėje nėra.</string>
+    <string name="offline_file">Pasiekiama žiūrėti neprisijungus</string>
+    <string name="select_all">Pasirinkti viską</string>
+    <string name="deselect_all">Panaikinti visus pasirinkimus</string>
+    <string name="stream">Tinklo srautas</string>
+    <string name="open_local_video">Atidaryti vietinį video</string>
+    <string name="links_reloaded_toast">Nuorodos perkrautos</string>
+    <string name="app_subbed_text">Subtitrai</string>
+    <string name="repo_copy_label">Repozitorijos pavadinimas ir adresas</string>
+    <string name="toast_copied">nukopijuota!</string>
+    <string name="subscribe_tooltip">Naujos serijos pranešimas</string>
+    <string name="result_search_tooltip">Ieškoti kituose plėtiniuose</string>
+    <string name="recommendations_tooltip">Rodyti rekomendacijas</string>
+    <string name="subs_outline_color">Apvado spalva</string>
+    <string name="subs_edge_type">Rėmelio tipas</string>
+    <string name="search_provider_text_types">Ieškoti naudojant tipus</string>
+    <string name="subs_hold_to_reset_to_default">Laikyti ilgai, kad sugražinti pradinius nustatymus</string>
+    <string name="subs_import_text" formatted="true">Įkelti šriftus sudedant juos į %s</string>
+    <string name="provider_info_meta">Metaduomenys nesuteikiamos svetainės, vaizdo įkėlimas nepavyks, jeigu jo nebus svetainėje.</string>
+    <string name="torrent_plot">Aprašymas</string>
+    <string name="normal_no_plot">Nėra siužeto aprašymo</string>
+    <string name="torrent_no_plot">Aprašymas nerastas</string>
+    <string name="show_log_cat">Rodyti Logcat</string>
+    <string name="picture_in_picture">Vaizdas vaizde</string>
+    <string name="picture_in_picture_des">Tęsia atkūrimą mažame grotuve virš kitų programų</string>
+    <string name="player_size_settings">Grotuvo dydžio pakeitimo mygtukas</string>
+    <string name="player_size_settings_des">Pašalinti juodas paraštes</string>
+    <string name="player_subtitles_settings">Subtitrai</string>
+    <string name="chromecast_subtitles_settings_des">Chromecast subtitrų nustatymai</string>
+    <string name="eigengraumode_settings">Atkūrimo sparta</string>
+    <string name="speed_setting_summary">Prideda greičio pasirinkimą grotuve</string>
+    <string name="swipe_to_seek_settings">Braukite, kas ieškotumėte</string>
+    <string name="swipe_to_seek_settings_des">Braukite į šonus, kad kontroliuotumėte padėtį vaizdo įraše</string>
+    <string name="swipe_to_change_settings">Braukite, kad pakeistumėte nustatymus</string>
+    <string name="swipe_to_change_settings_des">Braukite aukštyn arba žemyn ekrano kairėje arba dešinėje, jei norite pakeisti ryškumą arba garsą</string>
 </resources>

app/src/main/res/values-b+lv/strings.xml

@@ -287,12 +287,12 @@
     <string name="pref_category_defaults">Parasts</string>
     <string name="pref_category_looks">Izskats</string>
     <string name="pref_category_ui_features">Funkcijas</string>
-    <string name="category_general">Ģenerāls</string>
+    <string name="category_general">Vispārīgie</string>
     <string name="random_button_settings">Randomā poga</string>
     <string name="random_button_settings_desc">Rādīt izlases pogu Sākums un Bibliotēka sadaļās</string>
     <string name="provider_lang_settings">Papildinājuma valodas</string>
     <string name="app_layout">Lietotnes izkārtojums</string>
-    <string name="preferred_media_settings">Izvēlētā media</string>
+    <string name="preferred_media_settings">Vēlamie multimediji</string>
     <string name="enable_nsfw_on_providers">Iespējot nepiedienīgu, izaicinošu saturu (NSFW) atbalstītajos papildinājumos</string>
     <string name="subtitles_encoding">Subtitru kodējums</string>
     <string name="category_providers">Devēji</string>
@@ -372,7 +372,7 @@
     <string name="error">Kļūda</string>
     <string name="subtitles_remove_captions">Noņemt slēgtos parakstus no subtitriem</string>
     <string name="subtitles_remove_bloat">Noņemt lieko no subtitriem (piemēram, reklāmu)</string>
-    <string name="subtitles_filter_lang">Filtrēt pēc vēlamās multivides valodas</string>
+    <string name="subtitles_filter_lang">Atlasīt pēc vēlamās multimediju valodas</string>
     <string name="extras">Ekstras</string>
     <string name="trailer">Treileris</string>
     <string name="network_adress_example">https://piemērs.com/piemērs.mp4</string>
@@ -382,7 +382,7 @@
     <string name="previous">Iepriekšējais</string>
     <string name="skip_setup">Izlaist uzstādīšanu</string>
     <string name="app_layout_subtext">Mainiet lietotnes izskatu, lai tā atbilstu savai ierīcei</string>
-    <string name="preferred_media_subtext">Ko tu vēlies redzēt</string>
+    <string name="preferred_media_subtext">Ko jūs vēlētos skatīt</string>
     <string name="setup_done">Pabeigts</string>
     <string name="extensions">Papildinājumi</string>
     <string name="add_repository">Pievienot repozitoriju</string>
@@ -607,4 +607,11 @@
     <string name="delete_message_series_only" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst visas šī seriāla, raidījuma epizodes?\n\n%s</string>
     <string name="queue_empty_message">Pašlaik nav nevienas rindā ievietotas lejupielādes.</string>
     <string name="open_local_video">Atvērt vietējo video</string>
+    <string name="custom_media_singular">Multimedija</string>
+    <string name="video_info">Multimediju informācija</string>
+    <string name="torrent_preferred_media">Iespējojiet torrentu Iestatījumi/Pakalpojumu sniedzēji/Vēlamie multimediji sadaļā</string>
+    <string name="subscribe_tooltip">Paziņojums par jaunu epizodi</string>
+    <string name="extra_brightness_settings">Papildu spilgtums</string>
+    <string name="extra_brightness_key">Papildu spilgtums iespējots</string>
+    <string name="search_suggestions">Meklēšanas ieteikumi</string>
 </resources>

app/src/main/res/values-b+nl/strings.xml

@@ -677,4 +677,9 @@
     <string name="confirm_before_exiting_title">Bevestig voor afsluiten</string>
     <string name="confirm_before_exiting_desc">Toon dialoogvenster voordat de app wordt afgesloten</string>
     <string name="subs_edge_size">Randgrote</string>
+    <string name="show_player_metadata_overlay">Laat Speler Metadata Overlay zien</string>
+    <string name="device_pin_error_message">Kon de apparaat PIN niet vinden, probeer locale authenticatie</string>
+    <string name="torrent_preferred_media">Zet torrent aan in Instellingen/Providers/Media voorkeur</string>
+    <string name="torrent_not_accepted">Herstart de app en accepteer de Stream Torrent pop-up om verder te gaan.</string>
+    <string name="update_plugins_manually">Handmatige Update Knop</string>
 </resources>

fastlane/metadata/android/ar-SA/title.txt

@@ -1 +1 @@
-كلاودستريم
+CloudStream

gradle/libs.versions.toml

@@ -26,10 +26,10 @@ junit = "4.13.2"
 junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
-kotlinGradlePlugin = "2.3.20"
+kotlinGradlePlugin = "2.4.0"
 kotlinxAtomicfu = "0.33.0"
 kotlinxCollectionsImmutable = "0.4.0"
-kotlinxCoroutinesCore = "1.11.0"
+kotlinxCoroutines = "1.11.0"
 kotlinxDatetime = "0.8.0"
 kotlinxSerializationJson = "1.11.0"
 ksoup = "0.2.6"
@@ -59,11 +59,11 @@ zipline = "1.27.0"
 jvmTarget = "1.8"
 jdkToolchain = "17"
 minSdk = "23"
-compileSdk = "36"
+compileSdk = "37"
 targetSdk = "36"
 
 versionCode = "68"
-versionName = "4.7.0"
+versionName = "4.8.0"
 
 [libraries]
 activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
@@ -96,7 +96,8 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinGradlePlugin" }
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 ksoup = { module = "com.fleeksoft.ksoup:ksoup", version.ref = "ksoup" }

library/README.md

@@ -0,0 +1,15 @@
+## CloudStream extension library
+
+This is the official API surface for all CloudStream plugins.
+
+To ensure that all plugins work on both the stable release and pre-release we must have
+binary compatibility on all changes. All new changes must be marked with `@Prerelease` to
+prevent accidental usage among extension developers.
+
+We use Kotlin binary compatibility validation using:
+
+``./gradlew checkKotlinAbi``
+
+If you for some reason must update the binary compatibility then manually edit `api/jvm/library.api` or use:
+
+``./gradlew updateKotlinAbi``

library/build.gradle.kts

@@ -41,10 +41,7 @@ kotlin {
     jvm()
 
     compilerOptions {
-        freeCompilerArgs.addAll(
+        freeCompilerArgs.add("-Xexpect-actual-classes")
-            "-Xexpect-actual-classes",
-            "-Xannotation-default-target=param-property"
-        )
     }
 
     sourceSets {
@@ -69,13 +66,11 @@ kotlin {
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
             implementation(libs.bundles.cryptography) // Cryptography
-
-            // Deprecated; will be removed once extensions have time to migrate from using it
-            implementation("me.xdrop:fuzzywuzzy:1.4.0")
         }
 
         commonTest.dependencies {
             implementation(libs.kotlin.test)
+            implementation(libs.kotlinx.coroutines.test)
         }
 
         val jvmCommonMain by creating {
@@ -89,6 +84,17 @@ kotlin {
         androidMain { dependsOn(jvmCommonMain) }
         jvmMain { dependsOn(jvmCommonMain) }
     }
+
+    @OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
+    // https://kotlinlang.org/docs/gradle-binary-compatibility-validation.html
+    abiValidation {
+        filters {
+            exclude {
+                annotatedWith.add("com.lagradost.cloudstream3.Prerelease")
+                annotatedWith.add("com.lagradost.cloudstream3.InternalAPI")
+            }
+        }
+    }
 }
 
 tasks.withType<KotlinJvmCompile> {

library/src/androidMain/kotlin/com/lagradost/api/ContextHelper.android.kt

@@ -3,19 +3,14 @@ package com.lagradost.api
 import android.content.Context
 import java.lang.ref.WeakReference
 
-var ctx: WeakReference<Context>? = null
+private var contextRef: WeakReference<Context>? = null
 
 /**
  * Helper function for Android specific context. Not usable in JVM.
  * Do not use this unless absolutely necessary.
  */
-actual fun getContext(): Any? {
+actual fun getContext(): Any? = contextRef?.get()
-    return ctx?.get()
-}
 
-actual fun setContext(context: WeakReference<Any>) {
+actual fun setContext(context: Any?) {
-    val actualContext = context.get() as? Context
+    contextRef = (context as? Context)?.let { WeakReference(it) }
-    if (actualContext != null) {
-        ctx = WeakReference(actualContext)
-    }
 }

library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt

@@ -1,14 +1,20 @@
 package com.lagradost.cloudstream3.utils
 
+import android.annotation.SuppressLint
 import android.os.Handler
 import android.os.Looper
 import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 
+@SuppressLint("ThreadConstraint") // mainLooper.isCurrentThread does not switch the context
 @AnyThread
 actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
-    val mainHandler = Handler(Looper.getMainLooper())
+    val mainLooper = Looper.getMainLooper()
-    mainHandler.post {
+    if (mainLooper.isCurrentThread) {
+        // Do the work directly if we already are on the main thread, no need to enqueue it
         work()
+    } else {
+        // Otherwise post it to the other main thread
+        Handler(mainLooper).post(work)
     }
 }

library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelperPlatform.android.kt

@@ -0,0 +1,24 @@
+package com.lagradost.cloudstream3.utils
+
+import java.util.Locale
+
+// TODO: add androidMain actual using LocaleListCompat.getAdjustedDefault() to respect
+// per-app language preferences set via AppCompatDelegate.setApplicationLocales()
+
+actual fun getCurrentLocale(): String =
+    Locale.getDefault().toLanguageTag()
+
+actual fun localizedLanguageName(ietfTag: String, localizedTo: String): String? {
+    val localeOfLangCode = Locale.forLanguageTag(ietfTag)
+    val localeOfLocalizeTo = Locale.forLanguageTag(localizedTo)
+    val displayName = localeOfLangCode.getDisplayName(localeOfLocalizeTo)
+
+    // Locale.getDisplayName() falls back to the raw tag or "language (country)" form
+    // when it doesn't know how to render the name.
+    val langCodeWithCountry = "${localeOfLangCode.language} ("
+    val failed =
+        displayName.equals(ietfTag, ignoreCase = true) ||
+        displayName.contains(langCodeWithCountry, ignoreCase = true)
+
+    return if (failed) null else displayName
+}

library/src/commonMain/kotlin/com/lagradost/api/ContextHelper.kt

@@ -1,16 +1,15 @@
 package com.lagradost.api
 
-import java.lang.ref.WeakReference
-
 /**
- * Set context for android specific code such as webview.
+ * Set context for Android-specific code such as webview.
- * Does nothing on JVM.
+ * Does nothing on non-Android platforms.
  */
-expect fun setContext(context: WeakReference<Any>)
+expect fun setContext(context: Any?)
+
 /**
  * Helper function for Android specific context.
  * Do not use this unless absolutely necessary.
  * setContext() must be called before this is called.
- * @return Context if on android, null if not.
+ * @return Context if on Android, null if not.
  */
 expect fun getContext(): Any?

library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt

@@ -39,6 +39,8 @@ import kotlinx.datetime.format.byUnicodePattern
 import kotlinx.datetime.format.char
 import kotlinx.datetime.format.parse
 import kotlinx.datetime.toInstant
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
 import kotlin.jvm.JvmName
@@ -95,7 +97,6 @@ class ErrorLoadingException(message: String? = null) : Exception(message)
 
 //val baseHeader = mapOf("User-Agent" to USER_AGENT)
 
-@Prerelease
 val json = Json {
     encodeDefaults = true
     explicitNulls = false
@@ -325,7 +326,7 @@ object APIHolder {
         ).toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
 
         return app.post("https://graphql.anilist.co", requestBody = data)
-            .parsedSafe()
+            .parsedSafe<AniSearch>()
     }
 }
 
@@ -393,18 +394,19 @@ const val PROVIDER_STATUS_SLOW = 2
 const val PROVIDER_STATUS_OK = 1
 const val PROVIDER_STATUS_DOWN = 0
 
+@Serializable
 data class ProvidersInfoJson(
-    @JsonProperty("name") var name: String,
+    @JsonProperty("name") @SerialName("name") var name: String,
-    @JsonProperty("url") var url: String,
+    @JsonProperty("url") @SerialName("url") var url: String,
-    @JsonProperty("credentials") var credentials: String? = null,
+    @JsonProperty("credentials") @SerialName("credentials") var credentials: String? = null,
-    @JsonProperty("status") var status: Int,
+    @JsonProperty("status") @SerialName("status") var status: Int,
 )
 
+@Serializable
 data class SettingsJson(
-    @JsonProperty("enableAdult") var enableAdult: Boolean = false,
+    @JsonProperty("enableAdult") @SerialName("enableAdult") var enableAdult: Boolean = false,
 )
 
-
 data class MainPageData(
     val name: String,
     val data: String,
@@ -759,18 +761,64 @@ fun MainAPI.fixUrl(url: String): String {
     }
 }
 
-/** Sort the urls based on quality
+/**
+ * Sort the urls based on quality
+ *
  * @param urls Set of [ExtractorLink]
- * */
+ */
 fun sortUrls(urls: Set<ExtractorLink>): List<ExtractorLink> {
     return urls.sortedBy { t -> -t.quality }
 }
 
-/** Capitalize the first letter of string.
+/**
+ * Splits the parameters of a [Url] into a map of key-value pairs.
+ *
+ * Unlike a manual `split("&")` / `split("=")` implementation, this relies on Ktor's
+ * built-in parameters parser ([Url.parameters]), which already handles URL-decoding,
+ * malformed pairs, and parameters without a value.
+ *
+ * Note: if a parameter key appears multiple times (e.g. `?a=1&a=2`), only the **first**
+ * value is kept, since the return type is `Map<String, String>`. Use [Url.parameters]
+ * directly if you need all values for repeated keys.
+ *
+ * @param url the [Url] whose parameters should be extracted.
+ * @return a map of decoded parameter names to their first decoded value.
+ *
+ * @sample
+ * splitUrlParameters(Url("https://example.com/path?foo=bar&baz=qux"))
+ * // returns {"foo": "bar", "baz": "qux"}
+ */
+@Prerelease
+fun splitUrlParameters(url: Url): Map<String, String> {
+    return url.parameters.entries().associate { (key, values) -> key to values.firstOrNull().orEmpty() }
+}
+
+/**
+ * Splits the parameters of a raw URL [String] into a map of key-value pairs.
+ *
+ * Convenience overload for callers that have a URL as plain text rather than a parsed
+ * [Url] instance. Internally parses [url] with Ktor's [Url] constructor and delegates
+ * to [splitUrlParameters].
+ *
+ * @param url the URL string whose parameters should be extracted.
+ * @return a map of decoded parameter names to their first decoded value.
+ *
+ * @sample
+ * splitUrlParameters("https://example.com/path?foo=bar&baz=qux")
+ * // returns {"foo": "bar", "baz": "qux"}
+ */
+@Prerelease
+fun splitUrlParameters(url: String): Map<String, String> {
+    return splitUrlParameters(Url(url))
+}
+
+/**
+ * Capitalize the first letter of string.
+ *
  * @param str String to be capitalized
  * @return non-nullable String
  * @see capitalizeStringNullable
- * */
+ */
 fun capitalizeString(str: String): String {
     return capitalizeStringNullable(str) ?: str
 }
@@ -797,13 +845,10 @@ fun fixTitle(str: String): String {
     }
 }
 
-/**
+@Deprecated(
- * Get rhino context in a safe way as it needs to be initialized on the main thread.
+    message = "Use newJsContext or evalJs instead.",
- *
+    level = DeprecationLevel.WARNING,
- * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects()
+)
- *
- * Use like the following: rhino.evaluateString(scope, js, "JavaScript", 1, null)
- **/
 suspend fun getRhinoContext(): org.mozilla.javascript.Context {
     return Coroutines.mainWork {
         val rhino = org.mozilla.javascript.Context.enter()
@@ -870,10 +915,10 @@ enum class DubStatus(val id: Int) {
  * of this as a decimal class specifically for ratings.
  * */
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
+@Serializable
 class Score private constructor(
     /** Decimal between [0, 10^9] representing the min score and max score respectively */
-    @JsonProperty("data")
+    @JsonProperty("data") @SerialName("data") private val data: Int,
-    private val data: Int,
 ) {
     override fun hashCode(): Int = this.data.hashCode()
     override fun equals(other: Any?): Boolean = other is Score && this.data == other.data
@@ -1093,7 +1138,6 @@ enum class TvType(value: Int?) {
 
     Audio(16),
     Podcast(17),
-    @Prerelease
     Video(18),
 }
 
@@ -1199,9 +1243,10 @@ suspend fun newSubtitleFile(
  * @see newAudioFile
  * */
 @ConsistentCopyVisibility
+@Serializable
 data class AudioFile internal constructor(
-    var url: String,
+    @JsonProperty("url") @SerialName("url") var url: String,
-    var headers: Map<String, String>? = null
+    @JsonProperty("headers") @SerialName("headers") var headers: Map<String, String>? = null,
 )
 
 /** Creates an AudioFile with optional initializer for setting additional properties.
@@ -1824,7 +1869,7 @@ interface LoadResponse {
 
         /** Read the id string to get all other ids */
         fun readIdFromString(idString: String?): Map<SimklSyncServices, String> {
-            return tryParseJson(idString) ?: return emptyMap()
+            return tryParseJson<Map<SimklSyncServices, String>>(idString) ?: return emptyMap()
         }
 
         fun LoadResponse.isMovie(): Boolean {
@@ -2178,10 +2223,11 @@ data class NextAiring(
  * @param name To be shown next to the season like "Season $displaySeason $name" but if displaySeason is null then "$name"
  * @param displaySeason What to be displayed next to the season name, if null then the name is the only thing shown.
  * */
+@Serializable
 data class SeasonData(
-    val season: Int,
+    @JsonProperty("season") @SerialName("season") val season: Int,
-    val name: String? = null,
+    @JsonProperty("name") @SerialName("name") val name: String? = null,
-    val displaySeason: Int? = null, // will use season if null
+    @JsonProperty("displaySeason") @SerialName("displaySeason") val displaySeason: Int? = null, // will use season if null
 )
 
 /** Abstract interface of EpisodeResponse */
@@ -2530,13 +2576,21 @@ constructor(
 
 @OptIn(FormatStringsInDatetimeFormats::class)
 fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
-    if (date == null) return
+    if (date.isNullOrBlank()) return
     this.date = runCatching {
         // First try standard ISO 8601 (e.g. "2026-01-01T12:30:00.000Z", "2026-05-17T14:35+02:00")
         runCatching { Instant.parse(date).toEpochMilliseconds() }
             .getOrElse {
                 val fmt = DateTimeComponents.Format { byUnicodePattern(format) }
-                val components = DateTimeComponents.parse(date, fmt)
+
+                // Try parsing the full date first then only parse the beginning of the string
+                // May lose time, but better than failing.
+                val components = runCatching {
+                    DateTimeComponents.parse(date, fmt)
+                }.recoverCatching {
+                    DateTimeComponents.parse(date.trimStart().take(format.length), fmt)
+                }.getOrThrow()
+
                 /**
                  * Try multiple conversions in order of precision for non-ISO-8601 formats,
                  * since the date string may or may not include time and/or timezone offset:
@@ -2551,21 +2605,18 @@ fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
     }.onFailure { logError(it) }.getOrNull()
 }
 
-@Prerelease
 fun Episode.addDate(date: LocalDate?) {
     this.date = date?.atStartOfDayIn(TimeZone.currentSystemDefault())?.toEpochMilliseconds()
 }
 
-@Prerelease
 fun Episode.addDate(date: Instant?) {
     this.date = date?.toEpochMilliseconds()
 }
 
-// Deprecate after next stable
+@Deprecated(
-/* @Deprecated(
     message = "Use addDate with LocalDate, Instant, or String instead.",
     level = DeprecationLevel.WARNING,
-) */
+)
 fun Episode.addDate(date: java.util.Date?) {
     this.date = date?.time
 }
@@ -2703,7 +2754,6 @@ fun fetchUrls(text: String?): List<String> {
     return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
 }
 
-@Prerelease
 fun isUpcoming(dateString: String?): Boolean {
     return runCatching {
         val fmt = DateTimeComponents.Format {
@@ -2739,32 +2789,38 @@ data class Tracker(
     val cover: String? = null,
 )
 
+@Serializable
 data class AniSearch(
-    @JsonProperty("data") var data: Data? = Data()
+    @JsonProperty("data") @SerialName("data") var data: Data? = Data(),
 ) {
+    @Serializable
     data class Data(
-        @JsonProperty("Page") var page: Page? = Page()
+        @JsonProperty("Page") @SerialName("Page") var page: Page? = Page(),
     ) {
+        @Serializable
         data class Page(
-            @JsonProperty("media") var media: ArrayList<Media> = arrayListOf()
+            @JsonProperty("media") @SerialName("media") var media: ArrayList<Media> = arrayListOf(),
         ) {
+            @Serializable
             data class Media(
-                @JsonProperty("title") var title: Title? = null,
+                @JsonProperty("title") @SerialName("title") var title: Title? = null,
-                @JsonProperty("id") var id: Int? = null,
+                @JsonProperty("id") @SerialName("id") var id: Int? = null,
-                @JsonProperty("idMal") var idMal: Int? = null,
+                @JsonProperty("idMal") @SerialName("idMal") var idMal: Int? = null,
-                @JsonProperty("seasonYear") var seasonYear: Int? = null,
+                @JsonProperty("seasonYear") @SerialName("seasonYear") var seasonYear: Int? = null,
-                @JsonProperty("format") var format: String? = null,
+                @JsonProperty("format") @SerialName("format") var format: String? = null,
-                @JsonProperty("coverImage") var coverImage: CoverImage? = null,
+                @JsonProperty("coverImage") @SerialName("coverImage") var coverImage: CoverImage? = null,
-                @JsonProperty("bannerImage") var bannerImage: String? = null,
+                @JsonProperty("bannerImage") @SerialName("bannerImage") var bannerImage: String? = null,
             ) {
+                @Serializable
                 data class CoverImage(
-                    @JsonProperty("extraLarge") var extraLarge: String? = null,
+                    @JsonProperty("extraLarge") @SerialName("extraLarge") var extraLarge: String? = null,
-                    @JsonProperty("large") var large: String? = null,
+                    @JsonProperty("large") @SerialName("large") var large: String? = null,
                 )
 
+                @Serializable
                 data class Title(
-                    @JsonProperty("romaji") var romaji: String? = null,
+                    @JsonProperty("romaji") @SerialName("romaji") var romaji: String? = null,
-                    @JsonProperty("english") var english: String? = null,
+                    @JsonProperty("english") @SerialName("english") var english: String? = null,
                 ) {
                     fun isMatchingTitles(title: String?): Boolean {
                         if (title == null) return false

library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt

@@ -33,7 +33,6 @@ var app = Requests(responseParser = jsonResponseParser).apply {
 
 /** Same as the default app networking helper, but this instance ignores SSL certificates.
  * This should NEVER be used for sensitive networking operations such as logins. Only use this when required. */
-@Prerelease
 @UnsafeSSL
 var insecureApp = Requests(responseParser = jsonResponseParser).apply {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Acefile.kt

@@ -1,8 +1,11 @@
 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.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Acefile : ExtractorApi() {
     override val name = "Acefile"
@@ -13,7 +16,7 @@ open class Acefile : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val id = "/(?:d|download|player|f|file)/(\\w+)".toRegex().find(url)?.groupValues?.get(1)
         val script = getAndUnpack(app.get("$mainUrl/player/${id ?: return}").text)
@@ -27,14 +30,14 @@ open class Acefile : ExtractorApi() {
             newExtractorLink(
                 this.name,
                 this.name,
-                video ?: return
+                video ?: return,
             )
         )
 
     }
 
+    @Serializable
     data class Source(
-        val data: String? = null,
+        @JsonProperty("data") @SerialName("data") val data: String? = null,
     )
-
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Blogger : ExtractorApi() {
     override val name = "Blogger"
@@ -22,10 +24,10 @@ open class Blogger : ExtractorApi() {
                             newExtractorLink(
                                 name,
                                 name,
-                                it.play_url,
+                                it.playUrl,
                             ) {
                                 this.referer = "https://www.youtube.com/"
-                                this.quality = when (it.format_id) {
+                                this.quality = when (it.formatId) {
                                     18 -> 360
                                     22 -> 720
                                     else -> Qualities.Unknown.value
@@ -36,11 +38,13 @@ open class Blogger : ExtractorApi() {
                 }
             }
         }
+
         return sources
     }
 
+    @Serializable
     private data class ResponseSource(
-        @JsonProperty("play_url") val play_url: String,
+        @JsonProperty("play_url") @SerialName("play_url") val playUrl: String,
-        @JsonProperty("format_id") val format_id: Int
+        @JsonProperty("format_id") @SerialName("format_id") val formatId: Int,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt

@@ -13,30 +13,32 @@ import dev.whyoleg.cryptography.DelicateCryptographyApi
 import dev.whyoleg.cryptography.algorithms.AES
 import io.ktor.http.Url
 import io.ktor.http.decodeURLPart
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 class Bysezejataos : ByseSX() {
-    override var name = "Bysezejataos"
+    override val name = "Bysezejataos"
-    override var mainUrl = "https://bysezejataos.com"
+    override val mainUrl = "https://bysezejataos.com"
 }
 
 class ByseBuho : ByseSX() {
-    override var name = "ByseBuho"
+    override val name = "ByseBuho"
-    override var mainUrl = "https://bysebuho.com"
+    override val mainUrl = "https://bysebuho.com"
 }
 
 class ByseVepoin : ByseSX() {
-    override var name = "ByseVepoin"
+    override val name = "ByseVepoin"
-    override var mainUrl = "https://bysevepoin.com"
+    override val mainUrl = "https://bysevepoin.com"
 }
 
 class ByseQekaho : ByseSX() {
-    override var name = "ByseQekaho"
+    override val name = "ByseQekaho"
-    override var mainUrl = "https://byseqekaho.com"
+    override val mainUrl = "https://byseqekaho.com"
 }
 
 open class ByseSX : ExtractorApi() {
-    override var name = "Byse"
+    override val name = "Byse"
-    override var mainUrl = "https://byse.sx"
+    override val mainUrl = "https://byse.sx"
     override val requiresReferer = true
 
     private val aesGcm = CryptographyProvider.Default.get(AES.GCM)
@@ -86,15 +88,15 @@ open class ByseSX : ExtractorApi() {
     }
 
     @OptIn(DelicateCryptographyApi::class)
-    private fun decryptPlayback(playback: Playback): String? {
+    private suspend fun decryptPlayback(playback: Playback): String? {
         val keyBytes = buildAesKey(playback)
         val ivBytes = b64UrlDecode(playback.iv)
         val cipherBytes = b64UrlDecode(playback.payload)
 
-        val aesKey = aesGcm.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesGcm.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
         // 128-bit GCM tag (default)
         val cipher = aesKey.cipher()
-        val plainBytes = cipher.decryptWithIvBlocking(ivBytes, cipherBytes)
+        val plainBytes = cipher.decryptWithIv(ivBytes, cipherBytes)
 
         var jsonStr = plainBytes.decodeToString()
         if (jsonStr.startsWith("\uFEFF")) jsonStr = jsonStr.substring(1)
@@ -112,7 +114,7 @@ open class ByseSX : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val refererUrl = getBaseUrl(url)
         val playbackRoot = getPlayback(url) ?: return
@@ -123,64 +125,58 @@ open class ByseSX : ExtractorApi() {
             name,
             streamUrl,
             mainUrl,
-            headers = headers
+            headers = headers,
         ).forEach(callback)
     }
 }
 
+@Serializable
 data class DetailsRoot(
-    val id: Long,
+    @JsonProperty("id") @SerialName("id") val id: Long,
-    val code: String,
+    @JsonProperty("code") @SerialName("code") val code: String,
-    val title: String,
+    @JsonProperty("title") @SerialName("title") val title: String,
-    @JsonProperty("poster_url")
+    @JsonProperty("poster_url") @SerialName("poster_url") val posterUrl: String,
-    val posterUrl: String,
+    @JsonProperty("description") @SerialName("description") val description: String,
-    val description: String,
+    @JsonProperty("created_at") @SerialName("created_at") val createdAt: String,
-    @JsonProperty("created_at")
+    @JsonProperty("owner_private") @SerialName("owner_private") val ownerPrivate: Boolean,
-    val createdAt: String,
+    @JsonProperty("embed_frame_url") @SerialName("embed_frame_url") val embedFrameUrl: String,
-    @JsonProperty("owner_private")
-    val ownerPrivate: Boolean,
-    @JsonProperty("embed_frame_url")
-    val embedFrameUrl: String,
 )
 
+@Serializable
 data class PlaybackRoot(
-    val playback: Playback,
+    @JsonProperty("playback") @SerialName("playback") val playback: Playback,
 )
 
+@Serializable
 data class Playback(
-    val algorithm: String,
+    @JsonProperty("algorithm") @SerialName("algorithm") val algorithm: String,
-    val iv: String,
+    @JsonProperty("iv") @SerialName("iv") val iv: String,
-    val payload: String,
+    @JsonProperty("payload") @SerialName("payload") val payload: String,
-    @JsonProperty("key_parts")
+    @JsonProperty("key_parts") @SerialName("key_parts") val keyParts: List<String>,
-    val keyParts: List<String>,
+    @JsonProperty("expires_at") @SerialName("expires_at") val expiresAt: String,
-    @JsonProperty("expires_at")
+    @JsonProperty("decrypt_keys") @SerialName("decrypt_keys") val decryptKeys: DecryptKeys,
-    val expiresAt: String,
+    @JsonProperty("iv2") @SerialName("iv2") val iv2: String,
-    @JsonProperty("decrypt_keys")
+    @JsonProperty("payload2") @SerialName("payload2") val payload2: String,
-    val decryptKeys: DecryptKeys,
-    val iv2: String,
-    val payload2: String,
 )
 
+@Serializable
 data class DecryptKeys(
-    @JsonProperty("edge_1")
+    @JsonProperty("edge_1") @SerialName("edge_1") val edge1: String,
-    val edge1: String,
+    @JsonProperty("edge_2") @SerialName("edge_2") val edge2: String,
-    @JsonProperty("edge_2")
+    @JsonProperty("legacy_fallback") @SerialName("legacy_fallback") val legacyFallback: String,
-    val edge2: String,
-    @JsonProperty("legacy_fallback")
-    val legacyFallback: String,
 )
 
+@Serializable
 data class PlaybackDecrypt(
-    val sources: List<PlaybackDecryptSource>,
+    @JsonProperty("sources") @SerialName("sources") val sources: List<PlaybackDecryptSource>,
 )
 
+@Serializable
 data class PlaybackDecryptSource(
-    val quality: String,
+    @JsonProperty("quality") @SerialName("quality") val quality: String,
-    val label: String,
+    @JsonProperty("label") @SerialName("label") val label: String,
-    @JsonProperty("mime_type")
+    @JsonProperty("mime_type") @SerialName("mime_type") val mimeType: String,
-    val mimeType: String,
+    @JsonProperty("url") @SerialName("url") val url: String,
-    val url: String,
+    @JsonProperty("bitrate_kbps") @SerialName("bitrate_kbps") val bitrateKbps: Long,
-    @JsonProperty("bitrate_kbps")
+    @JsonProperty("height") @SerialName("height") val height: Int?,
-    val bitrateKbps: Long,
-    val height: Any?,
 )

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
@@ -8,6 +9,8 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.StringUtils.decodeUrl
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Cda : ExtractorApi() {
     override var mainUrl = "https://ebd.cda.pl"
@@ -22,7 +25,7 @@ open class Cda : ExtractorApi() {
             "https://ebd.cda.pl/647x500/$mediaId", headers = mapOf(
                 "Referer" to "https://ebd.cda.pl/647x500/$mediaId",
                 "User-Agent" to USER_AGENT,
-                "Cookie" to "cda.player=html5"
+                "Cookie" to "cda.player=html5",
             )
         ).document
         val dataRaw = doc.selectFirst("[player_data]")?.attr("player_data") ?: return null
@@ -86,15 +89,17 @@ open class Cda : ExtractorApi() {
         else -> a
     }
 
+    @Serializable
     data class VideoPlayerData(
-        val file: String,
+        @JsonProperty("file") @SerialName("file") val file: String,
-        val qualities: Map<String, String> = mapOf(),
+        @JsonProperty("qualities") @SerialName("qualities") val qualities: Map<String, String> = mapOf(),
-        val quality: String?,
+        @JsonProperty("quality") @SerialName("quality") val quality: String?,
-        val ts: Int?,
+        @JsonProperty("ts") @SerialName("ts") val ts: Int?,
-        val hash2: String?
+        @JsonProperty("hash2") @SerialName("hash2") val hash2: String?,
     )
 
+    @Serializable
     data class PlayerData(
-        val video: VideoPlayerData
+        @JsonProperty("video") @SerialName("video") val video: VideoPlayerData,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt

@@ -1,15 +1,18 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.google.gson.Gson
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import io.ktor.http.Url
 import io.ktor.http.decodeURLPart
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 class Geodailymotion : Dailymotion() {
     override val name = "GeoDailymotion"
@@ -28,25 +31,25 @@ open class Dailymotion : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val embedUrl = getEmbedUrl(url) ?: return
         val id = getVideoId(embedUrl) ?: return
-        val metaDataUrl = "$baseUrl/player/metadata/video/$id"
+        val metadataUrl = "$baseUrl/player/metadata/video/$id"
-
-        val response = app.get(metaDataUrl, referer = embedUrl).text
-        val gson = Gson()
-        val meta = gson.fromJson(response, MetaData::class.java)
 
+        val response = app.get(metadataUrl, referer = embedUrl).text
+        val meta = parseJson<Metadata>(response)
         meta.qualities?.get("auto")?.forEach { quality ->
             val videoUrl = quality.url
             if (!videoUrl.isNullOrEmpty() && videoUrl.contains(".m3u8")) {
-                callback.invoke(newExtractorLink(
+                callback.invoke(
+                    newExtractorLink(
                         name,
                         name,
                         videoUrl,
-                    ExtractorLinkType.M3U8
+                        ExtractorLinkType.M3U8,
-                ))
+                    )
+                )
             }
         }
 
@@ -55,7 +58,7 @@ open class Dailymotion : ExtractorApi() {
                 subtitleCallback(
                     newSubtitleFile(
                         subData.label,
-                        subUrl
+                        subUrl,
                     )
                 )
             }
@@ -68,6 +71,7 @@ open class Dailymotion : ExtractorApi() {
             val videoId = url.substringAfter("video=")
             return "$baseUrl/embed/video/$videoId"
         }
+
         return null
     }
 
@@ -77,23 +81,27 @@ open class Dailymotion : ExtractorApi() {
         return if (id.matches(videoIdRegex)) id else null
     }
 
-    data class MetaData(
+    @Serializable
-        val qualities: Map<String, List<Quality>>?,
+    data class Metadata(
-        val subtitles: SubtitlesWrapper?
+        @JsonProperty("qualities") @SerialName("qualities") val qualities: Map<String, List<Quality>>?,
+        @JsonProperty("subtitles") @SerialName("subtitles") val subtitles: SubtitlesWrapper?,
     )
 
+    @Serializable
     data class Quality(
-        val type: String?,
+        @JsonProperty("type") @SerialName("type") val type: String?,
-        val url: String?
+        @JsonProperty("url") @SerialName("url") val url: String?,
     )
 
+    @Serializable
     data class SubtitlesWrapper(
-        val enable: Boolean,
+        @JsonProperty("enable") @SerialName("enable") val enable: Boolean,
-        val data: Map<String, SubtitleData>?
+        @JsonProperty("data") @SerialName("data") val data: Map<String, SubtitleData>?,
     )
 
+    @Serializable
     data class SubtitleData(
-        val label: String,
+        @JsonProperty("label") @SerialName("label") val label: String,
-        val urls: List<String>
+        @JsonProperty("urls") @SerialName("urls") val urls: List<String>,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt

@@ -88,7 +88,6 @@ class MyVidPlay : DoodLaExtractor() {
     override var mainUrl = "https://myvidplay.com"
 }
 
-@Prerelease
 class Playmogo : DoodLaExtractor() {
     override var mainUrl = "https://playmogo.com"
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/EmturbovidExtractor.kt

@@ -8,35 +8,33 @@ import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
 open class EmturbovidExtractor : ExtractorApi() {
-    override var name = "Emturbovid"
+    override val name = "Emturbovid"
-    override var mainUrl = "https://emturbovid.com"
+    override val mainUrl = "https://emturbovid.com"
     override val requiresReferer = false
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val response = app.get(
+        val response = app.get(url, referer = referer ?: "$mainUrl/")
-            url, referer = referer ?: "$mainUrl/"
+        val playerScript = response.document
-        )
+            .select("script")
-        val playerScript =
+            .first { it.data().contains("var urlPlay") }
-            response.document.selectXpath("//script[contains(text(),'var urlPlay')]")
             .html()
 
         val sources = mutableListOf<ExtractorLink>()
         if (playerScript.isNotBlank()) {
-            val m3u8Url =
+            val m3u8Url = playerScript.substringAfter("var urlPlay = '").substringBefore("'")
-                playerScript.substringAfter("var urlPlay = '").substringBefore("'")
-
             sources.add(
                 newExtractorLink(
                     source = name,
                     name = name,
                     url = m3u8Url,
-                    type = ExtractorLinkType.M3U8
+                    type = ExtractorLinkType.M3U8,
                 ) {
                     this.referer = "$mainUrl/"
                     this.quality = Qualities.Unknown.value
                 }
             )
         }
+
         return sources
     }
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Firestream.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
@@ -9,33 +10,30 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-@Prerelease
 class Firestream : ExtractorApi() {
-    override val name: String = "Firestream"
+    override val name = "Firestream"
-    override val mainUrl: String = "https://firestream.to"
+    override val mainUrl = "https://firestream.to"
-    override val requiresReferer: Boolean = false
+    override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val id = url.removeSuffix("/").substringAfterLast("/")
         val url = getExtractorUrl(id)
 
         val doc = app.get(url).document
         val token = doc.selectFirst("script[id=token-blob]")!!.data()
-
+        val videoResponse = app.post("$mainUrl/api/videos/$id/resolve", json = mapOf("blob" to token))
-        val videoResponse =
-            app.post("$mainUrl/api/videos/$id/resolve", json = mapOf("blob" to token))
             .parsed<VideoResponse>()
 
         callback.invoke(
             newExtractorLink(
                 source = name,
                 name = name,
-                url = videoResponse.signedVideoUrl
+                url = videoResponse.signedVideoUrl,
             )
         )
     }
@@ -46,7 +44,6 @@ class Firestream : ExtractorApi() {
 
     @Serializable
     private data class VideoResponse(
-        @SerialName("signedVideoUrl")
+        @JsonProperty("signedVideoUrl") @SerialName("signedVideoUrl") val signedVideoUrl: String,
-        val signedVideoUrl: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt

@@ -10,18 +10,17 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-@Prerelease
 open class Flyfile : ExtractorApi() {
-    override val name: String = "FlyFile"
+    override val name = "FlyFile"
-    override val mainUrl: String = "https://flyfile.app"
+    override val mainUrl = "https://flyfile.app"
+    override val requiresReferer = false
     open val apiUrl: String = "https://api.flyfile.app"
-    override val requiresReferer: Boolean = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val videoId = url.substringAfterLast("/")
         val videoInfo = app.get("$apiUrl/api/streaming/assign/$videoId")
@@ -33,16 +32,14 @@ open class Flyfile : ExtractorApi() {
                 source = name,
                 name = name,
                 url = streamUrl,
-                type = ExtractorLinkType.M3U8
+                type = ExtractorLinkType.M3U8,
             )
         )
     }
 
     @Serializable
     private data class StreamInfo(
-        @SerialName("url")
+        @SerialName("url") val url: String,
-        val url: String,
+        @SerialName("token") val token: String,
-        @SerialName("token")
-        val token: String
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt

@@ -1,31 +1,34 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.google.gson.JsonParser
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
 import io.ktor.http.Url
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 class Techinmind : GDMirrorbot() {
-    override var name = "Techinmind Cloud AIO"
+    override val name = "Techinmind Cloud AIO"
-    override var mainUrl = "https://stream.techinmind.space"
+    override val mainUrl = "https://stream.techinmind.space"
-    override var requiresReferer = true
+    override val requiresReferer = true
 }
 
 open class GDMirrorbot : ExtractorApi() {
-    override var name = "GDMirrorbot"
+    override val name = "GDMirrorbot"
-    override var mainUrl = "https://gdmirrorbot.nl"
+    override val mainUrl = "https://gdmirrorbot.nl"
     override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val (sid, host) = if (!url.contains("key=")) {
             Pair(url.substringAfterLast("embed/"), getBaseUrl(app.get(url).url))
@@ -36,60 +39,55 @@ open class GDMirrorbot : ExtractorApi() {
             val idType = Regex("""idType\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1) ?: "imdbid"
             val baseUrl = Regex("""let\s+baseUrl\s*=\s*"([^"]+)"""").find(pageText)?.groupValues?.get(1)
             val hostUrl = baseUrl?.let { getBaseUrl(it) }
-
             if (finalId != null && myKey != null) {
                 val apiUrl = if (url.contains("/tv/")) {
                     val season = Regex("""/tv/\d+/(\d+)/""").find(url)?.groupValues?.get(1) ?: "1"
                     val episode = Regex("""/tv/\d+/\d+/(\d+)""").find(url)?.groupValues?.get(1) ?: "1"
                     "$mainUrl/myseriesapi?tmdbid=$finalId&season=$season&epname=$episode&key=$myKey"
-                } else {
+                } else "$mainUrl/mymovieapi?$idType=$finalId&key=$myKey"
-                    "$mainUrl/mymovieapi?$idType=$finalId&key=$myKey"
-                }
                 pageText = app.get(apiUrl).text
             }
 
-            val jsonElement = JsonParser.parseString(pageText)
+            val embedData = tryParseJson<EmbedData>(pageText)
-            if (!jsonElement.isJsonObject) return
-            val jsonObject = jsonElement.asJsonObject
-
             val embedId = url.substringAfterLast("/")
-            val sidValue = jsonObject["data"]?.asJsonArray
+            val sidValue = embedData?.data?.firstOrNull()?.fileSlug
-                ?.takeIf { it.size() > 0 }
-                ?.get(0)?.asJsonObject
-                ?.get("fileslug")?.asString
                 ?.takeIf { it.isNotBlank() } ?: embedId
-
             Pair(sidValue, hostUrl)
         }
 
         val postData = mapOf("sid" to sid)
         val responseText = app.post("$host/embedhelper.php", data = postData).text
 
-        val rootElement = JsonParser.parseString(responseText)
+        val root = tryParseJson<EmbedHelper>(responseText) ?: return
-        if (!rootElement.isJsonObject) return
+        val siteUrls = root.siteUrls ?: return
-        val root = rootElement.asJsonObject
+        val siteFriendlyNames = root.siteFriendlyNames
 
-        val siteUrls = root["siteUrls"]?.asJsonObject ?: return
+        // mresult can arrive as a JSON object or a base64-encoded string
-        val siteFriendlyNames = root["siteFriendlyNames"]?.asJsonObject
+        val mresult: Map<String, String>? = run {
-
+            val raw = responseText
-        val decodedMresult = when {
+                .substringAfter("\"mresult\":")
-            root["mresult"]?.isJsonObject == true -> root["mresult"]!!.asJsonObject
+                .trimStart()
-            root["mresult"]?.isJsonPrimitive == true -> try {
+            when {
-                base64Decode(root["mresult"]!!.asString)
+                raw.startsWith("\"") -> {
-                    .let { JsonParser.parseString(it).asJsonObject }
+                    // base64-encoded string
-            } catch (e: Exception) {
+                    tryParseJson<Map<String, String>>(
-                Log.e("GDMirrorbot", "Failed to decode mresult: $e")
+                        try { base64Decode(raw.trim('"')) } catch (_: Exception) { return }
-                return
+                    )
+                }
+                raw.startsWith("{") -> tryParseJson<Map<String, String>>(
+                    raw.substringBefore("\n}").substringBefore(",\n\"").let { "$it" }
+                        .let { responseText.substringAfter("\"mresult\":").trimStart() }
+                )
+                else -> null
             }
-            else -> return
         }
 
-        siteUrls.keySet().intersect(decodedMresult.keySet()).forEach { key ->
+        if (mresult == null) return
-            val base = siteUrls[key]?.asString?.trimEnd('/') ?: return@forEach
+        siteUrls.keys.intersect(mresult.keys).forEach { key ->
-            val path = decodedMresult[key]?.asString?.trimStart('/') ?: return@forEach
+            val base = siteUrls[key]?.trimEnd('/') ?: return@forEach
+            val path = mresult[key]?.trimStart('/') ?: return@forEach
             val fullUrl = "$base/$path"
-            val friendlyName = siteFriendlyNames?.get(key)?.asString ?: key
+            val friendlyName = siteFriendlyNames?.get(key) ?: key
-
             try {
                 when (friendlyName) {
                     "StreamHG", "EarnVids" -> VidHidePro().getUrl(fullUrl, referer, subtitleCallback, callback)
@@ -105,5 +103,20 @@ open class GDMirrorbot : ExtractorApi() {
     private fun getBaseUrl(url: String): String {
         return Url(url).let { "${it.protocol.name}://${it.host}" }
     }
-}
 
+    @Serializable
+    private data class EmbedData(
+        @JsonProperty("data") @SerialName("data") val data: List<FileSlug>? = null,
+    )
+
+    @Serializable
+    private data class FileSlug(
+        @JsonProperty("fileslug") @SerialName("fileslug") val fileSlug: String? = null,
+    )
+
+    @Serializable
+    private data class EmbedHelper(
+        @JsonProperty("siteUrls") @SerialName("siteUrls") val siteUrls: Map<String, String>? = null,
+        @JsonProperty("siteFriendlyNames") @SerialName("siteFriendlyNames") val siteFriendlyNames: Map<String, String>? = null,
+    )
+}

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GUpload.kt

@@ -4,11 +4,14 @@ 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.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 
 open class GUpload: ExtractorApi() {
     override val name: String = "GUpload"
@@ -19,12 +22,12 @@ open class GUpload: ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val response = app.get(url, referer = referer).text
 
         val playerConfigString = response.substringAfter("const config = ").substringBefore(";")
-        val playerConfig = AppUtils.parseJson<VideoInfo>(playerConfigString)
+        val playerConfig = parseJson<VideoInfo>(playerConfigString)
 
         callback.invoke(
             newExtractorLink(
@@ -39,14 +42,15 @@ open class GUpload: ExtractorApi() {
         )
     }
 
+    @Serializable
     private data class VideoInfo(
-        @JsonProperty("videoUrl") val videoUrl: String,
+        @JsonProperty("videoUrl") @SerialName("videoUrl") val videoUrl: String,
-        @JsonProperty("posterUrl") val posterUrl: String? = null,
+        @JsonProperty("posterUrl") @SerialName("posterUrl") val posterUrl: String? = null,
-        @JsonProperty("videoId") val videoId: String? = null,
+        @JsonProperty("videoId") @SerialName("videoId") val videoId: String? = null,
-        @JsonProperty("primaryColor") val primaryColor: String? = null,
+        @JsonProperty("primaryColor") @SerialName("primaryColor") val primaryColor: String? = null,
-        @JsonProperty("audioTracks") val audioTracks: List<Any?> = emptyList(),
+        @JsonProperty("audioTracks") @SerialName("audioTracks") val audioTracks: List<JsonElement> = emptyList(),
-        @JsonProperty("subtitleTracks") val subtitleTracks: List<Any?> = emptyList(),
+        @JsonProperty("subtitleTracks") @SerialName("subtitleTracks") val subtitleTracks: List<JsonElement> = emptyList(),
-        @JsonProperty("vastFallbackList") val vastFallbackList: List<String> = emptyList(),
+        @JsonProperty("vastFallbackList") @SerialName("vastFallbackList") val vastFallbackList: List<String> = emptyList(),
-        @JsonProperty("videoOwnerId") val videoOwnerId: Long = 0,
+        @JsonProperty("videoOwnerId") @SerialName("videoOwnerId") val videoOwnerId: Long = 0,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt

@@ -5,14 +5,16 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import org.jsoup.nodes.Element
 
 class DatabaseGdrive2 : Gdriveplayer() {
-    override var mainUrl = "https://databasegdriveplayer.co"
+    override val mainUrl = "https://databasegdriveplayer.co"
 }
 
 class DatabaseGdrive : Gdriveplayer() {
-    override var mainUrl = "https://series.databasegdriveplayer.co"
+    override val mainUrl = "https://series.databasegdriveplayer.co"
 }
 
 class Gdriveplayerapi : Gdriveplayer() {
@@ -73,10 +75,9 @@ open class Gdriveplayer : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val document = app.get(url).document
-
         val eval = unpackJs(document)?.replace("\\", "") ?: return
         val data = Regex("data='(\\S+?)'").first(eval) ?: return
         val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
@@ -85,8 +86,8 @@ open class Gdriveplayer : ExtractorApi() {
                 it.toInt().toChar().toString()
             }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.encodeToByteArray() }
                 ?: throw ErrorLoadingException("can't find password")
-        val decryptedData = cryptoAESHandler(data, password, false, false)?.let { getAndUnpack(it) }?.replace("\\", "")
 
+        val decryptedData = cryptoAESHandler(data, password, false, false)?.let { getAndUnpack(it) }?.replace("\\", "")
         val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],")
         val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],")
 
@@ -111,16 +112,17 @@ open class Gdriveplayer : ExtractorApi() {
                 subtitleCallback.invoke(
                     newSubtitleFile(
                         sub.label,
-                        httpsify(sub.file)
+                        httpsify(sub.file),
                     )
                 )
             }
         }
     }
 
+    @Serializable
     data class Tracks(
-        @JsonProperty("file") val file: String,
+        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("kind") val kind: String,
+        @JsonProperty("kind") @SerialName("kind") val kind: String,
-        @JsonProperty("label") val label: String,
+        @JsonProperty("label") @SerialName("label") val label: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt

@@ -8,6 +8,8 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlin.math.round
 
 open class Gofile : ExtractorApi() {
@@ -20,20 +22,18 @@ open class Gofile : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1) ?: return
-
         val token = app.post(
             "$mainApi/accounts",
         ).parsedSafe<AccountResponse>()?.data?.token ?: return
 
         val globalRes = app.get("$mainUrl/dist/js/config.js").text
         val wt = Regex("""appdata\.wt\s*=\s*[\"']([^\"']+)[\"']""").find(globalRes)?.groupValues?.get(1) ?: return
-
         val headers = mapOf(
             "Authorization" to "Bearer $token",
-            "X-Website-Token" to wt
+            "X-Website-Token" to wt,
         )
 
         val parsedResponse = app.get(
@@ -42,7 +42,6 @@ open class Gofile : ExtractorApi() {
         ).parsedSafe<GofileResponse>()
 
         val childrenMap = parsedResponse?.data?.children ?: return
-
         for ((_, file) in childrenMap) {
             if (file.link.isNullOrEmpty() || file.type != "file") continue
             val fileName = file.name ?: ""
@@ -54,7 +53,7 @@ open class Gofile : ExtractorApi() {
                     "Gofile",
                     "[Gofile] $fileName [$formattedSize]",
                     file.link,
-                    ExtractorLinkType.VIDEO
+                    ExtractorLinkType.VIDEO,
                 ) {
                     this.quality = getQuality(fileName)
                     this.headers = mapOf("Cookie" to "accountToken=$token")
@@ -84,26 +83,31 @@ open class Gofile : ExtractorApi() {
         }
     }
 
+    @Serializable
     data class AccountResponse(
-        @JsonProperty("data") val data: AccountData? = null
+        @JsonProperty("data") @SerialName("data") val data: AccountData? = null,
     )
 
+    @Serializable
     data class AccountData(
-        @JsonProperty("token") val token: String? = null
+        @JsonProperty("token") @SerialName("token") val token: String? = null,
     )
 
+    @Serializable
     data class GofileResponse(
-        @JsonProperty("data") val data: GofileData? = null
+        @JsonProperty("data") @SerialName("data") val data: GofileData? = null,
     )
 
+    @Serializable
     data class GofileData(
-        @JsonProperty("children") val children: Map<String, GofileFile>? = null
+        @JsonProperty("children") @SerialName("children") val children: Map<String, GofileFile>? = null,
     )
 
+    @Serializable
     data class GofileFile(
-        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("name") @SerialName("name") val name: String? = null,
-        @JsonProperty("link") val link: String? = null,
+        @JsonProperty("link") @SerialName("link") val link: String? = null,
-        @JsonProperty("size") val size: Long? = 0L
+        @JsonProperty("size") @SerialName("size") val size: Long? = 0L,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt

@@ -8,39 +8,41 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.helper.AesHelper
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class HDMomPlayer : ExtractorApi() {
     override val name = "HDMomPlayer"
     override val mainUrl = "https://hdmomplayer.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val m3uLink: String?
         val extRef = referer ?: ""
         val iSource = app.get(url, referer = extRef).text
-
         val bePlayer = Regex("""bePlayer\('([^']+)',\s*'(\{[^\}]+\})'\);""").find(iSource)?.groupValues
         if (bePlayer != null) {
             val bePlayerPass = bePlayer.get(1)
             val bePlayerData = bePlayer.get(2)
             val encrypted = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.encodeToByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
-
             m3uLink = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
         } else {
             m3uLink = Regex("""file:\"([^\"]+)""").find(iSource)?.groupValues?.get(1)
-
             val trackStr = Regex("""tracks:\[([^\]]+)""").find(iSource)?.groupValues?.get(1)
             if (trackStr != null) {
-                val tracks:List<Track> = parseJson<List<Track>>("[${trackStr}]")
+                val tracks = parseJson<List<Track>>("[${trackStr}]")
-
                 for (track in tracks) {
                     if (track.file == null || track.label == null) continue
                     if (track.label.contains("Forced")) continue
-
                     subtitleCallback.invoke(
                         newSubtitleFile(
                             lang = track.label,
-                            url  = fixUrl(mainUrl + track.file)
+                            url = fixUrl(mainUrl + track.file),
                         )
                     )
                 }
@@ -52,7 +54,7 @@ open class HDMomPlayer : ExtractorApi() {
                 source = this.name,
                 name = this.name,
                 url = m3uLink ?: throw ErrorLoadingException("m3u link not found"),
-                type = ExtractorLinkType.M3U8
+                type = ExtractorLinkType.M3U8,
             ) {
                 this.referer = url
                 this.quality = Qualities.Unknown.value
@@ -60,11 +62,12 @@ open class HDMomPlayer : ExtractorApi() {
         )
     }
 
+    @Serializable
     data class Track(
-        @JsonProperty("file")     val file: String?,
+        @JsonProperty("file") @SerialName("file") val file: String?,
-        @JsonProperty("label")    val label: String?,
+        @JsonProperty("label") @SerialName("label") val label: String?,
-        @JsonProperty("kind")     val kind: String?,
+        @JsonProperty("kind") @SerialName("kind") val kind: String?,
-        @JsonProperty("language") val language: String?,
+        @JsonProperty("language") @SerialName("language") val language: String?,
-        @JsonProperty("default")  val default: String?
+        @JsonProperty("default") @SerialName("default") val default: String?,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDPlayerSystemExtractor.kt

@@ -2,56 +2,60 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class HDPlayerSystem : ExtractorApi() {
     override val name = "HDPlayerSystem"
     override val mainUrl = "https://hdplayersystem.live"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val extRef = referer ?: ""
         val vidId = if (url.contains("video/")) {
             url.substringAfter("video/")
         } else {
             url.substringAfter("?data=")
         }
-        val postUrl = "${mainUrl}/player/index.php?data=${vidId}&do=getVideo"
+        val postUrl = "$mainUrl/player/index.php?data=$vidId&do=getVideo"
-
         val response = app.post(
             postUrl,
             data = mapOf(
                 "hash" to vidId,
-                "r"    to extRef
+                "r" to extRef,
             ),
             referer = extRef,
             headers = mapOf(
                 "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8",
-                "X-Requested-With" to "XMLHttpRequest"
+                "X-Requested-With" to "XMLHttpRequest",
             )
         )
 
         val videoResponse = response.parsedSafe<SystemResponse>() ?: throw ErrorLoadingException("failed to parse response")
         val m3uLink = videoResponse.securedLink
-
         callback.invoke(
             newExtractorLink(
                 source = this.name,
                 name = this.name,
-                url     = m3uLink
+                url = m3uLink,
-            ) {
+            ) { this.referer = extRef }
-                this.referer = extRef
-            }
         )
     }
 
+    @Serializable
     data class SystemResponse(
-        @JsonProperty("hls")         val hls: String,
+        @JsonProperty("hls") @SerialName("hls") val hls: String,
-        @JsonProperty("videoImage")  val videoImage: String? = null,
+        @JsonProperty("videoImage") @SerialName("videoImage") val videoImage: String? = null,
-        @JsonProperty("videoSource") val videoSource: String,
+        @JsonProperty("videoSource") @SerialName("videoSource") val videoSource: String,
-        @JsonProperty("securedLink") val securedLink: String
+        @JsonProperty("securedLink") @SerialName("securedLink") val securedLink: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt

@@ -9,6 +9,8 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getAndUnpack
 import com.lagradost.cloudstream3.utils.getPacked
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Jeniusplay : ExtractorApi() {
     override val name = "Jeniusplay"
@@ -19,16 +21,15 @@ open class Jeniusplay : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val document = app.get(url, referer = "$mainUrl/").document
         val hash = url.split("/").last().substringAfter("data=")
-
         val m3uLink = app.post(
             url = "$mainUrl/player/index.php?data=$hash&do=getVideo",
             data = mapOf("hash" to hash, "r" to "$referer"),
             referer = url,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
         ).parsed<ResponseSource>().videoSource
 
         M3u8Helper.generateM3u8(
@@ -36,7 +37,6 @@ open class Jeniusplay : ExtractorApi() {
             m3uLink,
             url,
         ).forEach(callback)
-
         document.select("script").map { script ->
             if (getPacked(script.data()) != null) {
                 val unpacked = getAndUnpack(script.data())
@@ -45,9 +45,10 @@ open class Jeniusplay : ExtractorApi() {
         }
     }
 
+    @Serializable
     data class ResponseSource(
-        @JsonProperty("hls") val hls: Boolean,
+        @JsonProperty("hls") @SerialName("hls") val hls: Boolean,
-        @JsonProperty("videoSource") val videoSource: String,
+        @JsonProperty("videoSource") @SerialName("videoSource") val videoSource: String,
-        @JsonProperty("securedLink") val securedLink: String?,
+        @JsonProperty("securedLink") @SerialName("securedLink") val securedLink: String?,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt

@@ -7,6 +7,8 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Linkbox : ExtractorApi() {
     override val name = "Linkbox"
@@ -17,7 +19,7 @@ open class Linkbox : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val token = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1)
         val id = app.get("$mainUrl/api/file/share_out_list/?sortField=utime&sortAsc=0&pageNo=1&pageSize=50&shareToken=$token").parsedSafe<Responses>()?.data?.itemId
@@ -36,22 +38,25 @@ open class Linkbox : ExtractorApi() {
             }
     }
 
+    @Serializable
     data class Resolutions(
-        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("url") @SerialName("url") val url: String? = null,
-        @JsonProperty("resolution") val resolution: String? = null,
+        @JsonProperty("resolution") @SerialName("resolution") val resolution: String? = null,
     )
 
+    @Serializable
     data class ItemInfo(
-        @JsonProperty("resolutionList") val resolutionList: ArrayList<Resolutions>? = arrayListOf(),
+        @JsonProperty("resolutionList") @SerialName("resolutionList") val resolutionList: ArrayList<Resolutions>? = arrayListOf(),
     )
 
+    @Serializable
     data class Data(
-        @JsonProperty("itemInfo") val itemInfo: ItemInfo? = null,
+        @JsonProperty("itemInfo") @SerialName("itemInfo") val itemInfo: ItemInfo? = null,
-        @JsonProperty("itemId") val itemId: String? = null,
+        @JsonProperty("itemId") @SerialName("itemId") val itemId: String? = null,
     )
 
+    @Serializable
     data class Responses(
-        @JsonProperty("data") val data: Data? = null,
+        @JsonProperty("data") @SerialName("data") val data: Data? = null,
     )
-
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MailRuExtractor.kt

@@ -2,51 +2,57 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class MailRu : ExtractorApi() {
     override val name = "MailRu"
     override val mainUrl = "https://my.mail.ru"
     override val requiresReferer = false
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val extRef = referer ?: ""
-
         val vidId = url.substringAfter("video/embed/").trim()
-        val videoReq  = app.get("${mainUrl}/+/video/meta/${vidId}", referer=url)
+        val videoReq = app.get("$mainUrl/+/video/meta/$vidId", referer = url)
         val videoKey = videoReq.cookies["video_key"].toString()
-
+        val videoData = AppUtils.tryParseJson<MailRuData>(videoReq.text) ?:
-        val videoData = AppUtils.tryParseJson<MailRuData>(videoReq.text) ?: throw ErrorLoadingException("Video not found")
+            throw ErrorLoadingException("Video not found")
 
         for (video in videoData.videos) {
-
             val videoUrl = if (video.url.startsWith("//")) "https:${video.url}" else video.url
-
             callback.invoke(
                 newExtractorLink(
                     source = this.name,
                     name = this.name,
                     url = videoUrl,
-                    type    = ExtractorLinkType.M3U8
+                    type = ExtractorLinkType.M3U8,
                 ) {
                     this.referer = url
-                    this.headers = mapOf("Cookie" to "video_key=${videoKey}")
+                    this.headers = mapOf("Cookie" to "video_key=$videoKey")
                     this.quality = getQualityFromName(video.key)
                 }
             )
         }
     }
 
+    @Serializable
     data class MailRuData(
-        @JsonProperty("provider") val provider: String,
+        @JsonProperty("provider") @SerialName("provider") val provider: String,
-        @JsonProperty("videos")   val videos: List<MailRuVideoData>
+        @JsonProperty("videos") @SerialName("videos") val videos: List<MailRuVideoData>,
     )
 
+    @Serializable
     data class MailRuVideoData(
-        @JsonProperty("url") val url: String,
+        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("key") val key: String
+        @JsonProperty("key") @SerialName("key") val key: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt

@@ -7,19 +7,26 @@ import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Odnoklassniki : ExtractorApi() {
     override val name = "Odnoklassniki"
     override val mainUrl = "https://odnoklassniki.ru"
     override val requiresReferer = false
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val headers = mapOf(
             "Accept" to "*/*",
             "Connection" to "keep-alive",
@@ -29,18 +36,17 @@ open class Odnoklassniki : ExtractorApi() {
             "Origin" to mainUrl,
             "User-Agent" to USER_AGENT,
         )
+
         val embedUrl = url.replace("/video/", "/videoembed/")
         val videoReq = app.get(embedUrl, headers = headers).text.replace("\\"", "\"").replace("\\\\", "\\")
             .replace(Regex("\\\\u([0-9A-Fa-f]{4})")) { matchResult ->
                 matchResult.groupValues[1].toInt(16).toChar().toString()
             }
+
         val videosStr = Regex(""""videos":(\[[^]]*])""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
-        val videos    = AppUtils.tryParseJson<List<OkRuVideo>>(videosStr) ?: throw ErrorLoadingException("Video not found")
+        val videos = tryParseJson<List<OkRuVideo>>(videosStr) ?: throw ErrorLoadingException("Video not found")
-
         for (video in videos) {
-
             val videoUrl = if (video.url.startsWith("//")) "https:${video.url}" else video.url
-
             val quality = video.name.uppercase()
                 .replace("MOBILE", "144p")
                 .replace("LOWEST", "240p")
@@ -56,7 +62,7 @@ open class Odnoklassniki : ExtractorApi() {
                     source = this.name,
                     name = this.name,
                     url = videoUrl,
-                    type    = INFER_TYPE
+                    type = INFER_TYPE,
                 ) {
                     this.referer = "$mainUrl/"
                     this.quality = getQualityFromName(quality)
@@ -66,8 +72,9 @@ open class Odnoklassniki : ExtractorApi() {
         }
     }
 
+    @Serializable
     data class OkRuVideo(
-        @JsonProperty("name") val name: String,
+        @JsonProperty("name") @SerialName("name") val name: String,
-        @JsonProperty("url")  val url: String,
+        @JsonProperty("url") @SerialName("url") val url: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PeaceMakerstExtractor.kt

@@ -2,49 +2,55 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class PeaceMakerst : ExtractorApi() {
     override val name = "PeaceMakerst"
     override val mainUrl = "https://peacemakerst.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val m3uLink: String?
         val extRef = referer ?: ""
-        val postUrl = "${url}?do=getVideo"
+        val postUrl = "$url?do=getVideo"
-
         val response = app.post(
             postUrl,
             data = mapOf(
                 "hash" to url.substringAfter("video/"),
                 "r" to extRef,
-                "s"    to ""
+                "s" to "",
             ),
             referer = extRef,
             headers = mapOf(
                 "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8",
-                "X-Requested-With" to "XMLHttpRequest"
+                "X-Requested-With" to "XMLHttpRequest",
-            )
+            ),
         )
+
         if (response.text.contains("teve2.com.tr\\/embed\\/")) {
             val teve2Id = response.text.substringAfter("teve2.com.tr\\/embed\\/").substringBefore("\"")
             val teve2Response = app.get(
-                "https://www.teve2.com.tr/action/media/${teve2Id}",
+                "https://www.teve2.com.tr/action/media/$teve2Id",
-                referer = "https://www.teve2.com.tr/embed/${teve2Id}"
+                referer = "https://www.teve2.com.tr/embed/$teve2Id",
             ).parsedSafe<Teve2ApiResponse>() ?: throw ErrorLoadingException("teve2 response is null")
-
             m3uLink = teve2Response.media.link.serviceUrl + "//" + teve2Response.media.link.securePath
         } else {
             val videoResponse = response.parsedSafe<PeaceResponse>() ?: throw ErrorLoadingException("peace response is null")
             val videoSources = videoResponse.videoSources
-            if (videoSources.isNotEmpty()) {
+            m3uLink = if (videoSources.isNotEmpty()) {
-                m3uLink = videoSources.lastOrNull()?.file
+                videoSources.lastOrNull()?.file
             } else {
-                m3uLink = null
+                null
             }
         }
 
@@ -60,29 +66,34 @@ open class PeaceMakerst : ExtractorApi() {
         )
     }
 
+    @Serializable
     data class PeaceResponse(
-        @JsonProperty("videoImage")   val videoImage: String?,
+        @JsonProperty("videoImage") @SerialName("videoImage") val videoImage: String?,
-        @JsonProperty("videoSources") val videoSources: List<VideoSource>,
+        @JsonProperty("videoSources") @SerialName("videoSources") val videoSources: List<VideoSource>,
-        @JsonProperty("sIndex")       val sIndex: String,
+        @JsonProperty("sIndex") @SerialName("sIndex") val sourceIndex: String,
-        @JsonProperty("sourceList")   val sourceList: Map<String, String>
+        @JsonProperty("sourceList") @SerialName("sourceList") val sourceList: Map<String, String>,
     )
 
+    @Serializable
     data class VideoSource(
-        @JsonProperty("file")  val file: String,
+        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("label") val label: String,
+        @JsonProperty("label") @SerialName("label") val label: String,
-        @JsonProperty("type")  val type: String
+        @JsonProperty("type") @SerialName("type") val type: String,
     )
 
+    @Serializable
     data class Teve2ApiResponse(
-        @JsonProperty("Media") val media: Teve2Media
+        @JsonProperty("Media") @SerialName("Media") val media: Teve2Media,
     )
 
+    @Serializable
     data class Teve2Media(
-        @JsonProperty("Link") val link: Teve2Link
+        @JsonProperty("Link") @SerialName("Link") val link: Teve2Link,
     )
 
+    @Serializable
     data class Teve2Link(
-        @JsonProperty("ServiceUrl") val serviceUrl: String,
+        @JsonProperty("ServiceUrl") @SerialName("ServiceUrl") val serviceUrl: String,
-        @JsonProperty("SecurePath") val securePath: String
+        @JsonProperty("SecurePath") @SerialName("SecurePath") val securePath: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt

@@ -1,33 +1,28 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.api.Log
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.api.Log
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class PlayLtXyz : ExtractorApi() {
-    override val name: String = "PlayLt"
+    override val name = "PlayLt"
-    override val mainUrl: String = "https://play.playlt.xyz"
+    override val mainUrl = "https://play.playlt.xyz"
     override val requiresReferer = true
 
-    private data class ResponseData(
-        @JsonProperty("data") val data: String? = null
-    )
-
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
         val extractedLinksList = mutableListOf<ExtractorLink>()
-        //Log.i(this.name, "Result => (url) $url")
         var idUser = ""
         var idFile = ""
         var bodyText = ""
         val doc = app.get(url, referer = referer).document
-        //Log.i(this.name, "Result => (url, script) $url / ${doc.select("script")}")
         bodyText = doc.select("script").firstOrNull {
             val text = it.toString()
             text.contains("var idUser")
         }?.toString() ?: ""
-        //Log.i(this.name, "Result => (bodyText) $bodyText")
         if (bodyText.isNotBlank()) {
             idUser = "(?<=var idUser = \")(.*)(?=\";)".toRegex().find(bodyText)
                 ?.groupValues?.get(0) ?: ""
@@ -35,29 +30,27 @@ open class PlayLtXyz: ExtractorApi() {
             idFile = "(?<=var idfile = \")(.*)(?=\";)".toRegex().find(bodyText)
                 ?.groupValues?.get(0) ?: ""
         }
-        //Log.i(this.name, "Result => (idUser, idFile) $idUser / $idFile")
+
         if (idUser.isNotBlank() && idFile.isNotBlank()) {
-            //val sess = HttpSession()
             val ajaxHead = mapOf(
                 Pair("Origin", mainUrl),
                 Pair("Referer", mainUrl),
                 Pair("Sec-Fetch-Site", "same-site"),
                 Pair("Sec-Fetch-Mode", "cors"),
-                Pair("Sec-Fetch-Dest", "empty")
+                Pair("Sec-Fetch-Dest", "empty"),
-            )
-            val ajaxData = mapOf(
-                Pair("referrer", referer ?: mainUrl),
-                Pair("typeend", "html")
             )
 
-            //idUser = 608f7c85cf0743547f1f1b4e
+            val ajaxData = mapOf(
-            val posturl = "https://api-plhq.playlt.xyz/apiv5/$idUser/$idFile"
+                Pair("referrer", referer ?: mainUrl),
-            val data = app.post(posturl, headers = ajaxHead, data = ajaxData)
+                Pair("typeend", "html"),
-            //Log.i(this.name, "Result => (posturl) $posturl")
+            )
+
+            val postUrl = "https://api-plhq.playlt.xyz/apiv5/$idUser/$idFile"
+            val data = app.post(postUrl, headers = ajaxHead, data = ajaxData)
             if (data.isSuccessful) {
-                val itemstr = data.text
+                val itemStr = data.text
-                Log.i(this.name, "Result => (data) $itemstr")
+                Log.i(this.name, "Result => (data) $itemStr")
-                tryParseJson<ResponseData?>(itemstr)?.let { item ->
+                tryParseJson<ResponseData>(itemStr)?.let { item ->
                     val linkUrl = item.data ?: ""
                     if (linkUrl.isNotBlank()) {
                         extractedLinksList.add(
@@ -65,7 +58,7 @@ open class PlayLtXyz: ExtractorApi() {
                                 source = name,
                                 name = name,
                                 url = linkUrl,
-                                type = ExtractorLinkType.M3U8
+                                type = ExtractorLinkType.M3U8,
                             ) {
                                 this.referer = url
                                 this.quality = Qualities.Unknown.value
@@ -75,6 +68,12 @@ open class PlayLtXyz: ExtractorApi() {
                 }
             }
         }
+
         return extractedLinksList
     }
+
+    @Serializable
+    private data class ResponseData(
+        @JsonProperty("data") @SerialName("data") val data: String? = null,
+    )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt

@@ -7,8 +7,8 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64DecodeArray
 import com.lagradost.cloudstream3.base64Encode
 import com.lagradost.cloudstream3.newSubtitleFile
-import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
@@ -16,6 +16,8 @@ import dev.whyoleg.cryptography.CryptographyProvider
 import dev.whyoleg.cryptography.DelicateCryptographyApi
 import dev.whyoleg.cryptography.algorithms.AES
 import dev.whyoleg.cryptography.algorithms.MD5
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 class Megacloud : Rabbitstream() {
     override val name = "Megacloud"
@@ -36,6 +38,7 @@ class Megacloud : Rabbitstream() {
                 extractedKey += sourcesArray[i].toString()
                 sourcesArray[i] = ' '
             }
+
             currentIndex += index[1]
         }
 
@@ -55,7 +58,7 @@ class Megacloud : Rabbitstream() {
             val matchKey2 = matchingKey(match.groupValues[2])
             try {
                 listOf(matchKey1.toInt(16), matchKey2.toInt(16))
-            } catch (e: NumberFormatException) {
+            } catch (_: NumberFormatException) {
                 emptyList()
             }
         }.filter { it.isNotEmpty() }
@@ -86,26 +89,25 @@ open class Rabbitstream : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val id = url.substringAfterLast("/").substringBefore("?")
-
         val response = app.get(
             "$mainUrl/$embed/getSources?id=$id",
             referer = mainUrl,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
         )
 
         val encryptedMap = response.parsedSafe<SourcesEncrypted>()
         val sources = encryptedMap?.sources
         val decryptedSources = if (sources == null || encryptedMap.encrypted == false) {
-            response.parsedSafe()
+            response.parsedSafe<SourcesResponses>()
         } else {
             val (key, encData) = extractRealKey(sources)
-            val decrypted = decryptMapped<List<Sources>>(encData, key)
+            val decrypted = tryParseJson<List<Sources>>(decrypt(encData, key))
             SourcesResponses(
                 sources = decrypted,
-                tracks = encryptedMap.tracks
+                tracks = encryptedMap.tracks,
             )
         }
 
@@ -121,7 +123,7 @@ open class Rabbitstream : ExtractorApi() {
             subtitleCallback.invoke(
                 newSubtitleFile(
                     track?.label ?: return@map,
-                    track.file ?: return@map
+                    track.file ?: return@map,
                 )
             )
         }
@@ -133,65 +135,65 @@ open class Rabbitstream : ExtractorApi() {
         return extractedKey to sources
     }
 
-    private inline fun <reified T> decryptMapped(input: String, key: String): T? {
+    private suspend fun decrypt(input: String, key: String): String {
-        val decrypt = decrypt(input, key)
-        return AppUtils.tryParseJson(decrypt)
-    }
-
-    private fun decrypt(input: String, key: String): String {
         return decryptSourceUrl(
             generateKey(
                 salt = base64DecodeArray(input).copyOfRange(8, 16),
-                secret = key.encodeToByteArray()
+                secret = key.encodeToByteArray(),
             ), input
         )
     }
 
-    private fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
+    private suspend fun generateKey(salt: ByteArray, secret: ByteArray): ByteArray {
         var key = md5(secret + salt)
         var currentKey = key
         while (currentKey.size < 48) {
             key = md5(key + secret + salt)
             currentKey += key
         }
+
         return currentKey
     }
 
-    private fun md5(input: ByteArray): ByteArray =
+    private suspend fun md5(input: ByteArray): ByteArray =
-        md5Hasher.hashBlocking(input)
+        md5Hasher.hash(input)
 
     @OptIn(DelicateCryptographyApi::class)
-    private fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
+    private suspend fun decryptSourceUrl(decryptionKey: ByteArray, sourceUrl: String): String {
         val cipherData = base64DecodeArray(sourceUrl)
         val encrypted = cipherData.copyOfRange(16, cipherData.size)
         val keyBytes = decryptionKey.copyOfRange(0, 32)
         val ivBytes = decryptionKey.copyOfRange(32, decryptionKey.size)
 
-        val aesKey = aesCbc.keyDecoder().decodeFromByteArrayBlocking(AES.Key.Format.RAW, keyBytes)
+        val aesKey = aesCbc.keyDecoder().decodeFromByteArray(AES.Key.Format.RAW, keyBytes)
-        val decryptedData = aesKey.cipher(padding = true).decryptWithIvBlocking(ivBytes, encrypted)
+        val decryptedData = aesKey.cipher(padding = true).decryptWithIv(ivBytes, encrypted)
         return decryptedData.decodeToString()
     }
 
+    @Serializable
     data class Tracks(
-        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
+        @JsonProperty("kind") @SerialName("kind") val kind: String? = null,
     )
 
+    @Serializable
     data class Sources(
-        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
     )
 
+    @Serializable
     data class SourcesResponses(
-        @JsonProperty("sources") val sources: List<Sources?>? = emptyList(),
+        @JsonProperty("sources") @SerialName("sources") val sources: List<Sources?>? = emptyList(),
-        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
+        @JsonProperty("tracks") @SerialName("tracks") val tracks: List<Tracks?>? = emptyList(),
     )
 
+    @Serializable
     data class SourcesEncrypted(
-        @JsonProperty("sources") val sources: String? = null,
+        @JsonProperty("sources") @SerialName("sources") val sources: String? = null,
-        @JsonProperty("encrypted") val encrypted: Boolean? = null,
+        @JsonProperty("encrypted") @SerialName("encrypted") val encrypted: Boolean? = null,
-        @JsonProperty("tracks") val tracks: List<Tracks?>? = emptyList(),
+        @JsonProperty("tracks") @SerialName("tracks") val tracks: List<Tracks?>? = emptyList(),
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SobreatsesuypExtractor.kt

@@ -2,51 +2,53 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 
 open class Sobreatsesuyp : ExtractorApi() {
     override val name = "Sobreatsesuyp"
     override val mainUrl = "https://sobreatsesuyp.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val extRef = referer ?: ""
-
         val videoReq = app.get(url, referer = extRef).text
-
         val file = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-        val postLink = "${mainUrl}/" + file.replace("\\", "")
+        val postLink = "$mainUrl/" + file.replace("\\", "")
-        val rawList  = app.post(postLink, referer = extRef).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
+        val rawList = app.post(postLink, referer = extRef).parsedSafe<List<JsonElement>>() ?: throw ErrorLoadingException("Post link not found")
-
         val postJson: List<SobreatsesuypVideoData> = rawList.drop(1).map { item ->
             val mapItem = item as Map<*, *>
             SobreatsesuypVideoData(
                 title = mapItem["title"] as? String,
-                file  = mapItem["file"]  as? String
+                file = mapItem["file"] as? String,
             )
         }
 
         for (item in postJson) {
             if (item.file == null || item.title == null) continue
-
+            val videoData = app.post("$mainUrl/playlist/${item.file.substring(1)}.txt", referer = extRef).text
-            val videoData = app.post("${mainUrl}/playlist/${item.file.substring(1)}.txt", referer = extRef).text
-
             callback.invoke(
                 newExtractorLink(
                     source = this.name,
                     name = "${this.name} - ${item.title}",
                     url = videoData,
-                ) {
+                ) { this.referer = extRef }
-                    this.referer = extRef
-                }
             )
         }
     }
 
+    @Serializable
     data class SobreatsesuypVideoData(
-        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("file")  val file: String?  = null
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamEmbed.kt

@@ -7,22 +7,23 @@ 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
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class StreamEmbed : ExtractorApi() {
-    override var name = "StreamEmbed"
+    override val name = "StreamEmbed"
-    override var mainUrl = "https://watch.gxplayer.xyz"
+    override val mainUrl = "https://watch.gxplayer.xyz"
     override val requiresReferer = true
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> 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}",
@@ -30,14 +31,15 @@ open class StreamEmbed : ExtractorApi() {
         ).forEach(callback)
     }
 
+    @Serializable
     private data class Details(
-        @JsonProperty("id") val id: String,
+        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("uid") val uid: String,
+        @JsonProperty("uid") @SerialName("uid") val uid: String,
-        @JsonProperty("slug") val slug: String,
+        @JsonProperty("slug") @SerialName("slug") val slug: String,
-        @JsonProperty("title") val title: String,
+        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("quality") val quality: String,
+        @JsonProperty("quality") @SerialName("quality") val quality: String,
-        @JsonProperty("type") val type: String,
+        @JsonProperty("type") @SerialName("type") val type: String,
-        @JsonProperty("status") val status: String,
+        @JsonProperty("status") @SerialName("status") val status: String,
-        @JsonProperty("md5") val md5: String,
+        @JsonProperty("md5") @SerialName("md5") val md5: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt

@@ -7,6 +7,8 @@ import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlin.random.Random
 
 class Sblona : StreamSB() {
@@ -141,17 +143,15 @@ open class StreamSB : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
-        val regexID =
+        val regexId =
             Regex("(embed-[a-zA-Z\\d]{0,8}[a-zA-Z\\d_-]+|/e/[a-zA-Z\\d]{0,8}[a-zA-Z\\d_-]+)")
-        val id = regexID.findAll(url).map {
+        val id = regexId.findAll(url).map {
             it.value.replace(Regex("(embed-|/e/)"), "")
         }.first()
         val master = "$mainUrl/375664356a494546326c4b797c7c6e756577776778623171737/${encodeId(id)}"
-        val headers = mapOf(
+        val headers = mapOf("watchsb" to "sbstream")
-            "watchsb" to "sbstream",
-        )
         val mapped = app.get(
             master.lowercase(),
             headers = headers,
@@ -161,9 +161,8 @@ open class StreamSB : ExtractorApi() {
             name,
             mapped?.streamData?.file ?: return,
             url,
-            headers = headers
+            headers = headers,
         ).forEach(callback)
-
         mapped.streamData.subs?.map {sub ->
             subtitleCallback.invoke(
                 newSubtitleFile(
@@ -189,25 +188,27 @@ open class StreamSB : ExtractorApi() {
         }
     }
 
+    @Serializable
     data class Subs(
-        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
     )
 
+    @Serializable
     data class StreamData(
-        @JsonProperty("file") val file: String,
+        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("cdn_img") val cdnImg: String,
+        @JsonProperty("cdn_img") @SerialName("cdn_img") val cdnImg: String,
-        @JsonProperty("hash") val hash: String,
+        @JsonProperty("hash") @SerialName("hash") val hash: String,
-        @JsonProperty("subs") val subs: ArrayList<Subs>? = arrayListOf(),
+        @JsonProperty("subs") @SerialName("subs") val subs: ArrayList<Subs>? = arrayListOf(),
-        @JsonProperty("length") val length: String,
+        @JsonProperty("length") @SerialName("length") val length: String,
-        @JsonProperty("id") val id: String,
+        @JsonProperty("id") @SerialName("id") val id: String,
-        @JsonProperty("title") val title: String,
+        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("backup") val backup: String,
+        @JsonProperty("backup") @SerialName("backup") val backup: String,
     )
 
+    @Serializable
     data class Main(
-        @JsonProperty("stream_data") val streamData: StreamData,
+        @JsonProperty("stream_data") @SerialName("stream_data") val streamData: StreamData,
-        @JsonProperty("status_code") val statusCode: Int,
+        @JsonProperty("status_code") @SerialName("status_code") val statusCode: Int,
     )
-
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt

@@ -4,8 +4,8 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.evalJs
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import org.mozilla.javascript.Context
 
 class Watchadsontape : StreamTape() {
     override var mainUrl = "https://watchadsontape.com"
@@ -30,23 +30,13 @@ open class StreamTape : ExtractorApi() {
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         with(app.get(url)) {
-            var result =
+            val result =
                 this.document.select("script").firstOrNull { it.html().contains("botlink').innerHTML") }
                     ?.html()?.lines()?.firstOrNull { it.contains("botlink').innerHTML") }?.let {
-                        val scriptContent =
+                        val scriptContent = it.substringAfter(").innerHTML").replaceFirst("=", "var url =")
-                            it.substringAfter(").innerHTML").replaceFirst("=", "var url =")
+                        evalJs(scriptContent, "url")?.toString()
-                        val rhino = Context.enter()
-                        rhino.setInterpretedMode(true)
-                        val scope = rhino.initStandardObjects()
-                        var result = ""
-                        try {
-                            rhino.evaluateString(scope, scriptContent, "url", 1, null)
-                            result = scope.get("url", scope).toString()
-                        }finally {
-                            rhino.close()
-                        }
-                        result
                     }
+
             if (!result.isNullOrEmpty()) {
                 val extractedUrl = "https:${result}&stream=1"
                 return listOf(

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt

@@ -28,7 +28,6 @@ class Ewish : StreamWishExtractor() {
     override val mainUrl = "https://embedwish.com"
 }
 
-@Prerelease
 class Hgcloudto : StreamWishExtractor() {
     override val name = "Hgcloud"
     override val mainUrl = "https://Hgcloud.to"

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamcash.kt

@@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
-@Prerelease
 open class Streamcash: ExtractorApi() {
     override val name: String = "Streamcash"
     override val mainUrl: String = "https://streamcash.to"

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt

@@ -9,10 +9,11 @@ import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.nicehttp.RequestBodyTypes
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
 
-
 class Streamlare : Slmaxed() {
     override val mainUrl = "https://streamlare.com/"
 }
@@ -24,27 +25,11 @@ open class Slmaxed : ExtractorApi() {
 
     // https://slmaxed.com/e/oLvgezw3LjPzbp8E -> oLvgezw3LjPzbp8E
     val embedRegex = Regex("""/e/([^/]*)""")
-
-
-    data class JsonResponse(
-        @JsonProperty val status: String? = null,
-        @JsonProperty val message: String? = null,
-        @JsonProperty val type: String? = null,
-        @JsonProperty val token: String? = null,
-        @JsonProperty val result: Map<String, Result>? = null
-    )
-
-    data class Result(
-        @JsonProperty val label: String? = null,
-        @JsonProperty val file: String? = null,
-        @JsonProperty val type: String? = null
-    )
-
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val id = embedRegex.find(url)!!.groupValues[1]
         val json = app.post(
             "${mainUrl}api/video/stream/get",
-            requestBody = """{"id":"$id"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
+            requestBody = """{"id":"$id"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull()),
         ).parsed<JsonResponse>()
         return json.result?.mapNotNull {
             it.value.let { result ->
@@ -52,18 +37,29 @@ open class Slmaxed : ExtractorApi() {
                     this.name,
                     this.name,
                     result.file ?: return@mapNotNull null,
-                    type = if (result.type?.contains(
+                    type = if (result.type?.contains("hls", ignoreCase = true) == true) ExtractorLinkType.M3U8 else INFER_TYPE,
-                            "hls",
-                            ignoreCase = true
-                        ) == true
-                    ) ExtractorLinkType.M3U8 else INFER_TYPE
                 ) {
                     this.referer = url
-                    this.quality =
+                    this.quality = result.label?.replace("p", "", ignoreCase = true)?.trim()?.toIntOrNull()
-                        result.label?.replace("p", "", ignoreCase = true)?.trim()?.toIntOrNull()
                         ?: Qualities.Unknown.value
                 }
             }
         }
     }
+
+    @Serializable
+    data class JsonResponse(
+        @JsonProperty("status") @SerialName("status") val status: String? = null,
+        @JsonProperty("message") @SerialName("message") val message: String? = null,
+        @JsonProperty("type") @SerialName("type") val type: String? = null,
+        @JsonProperty("token") @SerialName("token") val token: String? = null,
+        @JsonProperty("result") @SerialName("result") val result: Map<String, Result>? = null,
+    )
+
+    @Serializable
+    data class Result(
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
+        @JsonProperty("type") @SerialName("type") val type: String? = null,
+    )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt

@@ -8,6 +8,8 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import io.ktor.http.Url
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Streamplay : ExtractorApi() {
     override val name = "Streamplay"
@@ -18,37 +20,36 @@ open class Streamplay : ExtractorApi() {
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val request = app.get(url, referer = referer)
         val redirectUrl = request.url
         val mainServer = Url(redirectUrl).let { "${it.protocol.name}://${it.host}" }
         val key = redirectUrl.substringAfter("embed-").substringBefore(".html")
-        val token =
+        val token = request.document.select("script").find { it.data().contains("sitekey:") }?.data()
-            request.document.select("script").find { it.data().contains("sitekey:") }?.data()
             ?.substringAfterLast("sitekey: '")?.substringBefore("',")?.let { captchaKey ->
                 getCaptchaToken(
                     redirectUrl,
                     captchaKey,
-                        referer = "$mainServer/"
+                    referer = "$mainServer/",
                 )
             } ?: throw ErrorLoadingException("can't bypass captcha")
+
         app.post(
             "$mainServer/player-$key-488x286.html", data = mapOf(
                 "op" to "embed",
-                "token" to token
+                "token" to token,
             ),
             referer = redirectUrl,
             headers = mapOf(
                 "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
-                "Content-Type" to "application/x-www-form-urlencoded"
+                "Content-Type" to "application/x-www-form-urlencoded",
-            )
+            ),
         ).document.select("script").find { script ->
             script.data().contains("eval(function(p,a,c,k,e,d)")
         }?.let {
             val data = getAndUnpack(it.data()).substringAfter("sources=[").substringBefore(",desc")
-                .replace("file", "\"file\"")
+                .replace("file", "\"file\"").replace("label", "\"label\"")
-                .replace("label", "\"label\"")
             tryParseJson<List<Source>>("[$data}]")?.map { res ->
                 callback.invoke(
                     newExtractorLink(
@@ -57,24 +58,21 @@ open class Streamplay : ExtractorApi() {
                         res.file ?: return@map null,
                     ) {
                         this.referer = "$mainServer/"
+                        this.headers = mapOf("Range" to "bytes=0-")
                         this.quality = when (res.label) {
                             "HD" -> Qualities.P720.value
                             "SD" -> Qualities.P480.value
                             else -> Qualities.Unknown.value
                         }
-                        this.headers = mapOf(
-                            "Range" to "bytes=0-"
-                        )
                     }
                 )
             }
         }
-
     }
 
+    @Serializable
     data class Source(
-        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
     )
-
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TRsTXExtractor.kt

@@ -2,30 +2,35 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 
 open class TRsTX : ExtractorApi() {
     override val name = "TRsTX"
     override val mainUrl = "https://trstx.org"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val extRef = referer ?: ""
-
         val videoReq = app.get(url, referer = extRef).text
-
         val file = Regex("""file\":\"([^\"]+)""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
-        val postLink = "${mainUrl}/" + file.replace("\\", "")
+        val postLink = "$mainUrl/" + file.replace("\\", "")
-        val rawList  = app.post(postLink, referer=extRef).parsedSafe<List<Any>>() ?: throw ErrorLoadingException("Post link not found")
+        val rawList = app.post(postLink, referer = extRef).parsedSafe<List<JsonElement>>() ?: throw ErrorLoadingException("Post link not found")
-
         val postJson: List<TrstxVideoData> = rawList.drop(1).map { item ->
             val mapItem = item as Map<*, *>
             TrstxVideoData(
                 title = mapItem["title"] as? String,
-                file  = mapItem["file"]  as? String
+                file = mapItem["file"] as? String,
             )
         }
 
@@ -33,37 +38,32 @@ open class TRsTX : ExtractorApi() {
         val vidMap = mutableListOf<Map<String, String>>()
         for (item in postJson) {
             if (item.file == null || item.title == null) continue
-
+            val fileUrl = "$mainUrl/playlist/" + item.file.substring(1) + ".txt"
-            val fileUrl   = "${mainUrl}/playlist/" + item.file.substring(1) + ".txt"
             val videoData = app.post(fileUrl, referer = extRef).text
-
+            if (videoData in vidLinks) continue
-            if (videoData in vidLinks) { continue }
             vidLinks.add(videoData)
-
             vidMap.add(mapOf(
                 "title" to item.title,
-                "videoData" to videoData
+                "videoData" to videoData,
             ))
         }
 
         for (mapEntry in vidMap) {
             val title = mapEntry["title"] ?: continue
             val m3uLink = mapEntry["videoData"] ?: continue
-
             callback.invoke(
                 newExtractorLink(
                     source = this.name,
-                    name    = "${this.name} - ${title}",
+                    name = "${this.name} - $title",
                     url = m3uLink,
-                ) {
+                ) { this.referer = extRef }
-                    this.referer = extRef
-                }
             )
         }
     }
 
+    @Serializable
     data class TrstxVideoData(
-        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("title") @SerialName("title") val title: String? = null,
-        @JsonProperty("file")  val file: String?  = null
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt

@@ -6,38 +6,42 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Tantifilm : ExtractorApi() {
-    override var name = "Tantifilm"
+    override val name = "Tantifilm"
-    override var mainUrl = "https://cercafilm.net"
+    override val mainUrl = "https://cercafilm.net"
     override val requiresReferer = false
 
-    data class TantifilmJsonData (
-        @JsonProperty("success") val success : Boolean,
-        @JsonProperty("data") val data : List<TantifilmData>,
-        @JsonProperty("captions")val captions : List<String>,
-        @JsonProperty("is_vr") val is_vr : Boolean
-    )
-
-    data class TantifilmData (
-        @JsonProperty("file") val file : String,
-        @JsonProperty("label") val label : String,
-        @JsonProperty("type") val type : String
-    )
-
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val link = "$mainUrl/api/source/${url.substringAfterLast("/")}"
         val response = app.post(link).text.replace("""\""","")
-        val jsonvideodata = parseJson<TantifilmJsonData>(response)
+        val jsonVideoData = parseJson<TantifilmJsonData>(response)
-        return jsonvideodata.data.map {
+        return jsonVideoData.data.map {
             newExtractorLink(
                 this.name,
                 this.name,
-                it.file+".${it.type}"
+                it.file + ".${it.type}",
             ) {
                 this.referer = mainUrl
                 this.quality = it.label.filter{ it.isDigit() }.toInt()
             }
         }
     }
+
+    @Serializable
+    data class TantifilmJsonData(
+        @JsonProperty("success") @SerialName("success") val success: Boolean,
+        @JsonProperty("data") @SerialName("data") val data: List<TantifilmData>,
+        @JsonProperty("captions") @SerialName("captions") val captions: List<String>,
+        @JsonProperty("is_vr") @SerialName("is_vr") val isVr: Boolean,
+    )
+
+    @Serializable
+    data class TantifilmData(
+        @JsonProperty("file") @SerialName("file") val file: String,
+        @JsonProperty("label") @SerialName("label") val label: String,
+        @JsonProperty("type") @SerialName("type") val type: String,
+    )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/TauVideoExtractor.kt

@@ -2,21 +2,27 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class TauVideo : ExtractorApi() {
     override val name = "TauVideo"
     override val mainUrl = "https://tau-video.xyz"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val extRef = referer ?: ""
         val videoKey = url.split("/").last()
-        val videoUrl = "${mainUrl}/api/video/${videoKey}"
+        val videoUrl = "$mainUrl/api/video/$videoKey"
-
         val api = app.get(videoUrl).parsedSafe<TauVideoUrls>() ?: throw ErrorLoadingException("TauVideo")
 
         for (video in api.urls) {
@@ -33,12 +39,14 @@ open class TauVideo : ExtractorApi() {
         }
     }
 
+    @Serializable
     data class TauVideoUrls(
-        @JsonProperty("urls") val urls: List<TauVideoData>
+        @JsonProperty("urls") @SerialName("urls") val urls: List<TauVideoData>,
     )
 
+    @Serializable
     data class TauVideoData(
-        @JsonProperty("url")   val url: String,
+        @JsonProperty("url") @SerialName("url") val url: String,
-        @JsonProperty("label") val label: String,
+        @JsonProperty("label") @SerialName("label") val label: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt

@@ -3,9 +3,6 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
-import org.mozilla.javascript.Context
-import org.mozilla.javascript.EvaluatorException
-import org.mozilla.javascript.Scriptable
 
 open class Userload : ExtractorApi() {
     override var name = "Userload"
@@ -32,20 +29,11 @@ open class Userload : ExtractorApi() {
         return array
     }
 
-    private fun evaluateMath(mathExpression : String): String {
+    private suspend fun evaluateMath(mathExpression: String): String {
-        val rhino = Context.enter()
+        return jsValueToString(evalJs("eval($mathExpression)"))
-        rhino.initStandardObjects()
-        rhino.setInterpretedMode(true)
-        val scope: Scriptable = rhino.initStandardObjects()
-        return try {
-            rhino.evaluateString(scope, "eval($mathExpression)", "JavaScript", 1, null).toString()
-        }
-        catch (e: EvaluatorException){
-            ""
-        }
     }
 
-    private fun decodeVideoJs(text: String): List<String> {
+    private suspend fun decodeVideoJs(text: String): List<String> {
         text.replace("""\s+|/\*.*?\*/""".toRegex(), "")
         val data = text.split("""+(ﾟДﾟ)[ﾟoﾟ]""")[1]
         val chars = data.split("""+ (ﾟДﾟ)[ﾟεﾟ]+""").drop(1)
@@ -74,16 +62,10 @@ open class Userload : ExtractorApi() {
         val val1 = Regex(""""morocco="((.|\\n)*?)"&mycountry="""").find(txtresult)?.groups?.get(1)?.value.toString().drop(1).dropLast(1)
         val val2 = txtresult.substringAfter("""&mycountry="+""").substringBefore(")")
 
-        return listOf(
+        return listOf(val1, val2)
-            val1,
-            val2
-        )
-
-
     }
 
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-
         val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
 
         val response = app.get(url).text

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt

@@ -3,51 +3,51 @@ 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
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Uservideo : ExtractorApi() {
-    override val name: String = "Uservideo"
+    override val name = "Uservideo"
-    override val mainUrl: String = "https://uservideo.xyz"
+    override val mainUrl = "https://uservideo.xyz"
     override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val script = app.get(url).document.selectFirst("script:containsData(hosts =)")?.data()
         val host = script?.substringAfter("hosts = [\"")?.substringBefore("\"];")
         val servers = script?.substringAfter("servers = \"")?.substringBefore("\";")
-
-        val sources = app.get("$host/s/$servers").text.substringAfter("\"sources\":[").substringBefore("],").let {
-            AppUtils.tryParseJson<List<Sources>>("[$it]")
-        }
         val quality = Regex("(\\d{3,4})[Pp]").find(url)?.groupValues?.getOrNull(1)?.toIntOrNull()
+        val sources = app.get("$host/s/$servers").text.substringAfter("\"sources\":[").substringBefore("],").let {
+            tryParseJson<List<Sources>>("[$it]")
+        }
 
         sources?.map { source ->
             callback.invoke(
                 newExtractorLink(
                     name,
                     name,
-                    source.src ?: return@map null
+                    source.src ?: return@map null,
                 ) {
                     this.referer = url
                     this.quality = quality ?: Qualities.Unknown.value
                 }
             )
         }
-
     }
 
+    @Serializable
     data class Sources(
-        @JsonProperty("src") val src: String? = null,
+        @JsonProperty("src") @SerialName("src") val src: String? = null,
-        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("type") @SerialName("type") val type: String? = null,
-        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
     )
-
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt

@@ -8,25 +8,25 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class Vicloud : ExtractorApi() {
-    override val name: String = "Vicloud"
+    override val name = "Vicloud"
-    override val mainUrl: String = "https://vicloud.sbs"
+    override val mainUrl = "https://vicloud.sbs"
     override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val id = Regex("\"apiQuery\":\"(.*?)\"").find(app.get(url).text)?.groupValues?.getOrNull(1)
         app.get(
             "$mainUrl/api/?$id=&_=$unixTimeMS",
-            headers = mapOf(
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-                "X-Requested-With" to "XMLHttpRequest"
+            referer = url,
-            ),
-            referer = url
         ).parsedSafe<Responses>()?.sources?.map { source ->
             callback.invoke(
                 newExtractorLink(
@@ -39,16 +39,16 @@ open class Vicloud : ExtractorApi() {
                 }
             )
         }
-
     }
 
+    @Serializable
     private data class Sources(
-        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("file") @SerialName("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
     )
 
+    @Serializable
     private data class Responses(
-        @JsonProperty("sources") val sources: List<Sources>? = arrayListOf(),
+        @JsonProperty("sources") @SerialName("sources") val sources: List<Sources>? = arrayListOf(),
     )
-
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidara.kt

@@ -44,27 +44,29 @@ class VidaraSo : Vidara() {
 }
 
 open class Vidara : ExtractorApi() {
-    override val name: String = "Vidara"
+    override val name = "Vidara"
     override val mainUrl = "https://vidara.to"
-    override val requiresReferer: Boolean = false
+    override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val fileCode = url.substringAfterLast("/")
-        val fileInfo =
+        val fileInfo = app.post(
-            app.post("$mainUrl/api/stream", json = mapOf("filecode" to fileCode, "device" to "web"))
+            "$mainUrl/api/stream", json = mapOf(
-                .parsed<StreamUpFileInfo>()
+                "filecode" to fileCode,
-
+                "device" to "web"
+            )
+        ).parsed<StreamUpFileInfo>()
         callback.invoke(
             newExtractorLink(
                 source = name,
                 name = name,
                 url = fileInfo.streamingUrl,
-                type = ExtractorLinkType.M3U8
+                type = ExtractorLinkType.M3U8,
             )
         )
 
@@ -77,19 +79,15 @@ open class Vidara : ExtractorApi() {
 
     @Serializable
     private data class StreamUpFileInfo(
-        val title: String,
+        @JsonProperty("title") @SerialName("title") val title: String,
-        val thumbnail: String,
+        @JsonProperty("thumbnail") @SerialName("thumbnail") val thumbnail: String,
-        @SerialName("streaming_url")
+        @JsonProperty("streaming_url") @SerialName("streaming_url") val streamingUrl: String,
-        @JsonProperty("streaming_url")
+        @JsonProperty("subtitles") @SerialName("subtitles") val subtitles: List<StreamUpSubtitle>?,
-        val streamingUrl: String,
-        val subtitles: List<StreamUpSubtitle>?
     )
 
     @Serializable
     private data class StreamUpSubtitle(
-        @SerialName("file_path")
+        @JsonProperty("file_path") @SerialName("file_path") val filePath: String,
-        @JsonProperty("file_path")
+        @JsonProperty("language") @SerialName("language") val language: String,
-        val filePath: String,
-        val language: String,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt

@@ -7,27 +7,32 @@ import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 open class VideoSeyred : ExtractorApi() {
     override val name = "VideoSeyred"
     override val mainUrl = "https://videoseyred.in"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
         val extRef = referer ?: ""
         val videoId = url.substringAfter("embed/").substringBefore("?")
-        val videoUrl = "${mainUrl}/playlist/${videoId}.json"
+        val videoUrl = "$mainUrl/playlist/$videoId.json"
-
         val responseRaw = app.get(videoUrl)
-        val responseList: List<VideoSeyredSource> = tryParseJson<List<VideoSeyredSource>>(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
+        val responseList = tryParseJson<List<VideoSeyredSource>>(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
         val response = responseList[0]
-
         for (track in response.tracks) {
             if (track.label != null && track.kind == "captions") {
                 subtitleCallback.invoke(
                     newSubtitleFile(
                         lang = track.label,
-                        url  = fixUrl(track.file)
+                        url = fixUrl(track.file),
                     )
                 )
             }
@@ -40,31 +45,34 @@ open class VideoSeyred : ExtractorApi() {
                     name = this.name,
                     url = source.file,
                 ) {
-                    this.referer = "${mainUrl}/"
+                    this.referer = "$mainUrl/"
                     this.quality = Qualities.Unknown.value
                 }
             )
         }
     }
 
+    @Serializable
     data class VideoSeyredSource(
-        @JsonProperty("image")   val image: String,
+        @JsonProperty("image") @SerialName("image") val image: String,
-        @JsonProperty("title")   val title: String,
+        @JsonProperty("title") @SerialName("title") val title: String,
-        @JsonProperty("sources") val sources: List<VSSource>,
+        @JsonProperty("sources") @SerialName("sources") val sources: List<VSSource>,
-        @JsonProperty("tracks")  val tracks: List<VSTrack>
+        @JsonProperty("tracks") @SerialName("tracks") val tracks: List<VSTrack>,
     )
 
+    @Serializable
     data class VSSource(
-        @JsonProperty("file")    val file: String,
+        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("type")    val type: String,
+        @JsonProperty("type") @SerialName("type") val type: String,
-        @JsonProperty("default") val default: String
+        @JsonProperty("default") @SerialName("default") val default: String,
     )
 
+    @Serializable
     data class VSTrack(
-        @JsonProperty("file")     val file: String,
+        @JsonProperty("file") @SerialName("file") val file: String,
-        @JsonProperty("kind")     val kind: String,
+        @JsonProperty("kind") @SerialName("kind") val kind: String,
-        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("language") @SerialName("language") val language: String? = null,
-        @JsonProperty("label")    val label: String?    = null,
+        @JsonProperty("label") @SerialName("label") val label: String? = null,
-        @JsonProperty("default")  val default: String?  = null
+        @JsonProperty("default") @SerialName("default") val default: String? = null,
     )
 }

library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidoza.kt

@@ -4,26 +4,28 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 class Videzz : Vidoza() {
-    override val mainUrl: String = "https://videzz.net"
+    override val mainUrl = "https://videzz.net"
 }
 
 open class Vidoza : ExtractorApi() {
-    override val name: String = "Vidoza"
+    override val name = "Vidoza"
-    override val mainUrl: String = "https://vidoza.net"
+    override val mainUrl = "https://vidoza.net"
-    override val requiresReferer: Boolean = false
+    override val requiresReferer = false
 
     override suspend fun getUrl(
         url: String,
         referer: String?,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ) {
         val response = app.get(url).document
         val script = response.selectFirst("script:containsData(sourcesCode)")?.data()
@@ -32,31 +34,27 @@ open class Vidoza: ExtractorApi() {
         // e.g. sourcesCode: [{ src: "https://str38.vidoza.net/vod/v2/.../v.mp4", type: "video/mp4", label:"SD", res:"720"}],
         var sourcesArray = script.substringAfter("sourcesCode:").substringBefore("\n")
         arrayOf("src", "type", "label", "res").forEach {
-            // add missing quotation marks, e.g. src: "https..." -> "src": "https..."
+            // Add missing quotation marks, e.g. src: "https..." -> "src": "https..."
-            sourcesArray = sourcesArray
+            sourcesArray = sourcesArray.replace(Regex(""""?$it"?:"""), """"$it":""")
-                .replace(Regex(""""?$it"?:"""), """"$it":""")
         }
-        val videoData = AppUtils.parseJson<VinovoDataList>(sourcesArray)
 
+        val videoData = parseJson<ArrayList<VinovoVideoData>>(sourcesArray)
         for (stream in videoData) {
             callback.invoke(
                 newExtractorLink(
                     source = name,
                     name = name,
-                    url = stream.source
+                    url = stream.source,
-                ) {
+                ) { quality = getQualityFromName(stream.resolution) }
-                    quality = getQualityFromName(stream.resolution)
-                }
             )
         }
     }
 
-    private class VinovoDataList: ArrayList<VinovoVideoData>()
+    @Serializable
-
     private data class VinovoVideoData(
-        @JsonProperty("src") val source: String,
+        @JsonProperty("src") @SerialName("src") val source: String,
-        @JsonProperty("type") val type: String?,
+        @JsonProperty("type") @SerialName("type") val type: String?,
-        @JsonProperty("label") val label: String?,
+        @JsonProperty("label") @SerialName("label") val label: String?,
-        @JsonProperty("res") val resolution: String?,
+        @JsonProperty("res") @SerialName("res") val resolution: String?,
     )
 }