From 2ec22f868535258bc3e1067999f6da879ae1539e Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:33:26 +0700
Subject: [PATCH 001/125] Update SoraExtractor.kt

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index ef4bc6d9..6833110d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2094,7 +2094,7 @@ object SoraExtractor : SoraStream() {
                 .substringBefore("-")
         }
         val res = app.get(fixUrl(iframe, api), verify = false)
-        delay(1000)
+        delay(2000)
         val serverUrl = res.document.selectFirst("script:containsData(pushState)")?.data()?.let {
             """,\s*'([^']+)""".toRegex().find(it)?.groupValues?.get(1)
         } ?: return

From 3db0da8dd1682834bd9b76cafd5640bba30df372 Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Wed, 20 Dec 2023 21:54:14 +0700
Subject: [PATCH 002/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index ef4bc6d9..0c6d6112 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2149,8 +2149,8 @@ object SoraExtractor : SoraStream() {
             "$blackvidAPI/v3/tv/sources/$tmdbId/$season/$episode?key=$key"
         }
 
-        val res = request(url).body
-        val bytes = res.bytes().also { res.closeQuietly() }
+        val res = request(url)
+        val bytes = res.peekBody(1024 * 512).bytes().also { res.closeQuietly() }
         val data = bytes.decrypt("2378f8e4e844f2dc839ab48f66e00acc2305a401")
         val json = tryParseJson<BlackvidResponses>(data)
 

From d94f79e9a712fe83ddf33732318260ad7c981c8f Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Wed, 20 Dec 2023 22:52:04 +0700
Subject: [PATCH 003/125] update

---
 .../main/kotlin/com/hexated/SoraExtractor.kt  |  5 ++-
 .../src/main/kotlin/com/hexated/SoraUtils.kt  | 44 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index f44058d0..59757a47 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2260,10 +2260,11 @@ object SoraExtractor : SoraStream() {
         }
 
         val session = "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
+        cinemaCookiesChecker(session)
+
         val headers = mapOf(
             "Cookie" to session,
-            "Connection" to "keep-alive",
-            "x-requested-with" to "XMLHttpRequest",
+            "x-requested-with" to "com.wwcinematv",
         )
 
         val doc = app.get(url, headers = headers).document
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index f5895a6e..3ca40d2d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -49,6 +49,7 @@ import kotlin.math.min
 var watchflxCookies: Map<String, String>? = null
 var filmxyCookies: Map<String, String>? = null
 var sfServer: String? = null
+var cinemaCookiesChecker: Boolean? = null
 
 val encodedIndex = arrayOf(
     "GamMovies",
@@ -647,6 +648,49 @@ suspend fun getTvMoviesServer(url: String, season: Int?, episode: Int?): Pair<St
     }
 }
 
+suspend fun cinemaCookiesChecker(session: String) = cinemaCookiesChecker ?: fetchCinemaCookiesChecker(session).also { cinemaCookiesChecker = it }
+
+suspend fun fetchCinemaCookiesChecker(session: String): Boolean {
+    val wiwiApi = base64Decode("aHR0cHM6Ly9jaW5lbWEud2l3aWNlbnRlci5jb20=")
+    suspend fun createConfig(headers: Map<String, String>) {
+        app.get(
+            "$wiwiApi/api/v1/app-config",
+            headers = headers
+        ).text
+    }
+    suspend fun checkCookies(session: String, headers: Map<String, String>) {
+        app.post(
+            "$wiwiApi/api/v1/cookie",
+            data = mapOf("cookie" to session),
+            headers = headers
+        ).text
+    }
+    val configHeaders = mapOf(
+        "App-version" to "3.4",
+        "Authorization" to "Basic d2l3aTpXaXdpQDIwMjA=",
+        "Country" to "Indonesia",
+        "Device-id" to getDeviceId(),
+        "User-id" to "user-6694327",
+    )
+    listOf(1..2).apmap { createConfig(configHeaders) }
+    val unityData = """
+        {
+          "platform": "android",
+          "idfi": "d1ec7051-f58f-4ddb-9da8-8debb82cfbea",
+          "sdkVersionName": "4.3.0",
+          "gdpr.consent": true,
+          "user.nonbehavioral": false,
+          "unity.privacy.permissions.all": false,
+          "unity.privacy.permissions.gameExp": false,
+          "unity.privacy.permissions.ads": false,
+          "unity.privacy.permissions.external": false
+        }
+    """.trimIndent().toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
+    app.post("https://configv2.unityads.unity3d.com/privacy/4519473/state", requestBody = unityData).text
+    listOf(1..4).map {checkCookies(session, configHeaders)}
+    return true
+}
+
 suspend fun getSfServer() = sfServer ?: fetchSfServer().also { sfServer = it }
 
 suspend fun fetchSfServer(): String {

From f05a3cfc15f2a38f832b9532c7b79a4e2549a8ee Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Thu, 21 Dec 2023 01:34:21 +0700
Subject: [PATCH 004/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 59757a47..204667a0 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2093,7 +2093,7 @@ object SoraExtractor : SoraStream() {
             media.third.substringAfterLast("/") to iframe.substringAfterLast("/")
                 .substringBefore("-")
         }
-        val res = app.get(fixUrl(iframe, api), verify = false)
+        val res = app.get(fixUrl(iframe, api))
         delay(2000)
         val serverUrl = res.document.selectFirst("script:containsData(pushState)")?.data()?.let {
             """,\s*'([^']+)""".toRegex().find(it)?.groupValues?.get(1)

From 0695426de9792ee866a0ff1a046e736a87530f0e Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:39:54 +0700
Subject: [PATCH 005/125] sora: fix soraextrators

---
 .github/workflows/build.yml                   |  2 ++
 SoraStream/build.gradle.kts                   |  3 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 36 ++++++++++++++++---
 .../src/main/kotlin/com/hexated/SoraParser.kt |  8 +++++
 .../src/main/kotlin/com/hexated/SoraStream.kt | 10 +++---
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  9 +++--
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |  2 +-
 7 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5e17d0d..c88973ef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,6 +55,7 @@ jobs:
           SFMOVIES_API: ${{ secrets.SFMOVIES_API }}
           CINEMATV_API: ${{ secrets.CINEMATV_API }}
           OMOVIES_API: ${{ secrets.OMOVIES_API }}
+          FEBBOX_API: ${{ secrets.FEBBOX_API }}
         run: |
           cd $GITHUB_WORKSPACE/src
           echo TMDB_API=$TMDB_API >> local.properties
@@ -70,6 +71,7 @@ jobs:
           echo SFMOVIES_API=$SFMOVIES_API >> local.properties
           echo CINEMATV_API=$CINEMATV_API >> local.properties
           echo OMOVIES_API=$OMOVIES_API >> local.properties
+          echo FEBBOX_API=$FEBBOX_API >> local.properties
 
       - name: Build Plugins
         run: |
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 4896f243..cd61e696 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 206
+version = 207
 
 android {
     defaultConfig {
@@ -9,6 +9,7 @@ android {
         properties.load(project.rootProject.file("local.properties").inputStream())
 
         buildConfigField("String", "TMDB_API", "\"${properties.getProperty("TMDB_API")}\"")
+        buildConfigField("String", "FEBBOX_API", "\"${properties.getProperty("FEBBOX_API")}\"")
         buildConfigField("String", "OMOVIES_API", "\"${properties.getProperty("OMOVIES_API")}\"")
         buildConfigField("String", "CINEMATV_API", "\"${properties.getProperty("CINEMATV_API")}\"")
         buildConfigField("String", "SFMOVIES_API", "\"${properties.getProperty("SFMOVIES_API")}\"")
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 204667a0..7fe1c9bc 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -103,7 +103,6 @@ object SoraExtractor : SoraStream() {
         id: Int? = null,
         season: Int? = null,
         episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
         val url = if (season == null) {
@@ -1703,7 +1702,6 @@ object SoraExtractor : SoraStream() {
         imdbId: String? = null,
         season: Int? = null,
         episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
@@ -2149,8 +2147,8 @@ object SoraExtractor : SoraStream() {
             "$blackvidAPI/v3/tv/sources/$tmdbId/$season/$episode?key=$key"
         }
 
-        val res = request(url)
-        val bytes = res.peekBody(1024 * 512).bytes().also { res.closeQuietly() }
+        val res = request(url).peekBody(1024 * 512)
+        val bytes = res.bytes().also { res.closeQuietly() }
         val data = bytes.decrypt("2378f8e4e844f2dc839ab48f66e00acc2305a401")
         val json = tryParseJson<BlackvidResponses>(data)
 
@@ -2260,7 +2258,6 @@ object SoraExtractor : SoraStream() {
         }
 
         val session = "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
-        cinemaCookiesChecker(session)
 
         val headers = mapOf(
             "Cookie" to session,
@@ -2314,6 +2311,35 @@ object SoraExtractor : SoraStream() {
 
     }
 
+    suspend fun invokeFebbox(
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+    ) {
+        val url = if (season == null) {
+            "$febboxAPI/stream/movie/$imdbId.json"
+        } else {
+            "$febboxAPI/stream/series/$imdbId:$season:$episode.json"
+        }
+
+        val res = request(url).body
+        val data = res.string().also { res.closeQuietly() }
+        val video = tryParseJson<FebboxResponse>(data)?.streams?.find { it.url?.startsWith("https://www.febbox.com") == true }?.url
+
+        callback.invoke(
+            ExtractorLink(
+                "Febbox",
+                "Febbox",
+                video ?: return,
+                "",
+                Qualities.P1080.value,
+                INFER_TYPE
+            )
+        )
+
+    }
+
     suspend fun invokeNinetv(
         tmdbId: Int? = null,
         season: Int? = null,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index fb2b3ef5..40a19102 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -461,4 +461,12 @@ data class AoneroomResponse(
             )
         }
     }
+}
+
+data class FebboxResponse(
+    @JsonProperty("streams") val streams: ArrayList<Streams>? = arrayListOf(),
+) {
+    data class Streams(
+        @JsonProperty("url") val url: String? = null,
+    )
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 859c9037..76acfb44 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -45,6 +45,7 @@ import com.hexated.SoraExtractor.invokeUhdmovies
 import com.hexated.SoraExtractor.invokeVegamovies
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
+import com.hexated.SoraExtractor.invokeFebbox
 import com.hexated.SoraExtractor.invokeOmovies
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
@@ -115,6 +116,7 @@ open class SoraStream : TmdbProvider() {
         const val blackvidAPI = "https://prod.api.blackvid.space"
         const val showflixAPI = "https://showflix.space"
         const val aoneroomAPI = "https://api3.aoneroom.com"
+        const val febboxAPI = BuildConfig.FEBBOX_API
 
         const val fdMoviesAPI = "https://freedrivemovie.lol"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
@@ -362,11 +364,10 @@ open class SoraStream : TmdbProvider() {
 
         argamap(
             {
-                if (!res.isAnime) invokeBlackvid(
-                    res.id,
+                if (!res.isAnime) invokeFebbox(
+                    res.imdbId,
                     res.season,
                     res.episode,
-                    subtitleCallback,
                     callback
                 )
             },
@@ -392,7 +393,7 @@ open class SoraStream : TmdbProvider() {
                 )
             },
             {
-                invokeVidSrc(res.id, res.season, res.episode, subtitleCallback, callback)
+                invokeVidSrc(res.id, res.season, res.episode, callback)
             },
             {
                 invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
@@ -567,7 +568,6 @@ open class SoraStream : TmdbProvider() {
                     res.imdbId,
                     res.season,
                     res.episode,
-                    subtitleCallback,
                     callback
                 )
             },
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index d4b25315..ce8701cf 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -31,6 +31,7 @@ import com.hexated.SoraExtractor.invokeShowflix
 import com.hexated.SoraExtractor.invokeVidSrc
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
+import com.hexated.SoraExtractor.invokeFebbox
 import com.hexated.SoraExtractor.invokeOmovies
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
@@ -53,11 +54,10 @@ class SoraStreamLite : SoraStream() {
 
         argamap(
             {
-                if (!res.isAnime) invokeBlackvid(
-                    res.id,
+                if (!res.isAnime) invokeFebbox(
+                    res.imdbId,
                     res.season,
                     res.episode,
-                    subtitleCallback,
                     callback
                 )
             },
@@ -100,7 +100,7 @@ class SoraStreamLite : SoraStream() {
                 )
             },
             {
-                invokeVidSrc(res.id, res.season, res.episode, subtitleCallback, callback)
+                invokeVidSrc(res.id, res.season, res.episode, callback)
             },
             {
                 invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
@@ -158,7 +158,6 @@ class SoraStreamLite : SoraStream() {
                     res.imdbId,
                     res.season,
                     res.episode,
-                    subtitleCallback,
                     callback
                 )
             },
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 3ca40d2d..5b98eeeb 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -648,7 +648,7 @@ suspend fun getTvMoviesServer(url: String, season: Int?, episode: Int?): Pair<St
     }
 }
 
-suspend fun cinemaCookiesChecker(session: String) = cinemaCookiesChecker ?: fetchCinemaCookiesChecker(session).also { cinemaCookiesChecker = it }
+suspend fun refreshCinemaCookies(session: String) = cinemaCookiesChecker ?: fetchCinemaCookiesChecker(session).also { cinemaCookiesChecker = it }
 
 suspend fun fetchCinemaCookiesChecker(session: String): Boolean {
     val wiwiApi = base64Decode("aHR0cHM6Ly9jaW5lbWEud2l3aWNlbnRlci5jb20=")

From f0e897f8f03a95267b1c9f3f942c159360eea9c4 Mon Sep 17 00:00:00 2001
From: adityajd <45625055+adityajd@users.noreply.github.com>
Date: Thu, 21 Dec 2023 10:42:57 +0700
Subject: [PATCH 006/125] Update mainurl  (#458)

* Update RebahinProvider.kt

* Update LayarKacaProvider.kt

update main url ="https://tv3.lk21official.wiki" change to "https://tv4.lk21official.wiki"

* Update LayarKacaProvider.kt

* Update Dubbindo.kt

update domain

* Update Cgvindo.kt

* Update DramaidProvider.kt

* Update DutaMovie.kt

* Update Ngefilm.kt

* Update Pusatfilm.kt

* Update LayarKacaProvider.kt

* Update build.gradle.kts

* Update RebahinProvider.kt

* Update DutaMovie.kt

Update mainurl

* Update build.gradle.kts

* Update Ngefilm.kt

* Update DramaSerial.kt

* Update Nodrakorid.kt

update mainurl

* Update Pusatfilm.kt

update mainurl

* Update DramaSerial.kt

update serverurl http://31.220.73.179/

* Update build.gradle.kts

* Update LayarKacaProvider.kt

update mainurl

* Update DutaMovie.kt

update mainurl

* Update Pusatfilm.kt

update mainurl

* Update Multiplex.kt

update mainurl

* Update Ngefilm.kt

update mainurl

* Update Ngefilm.kt

update mainurl

* Update DutaMovie.kt

update mainurl

* Update Multiplex.kt

update mainurl

* Update Ngefilm.kt

update mainurl

* Update Pusatfilm.kt

update mainurl

* Update build.gradle.kts

* Update LayarKacaProvider.kt

update mainUrl
update seriesUrl
---
 Gomov/src/main/kotlin/com/hexated/DutaMovie.kt            | 8 ++------
 Gomov/src/main/kotlin/com/hexated/Multiplex.kt            | 5 ++---
 Gomov/src/main/kotlin/com/hexated/Ngefilm.kt              | 2 +-
 Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt            | 3 +--
 LayarKacaProvider/build.gradle.kts                        | 2 +-
 .../src/main/kotlin/com/hexated/LayarKacaProvider.kt      | 4 ++--
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt
index 270bf211..0643ffe2 100644
--- a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt
+++ b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt
@@ -6,12 +6,8 @@ import com.lagradost.cloudstream3.utils.httpsify
 import com.lagradost.cloudstream3.utils.loadExtractor
 
 class DutaMovie : Gomov() {
-
-    override var mainUrl = "https://cinema.dutamovie21.vip"
-
-
-
-override var name = "DutaMovie"
+    override var mainUrl = "https://drama.dutamovie21.tech/"
+    override var name = "DutaMovie"
     override val mainPage = mainPageOf(
         "category/box-office/page/%d/" to "Box Office",
         "category/serial-tv/page/%d/" to "Serial TV",
diff --git a/Gomov/src/main/kotlin/com/hexated/Multiplex.kt b/Gomov/src/main/kotlin/com/hexated/Multiplex.kt
index 18b8db3b..1ea025f1 100644
--- a/Gomov/src/main/kotlin/com/hexated/Multiplex.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Multiplex.kt
@@ -3,13 +3,12 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Multiplex : Gomov() {
-    override var mainUrl = "http://5.104.81.46"
+    override var mainUrl = "http://5.189.181.147"
     override var name = "Multiplex"
-
     override val mainPage = mainPageOf(
         "country/usa/page/%d/" to "Movie",
         "west-series/page/%d/" to "West Series",
         "nonton-drama-korea/page/%d/" to "Drama Korea",
     )
 
-}
\ No newline at end of file
+}
diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
index 48acf2cb..c70bebc8 100644
--- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Ngefilm : Gomov() {
-    override var mainUrl = "https://nge-film21.pics/"
+    override var mainUrl = "https://tv.ngefilm21.homes"
     override var name = "Ngefilm"
     override val mainPage = mainPageOf(
         "/page/%d/?s&search=advanced&post_type=movie&index&orderby&genre&movieyear&country&quality=" to "Movies Terbaru",
diff --git a/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt b/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
index 3a18e469..aabb0ecd 100644
--- a/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
@@ -6,9 +6,8 @@ import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.*
 
 class Pusatfilm : Gomov() {
-    override var mainUrl = "http://31.220.90.203/"
+    override var mainUrl = "https://tv2.pusatfilm21.art"
     override var name = "Pusatfilm"
-
     override val mainPage = mainPageOf(
         "film-terbaru/page/%d/" to "Film Terbaru",
         "series-terbaru/page/%d/" to "Series Terbaru",
diff --git a/LayarKacaProvider/build.gradle.kts b/LayarKacaProvider/build.gradle.kts
index 5c2f043d..5f978538 100644
--- a/LayarKacaProvider/build.gradle.kts
+++ b/LayarKacaProvider/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=tv5.lk21official.wiki&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=tv6.lk21official.wiki&sz=%size%"
 }
diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
index 328257e9..34ebfdc7 100644
--- a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
+++ b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
@@ -8,8 +8,8 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class LayarKacaProvider : MainAPI() {
-    override var mainUrl = "https://tv5.lk21official.wiki"
-    private var seriesUrl = "https://tv7.nontondrama.click"
+    override var mainUrl = "https://tv6.lk21official.wiki"
+    private var seriesUrl = "https://tv8.nontondrama.click/"
     override var name = "LayarKaca"
     override val hasMainPage = true
     override var lang = "id"

From a8f16991279f734bf025f456f16885b6881ea070 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Thu, 21 Dec 2023 17:00:14 +0700
Subject: [PATCH 007/125] Update KuronimeProvider.kt

---
 .../src/main/kotlin/com/hexated/KuronimeProvider.kt             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt b/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt
index 0ebfafbf..57eccd6e 100644
--- a/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt
+++ b/KuronimeProvider/src/main/kotlin/com/hexated/KuronimeProvider.kt
@@ -16,7 +16,7 @@ import java.net.URI
 import java.util.ArrayList
 
 class KuronimeProvider : MainAPI() {
-    override var mainUrl = "https://tv.kuronime.vip"
+    override var mainUrl = "https://tv1.kuronime.vip"
     private var animekuUrl = "https://animeku.org"
     override var name = "Kuronime"
     override val hasQuickSearch = true

From f83c9273fdf0fa06a4c91f53703ed4033e68a780 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Thu, 21 Dec 2023 17:00:40 +0700
Subject: [PATCH 008/125] Update build.gradle.kts

---
 KuronimeProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KuronimeProvider/build.gradle.kts b/KuronimeProvider/build.gradle.kts
index 863fbfc2..d68a2267 100644
--- a/KuronimeProvider/build.gradle.kts
+++ b/KuronimeProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 19
+version = 20
 
 
 cloudstream {

From 1398f9bc0003c98705cd2d4b7a2b5dd9867f53cd Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Fri, 22 Dec 2023 01:33:41 +0700
Subject: [PATCH 009/125] Update Samehadaku.kt

---
 Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
index 51404e62..69bdf841 100644
--- a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
+++ b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
@@ -10,7 +10,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor
 import org.jsoup.nodes.Element
 
 class Samehadaku : MainAPI() {
-    override var mainUrl = "https://samehadaku.digital/"
+    override var mainUrl = "https://samehadaku.guru"
     override var name = "Samehadaku"
     override val hasMainPage = true
     override var lang = "id"

From 928db8c7ff467c72d4b348ade1d20438f6aa5cf8 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Fri, 22 Dec 2023 01:34:06 +0700
Subject: [PATCH 010/125] Update build.gradle.kts

---
 Samehadaku/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Samehadaku/build.gradle.kts b/Samehadaku/build.gradle.kts
index ad80241e..25a86ea3 100644
--- a/Samehadaku/build.gradle.kts
+++ b/Samehadaku/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 17
+version = 18
 
 
 cloudstream {

From 211c58b0ef493167d0bc34f7faf6e3ea68bf3197 Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:16:09 +0700
Subject: [PATCH 011/125] sora: fix m4uhd

---
 .github/workflows/build.yml                   |   2 -
 LayarKacaProvider/build.gradle.kts            |   2 +-
 .../kotlin/com/hexated/LayarKacaProvider.kt   |   3 +-
 SoraStream/build.gradle.kts                   |   3 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |  60 ++++-----
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 121 ++++++++----------
 .../src/main/kotlin/com/hexated/SoraParser.kt |  35 ++---
 .../src/main/kotlin/com/hexated/SoraStream.kt |   9 +-
 .../main/kotlin/com/hexated/SoraStreamLite.kt |   6 +-
 9 files changed, 103 insertions(+), 138 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c88973ef..b5e17d0d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,7 +55,6 @@ jobs:
           SFMOVIES_API: ${{ secrets.SFMOVIES_API }}
           CINEMATV_API: ${{ secrets.CINEMATV_API }}
           OMOVIES_API: ${{ secrets.OMOVIES_API }}
-          FEBBOX_API: ${{ secrets.FEBBOX_API }}
         run: |
           cd $GITHUB_WORKSPACE/src
           echo TMDB_API=$TMDB_API >> local.properties
@@ -71,7 +70,6 @@ jobs:
           echo SFMOVIES_API=$SFMOVIES_API >> local.properties
           echo CINEMATV_API=$CINEMATV_API >> local.properties
           echo OMOVIES_API=$OMOVIES_API >> local.properties
-          echo FEBBOX_API=$FEBBOX_API >> local.properties
 
       - name: Build Plugins
         run: |
diff --git a/LayarKacaProvider/build.gradle.kts b/LayarKacaProvider/build.gradle.kts
index 5f978538..85bf1cb9 100644
--- a/LayarKacaProvider/build.gradle.kts
+++ b/LayarKacaProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 17
+version = 18
 
 
 cloudstream {
diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
index 34ebfdc7..552e412e 100644
--- a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
+++ b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
@@ -9,7 +9,7 @@ import org.jsoup.nodes.Element
 
 class LayarKacaProvider : MainAPI() {
     override var mainUrl = "https://tv6.lk21official.wiki"
-    private var seriesUrl = "https://tv8.nontondrama.click/"
+    private var seriesUrl = "https://tv8.nontondrama.click"
     override var name = "LayarKaca"
     override val hasMainPage = true
     override var lang = "id"
@@ -40,6 +40,7 @@ class LayarKacaProvider : MainAPI() {
     }
 
     private suspend fun getProperLink(url: String): String? {
+        if(url.startsWith(seriesUrl)) return url
         val res = app.get(url).document
         return if (res.select("title").text().contains("- Nontondrama", true)) {
             res.selectFirst("div#content a")?.attr("href")
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index cd61e696..327754b2 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 207
+version = 208
 
 android {
     defaultConfig {
@@ -9,7 +9,6 @@ android {
         properties.load(project.rootProject.file("local.properties").inputStream())
 
         buildConfigField("String", "TMDB_API", "\"${properties.getProperty("TMDB_API")}\"")
-        buildConfigField("String", "FEBBOX_API", "\"${properties.getProperty("FEBBOX_API")}\"")
         buildConfigField("String", "OMOVIES_API", "\"${properties.getProperty("OMOVIES_API")}\"")
         buildConfigField("String", "CINEMATV_API", "\"${properties.getProperty("CINEMATV_API")}\"")
         buildConfigField("String", "SFMOVIES_API", "\"${properties.getProperty("SFMOVIES_API")}\"")
diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 0d72837f..0e5ae558 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -124,8 +124,8 @@ open class Playm4u : ExtractorApi() {
         return "$this\\s*=\\s*[\"'](\\S+)[\"'];".toRegex().find(data)?.groupValues?.get(1) ?: ""
     }
 
-    private fun String.toLanguage() : String {
-        return if(this == "EN") "English" else this
+    private fun String.toLanguage(): String {
+        return if (this == "EN") "English" else this
     }
 
     data class Source(
@@ -209,7 +209,10 @@ open class VCloud : ExtractorApi() {
             )
         ).document.select("p.text-success ~ a").apmap {
             val link = it.attr("href")
-            if (link.contains("workers.dev") || it.text().contains("[Server : 1]") || link.contains("/dl.php?")) {
+            if (link.contains("workers.dev") || it.text().contains("[Server : 1]") || link.contains(
+                    "/dl.php?"
+                )
+            ) {
                 callback.invoke(
                     ExtractorLink(
                         this.name,
@@ -221,7 +224,7 @@ open class VCloud : ExtractorApi() {
                     )
                 )
             } else {
-                val direct = if(link.contains("gofile.io")) app.get(link).url else link
+                val direct = if (link.contains("gofile.io")) app.get(link).url else link
                 loadExtractor(direct, referer, subtitleCallback, callback)
             }
         }
@@ -247,12 +250,14 @@ open class Streamruby : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val id = "/e/(\\w+)".toRegex().find(url)?.groupValues?.get(1) ?: return
-        val response = app.post("$mainUrl/dl", data = mapOf(
-            "op" to "embed",
-            "file_code" to id,
-            "auto" to "1",
-            "referer" to "",
-        ), referer = referer)
+        val response = app.post(
+            "$mainUrl/dl", data = mapOf(
+                "op" to "embed",
+                "file_code" to id,
+                "auto" to "1",
+                "referer" to "",
+            ), referer = referer
+        )
         val script = if (!getPacked(response.text).isNullOrEmpty()) {
             getAndUnpack(response.text)
         } else {
@@ -282,17 +287,25 @@ open class Uploadever : ExtractorApi() {
     ) {
         var res = app.get(url, referer = referer).document
         val formUrl = res.select("form").attr("action")
-        var formData = res.select("form input").associate { it.attr("name") to it.attr("value") }.filterKeys { it != "go" }
+        var formData = res.select("form input").associate { it.attr("name") to it.attr("value") }
+            .filterKeys { it != "go" }
             .toMutableMap()
         val formReq = app.post(formUrl, data = formData)
 
         res = formReq.document
-        val captchaKey = res.select("script[src*=https://www.google.com/recaptcha/api.js?render=]").attr("src").substringAfter("render=")
+        val captchaKey =
+            res.select("script[src*=https://www.google.com/recaptcha/api.js?render=]").attr("src")
+                .substringAfter("render=")
         val token = getCaptchaToken(url, captchaKey, referer = "$mainUrl/")
-        formData = res.select("form#down input").associate { it.attr("name") to it.attr("value") }.toMutableMap()
+        formData = res.select("form#down input").associate { it.attr("name") to it.attr("value") }
+            .toMutableMap()
         formData["adblock_detected"] = "0"
         formData["referer"] = url
-        res = app.post(formReq.url, data = formData + mapOf("g-recaptcha-response" to "$token"), cookies = formReq.cookies).document
+        res = app.post(
+            formReq.url,
+            data = formData + mapOf("g-recaptcha-response" to "$token"),
+            cookies = formReq.cookies
+        ).document
         val video = res.select("div.download-button a.btn.btn-dow.recaptchav2").attr("href")
 
         callback.invoke(
@@ -325,18 +338,7 @@ open class Netembed : ExtractorApi() {
         val script = getAndUnpack(response.text)
         val m3u8 = Regex("((https:|http:)//.*\\.m3u8)").find(script)?.groupValues?.getOrNull(1) ?: return
 
-        if(m3u8.startsWith("https://www.febbox.com")) {
-            callback.invoke(
-                ExtractorLink(
-                    this.name,
-                    this.name,
-                    m3u8,
-                    "$mainUrl/",
-                    getQuality(m3u8),
-                    INFER_TYPE
-                )
-            )
-        } else {
+        if (!m3u8.startsWith("https://www.febbox.com")) {
             M3u8Helper.generateM3u8(
                 this.name,
                 m3u8,
@@ -344,12 +346,6 @@ open class Netembed : ExtractorApi() {
             ).forEach(callback)
         }
     }
-
-    private suspend fun getQuality(url: String) : Int {
-        val res = app.get(url, referer = "$mainUrl/").text
-        val regex = "#quality:\\s*(\\S+)".toRegex().find(res)?.groupValues?.get(1)
-        return getQualityFromName(regex)
-    }
 }
 
 class Streamwish : Filesim() {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 7fe1c9bc..8c4853af 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1354,14 +1354,14 @@ object SoraExtractor : SoraStream() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
+        val slugTitle = title.createSlug()
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-        val req = app.get("$m4uhdAPI/search/${title.createSlug()}.html")
+        val req = app.get("$m4uhdAPI/search/$slugTitle.html")
         val referer = getBaseUrl(req.url)
         val scriptData = req.document.select("div.row div.item").map { ele ->
             Triple(
-                ele.select("div.tiptitle p").text(),
-                ele.select("div.jtip-top div:last-child").text().substringBefore("–")
-                    .filter { it.isDigit() },
+                ele.select("div.tiptitle p").text().substringBefore("(").trim().createSlug(),
+                ele.select("div.jtip-top div:last-child").text().filter { it.isDigit() },
                 ele.selectFirst("a")?.attr("href")
             )
         }
@@ -1370,7 +1370,7 @@ object SoraExtractor : SoraStream() {
             scriptData.firstOrNull()
         } else {
             scriptData.find {
-                it.first.contains(Regex("(?i)$title \\($year\\s?\\)")) && if (season != null) it.third?.contains(
+                it.first.equals(slugTitle) && it.second == "$year" && if (season != null) it.third?.contains(
                     "-tvshow-"
                 ) == true else it.third?.contains("-movie-") == true
             }
@@ -2133,52 +2133,6 @@ object SoraExtractor : SoraStream() {
 
     }
 
-    suspend fun invokeBlackvid(
-        tmdbId: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val key = "b6055c533c19131a638c3d2299d525d5ec08a814"
-        val url = if (season == null) {
-            "$blackvidAPI/v3/movie/sources/$tmdbId?key=$key"
-        } else {
-            "$blackvidAPI/v3/tv/sources/$tmdbId/$season/$episode?key=$key"
-        }
-
-        val res = request(url).peekBody(1024 * 512)
-        val bytes = res.bytes().also { res.closeQuietly() }
-        val data = bytes.decrypt("2378f8e4e844f2dc839ab48f66e00acc2305a401")
-        val json = tryParseJson<BlackvidResponses>(data)
-
-        json?.sources?.map { source ->
-            source.sources.map s@{ s ->
-                callback.invoke(
-                    ExtractorLink(
-                        "Blackvid",
-                        "Blackvid${source.label}",
-                        s.url ?: return@s,
-                        "https://blackvid.space/",
-                        if (s.quality.equals("4k")) Qualities.P2160.value else s.quality?.toIntOrNull()
-                            ?: Qualities.P1080.value,
-                        INFER_TYPE
-                    )
-                )
-            }
-        }
-
-        json?.subtitles?.map { sub ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    sub.language.takeIf { it?.isNotEmpty() == true } ?: return@map,
-                    sub.url ?: return@map,
-                )
-            )
-        }
-
-    }
-
     suspend fun invokeShowflix(
         title: String? = null,
         year: Int? = null,
@@ -2312,31 +2266,62 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeFebbox(
-        imdbId: String? = null,
+        title: String? = null,
+        year: Int? = null,
         season: Int? = null,
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val url = if (season == null) {
-            "$febboxAPI/stream/movie/$imdbId.json"
+        val showboxApi = "https://www.showbox.media"
+        val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
+
+        val res = app.post(
+            "$showboxApi/search/autocomplate2", data = mapOf(
+                "keyword" to "$title"
+            ), headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        ).parsed<String>().let { Jsoup.parse(it) }
+
+        val mediaId = res.select("a.nav-item").find {
+            it.select("h3.film-name").text()
+                .equals(title, true) && it.select("div.film-infor > span:first-child").text()
+                .contains(if (season == null) "$year" else "SS") && it.select("div.film-infor > span:last-child")
+                .text()
+                .equals(if (season == null) "Movie" else "TV")
+        }?.attr("href")?.substringAfterLast("/")
+
+        val shareKey =
+            app.get("$showboxApi/index/share_link?id=${mediaId ?: return}&type=${if (season == null) "1" else "2"}")
+                .parsedSafe<FebboxResponse>()?.data?.link?.substringAfterLast("/")
+
+        val headers = mapOf("Accept-Language" to "en")
+        val shareRes = app.get("$febboxAPI/file/file_share_list?share_key=${shareKey ?: return}", headers = headers)
+            .parsedSafe<FebboxResponse>()?.data
+
+        val fids = if (season == null) {
+            shareRes?.file_list
         } else {
-            "$febboxAPI/stream/series/$imdbId:$season:$episode.json"
+            val parentId = shareRes?.file_list?.find { it.file_name.equals("season $season", true) }?.fid
+            app.get("$febboxAPI/file/file_share_list?share_key=${shareKey}&parent_id=$parentId&page=1", headers = headers)
+                .parsedSafe<FebboxResponse>()?.data?.file_list?.filter {
+                    it.file_name?.contains(
+                        "s${seasonSlug}e${episodeSlug}",
+                        true
+                    ) == true
+                }
         }
 
-        val res = request(url).body
-        val data = res.string().also { res.closeQuietly() }
-        val video = tryParseJson<FebboxResponse>(data)?.streams?.find { it.url?.startsWith("https://www.febbox.com") == true }?.url
-
-        callback.invoke(
-            ExtractorLink(
-                "Febbox",
-                "Febbox",
-                video ?: return,
-                "",
-                Qualities.P1080.value,
-                INFER_TYPE
+        fids?.mapIndexed { index, fileList ->
+            callback.invoke(
+                ExtractorLink(
+                    "Febbox",
+                    "Febbox [Server $index]",
+                    "$febboxAPI/hls/main/${fileList.oss_fid}.m3u8",
+                    "",
+                    getIndexQuality(fileList.file_name),
+                    isM3u8 = true
+                )
             )
-        )
+        }
 
     }
 
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 40a19102..01ebad4a 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -334,26 +334,6 @@ data class EMovieTraks(
     @JsonProperty("label") val label: String? = null,
 )
 
-data class BlackvidSubtitles(
-    @JsonProperty("language") val language: String? = null,
-    @JsonProperty("url") val url: String? = null,
-)
-
-data class BlackvidSource(
-    @JsonProperty("quality") var quality: String? = null,
-    @JsonProperty("url") var url: String? = null,
-)
-
-data class BlackvidSources(
-    @JsonProperty("label") var label: String? = null,
-    @JsonProperty("sources") var sources: ArrayList<BlackvidSource> = arrayListOf()
-)
-
-data class BlackvidResponses(
-    @JsonProperty("sources") var sources: ArrayList<BlackvidSources> = arrayListOf(),
-    @JsonProperty("subtitles") var subtitles: ArrayList<BlackvidSubtitles> = arrayListOf()
-)
-
 data class ShowflixResultsMovies(
     @JsonProperty("movieName") val movieName: String? = null,
     @JsonProperty("streamwish") val streamwish: String? = null,
@@ -464,9 +444,16 @@ data class AoneroomResponse(
 }
 
 data class FebboxResponse(
-    @JsonProperty("streams") val streams: ArrayList<Streams>? = arrayListOf(),
+    @JsonProperty("data") val data: Data? = null,
 ) {
-    data class Streams(
-        @JsonProperty("url") val url: String? = null,
-    )
+    data class Data(
+        @JsonProperty("link") val link: String? = null,
+        @JsonProperty("file_list") val file_list: ArrayList<FileList>? = arrayListOf(),
+    ) {
+        data class FileList(
+            @JsonProperty("fid") val fid: Long? = null,
+            @JsonProperty("file_name") val file_name: String? = null,
+            @JsonProperty("oss_fid") val oss_fid: Long? = null,
+        )
+    }
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 76acfb44..0477026d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.hexated.SoraExtractor.invoke2embed
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
-import com.hexated.SoraExtractor.invokeBlackvid
 import com.hexated.SoraExtractor.invokeBollyMaza
 import com.hexated.SoraExtractor.invokeDbgo
 import com.hexated.SoraExtractor.invokeFilmxy
@@ -113,10 +112,9 @@ open class SoraStream : TmdbProvider() {
         const val dramadayAPI = "https://dramaday.me"
         const val animetoshoAPI = "https://animetosho.org"
         const val watchflxAPI = "https://watchflx.tv"
-        const val blackvidAPI = "https://prod.api.blackvid.space"
         const val showflixAPI = "https://showflix.space"
         const val aoneroomAPI = "https://api3.aoneroom.com"
-        const val febboxAPI = BuildConfig.FEBBOX_API
+        const val febboxAPI = "https://www.febbox.com"
 
         const val fdMoviesAPI = "https://freedrivemovie.lol"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
@@ -364,8 +362,9 @@ open class SoraStream : TmdbProvider() {
 
         argamap(
             {
-                if (!res.isAnime) invokeFebbox(
-                    res.imdbId,
+                invokeFebbox(
+                    res.title,
+                    res.year,
                     res.season,
                     res.episode,
                     callback
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index ce8701cf..5e5afe20 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -3,7 +3,6 @@ package com.hexated
 import com.hexated.SoraExtractor.invoke2embed
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
-import com.hexated.SoraExtractor.invokeBlackvid
 import com.hexated.SoraExtractor.invokeDbgo
 import com.hexated.SoraExtractor.invokeDoomovies
 import com.hexated.SoraExtractor.invokeDramaday
@@ -54,8 +53,9 @@ class SoraStreamLite : SoraStream() {
 
         argamap(
             {
-                if (!res.isAnime) invokeFebbox(
-                    res.imdbId,
+                invokeFebbox(
+                    res.title,
+                    res.year,
                     res.season,
                     res.episode,
                     callback

From 51d8c748807c9e780c03837947a9ed7755bc8fe7 Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:41:12 +0700
Subject: [PATCH 012/125] small fix

---
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 33 ++++++++++++++-----
 .../src/main/kotlin/com/hexated/SoraParser.kt |  6 ++++
 .../src/main/kotlin/com/hexated/SoraStream.kt |  1 +
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  1 +
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 8c4853af..2af0cbe1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2269,9 +2269,11 @@ object SoraExtractor : SoraStream() {
         title: String? = null,
         year: Int? = null,
         season: Int? = null,
+        lastSeason: Int? = null,
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit,
     ) {
+
         val showboxApi = "https://www.showbox.media"
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
 
@@ -2281,16 +2283,31 @@ object SoraExtractor : SoraStream() {
             ), headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         ).parsed<String>().let { Jsoup.parse(it) }
 
-        val mediaId = res.select("a.nav-item").find {
-            it.select("h3.film-name").text()
-                .equals(title, true) && it.select("div.film-infor > span:first-child").text()
-                .contains(if (season == null) "$year" else "SS") && it.select("div.film-infor > span:last-child")
-                .text()
-                .equals(if (season == null) "Movie" else "TV")
-        }?.attr("href")?.substringAfterLast("/")
+        val mediaRes = res.select("a.nav-item").map {
+            ShowboxMedia(
+                it.attr("href"),
+                it.select("h3.film-name").text(),
+                it.select("div.film-infor > span:first-child").text(),
+                it.select("div.film-infor > span:last-child").text(),
+            )
+        }
+
+        val media = mediaRes.find {
+            it.title.equals(
+                title,
+                true
+            ) && it.infor == if (season == null) "$year" else "SS $lastSeason" && it.type == if (season == null) "Movie" else "TV"
+        } ?: mediaRes.find {
+            it.title.equals(
+                title,
+                true
+            ) && it.infor.contains(if (season == null) "$year" else "SS") && it.type == if (season == null) "Movie" else "TV"
+        }
+
+        val shareId = media?.url?.substringAfterLast("/") ?: return
 
         val shareKey =
-            app.get("$showboxApi/index/share_link?id=${mediaId ?: return}&type=${if (season == null) "1" else "2"}")
+            app.get("$showboxApi/index/share_link?id=${shareId}&type=${if (season == null) "1" else "2"}")
                 .parsedSafe<FebboxResponse>()?.data?.link?.substringAfterLast("/")
 
         val headers = mapOf("Accept-Language" to "en")
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 01ebad4a..938462bc 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -2,6 +2,12 @@ package com.hexated
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
+data class ShowboxMedia(
+    val url: String,
+    val title: String,
+    val infor: String,
+    val type: String,
+)
 data class FDMovieIFrame(
     val link: String,
     val quality: String,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 0477026d..379a47e0 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -366,6 +366,7 @@ open class SoraStream : TmdbProvider() {
                     res.title,
                     res.year,
                     res.season,
+                    res.lastSeason,
                     res.episode,
                     callback
                 )
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 5e5afe20..22f27b3a 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -57,6 +57,7 @@ class SoraStreamLite : SoraStream() {
                     res.title,
                     res.year,
                     res.season,
+                    res.lastSeason,
                     res.episode,
                     callback
                 )

From 0d09638a9c659f4a5066d756a6c40f7b54244413 Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:48:18 +0700
Subject: [PATCH 013/125] small fix

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 2af0cbe1..1a349288 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2296,7 +2296,7 @@ object SoraExtractor : SoraStream() {
             it.title.equals(
                 title,
                 true
-            ) && it.infor == if (season == null) "$year" else "SS $lastSeason" && it.type == if (season == null) "Movie" else "TV"
+            ) && it.infor.equals(if (season == null) "$year" else "SS $lastSeason") && it.type == if (season == null) "Movie" else "TV"
         } ?: mediaRes.find {
             it.title.equals(
                 title,

From f1e35269424324a8a0813627e12987d529468378 Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Sat, 23 Dec 2023 10:16:48 +0700
Subject: [PATCH 014/125] small fix

---
 .../main/kotlin/com/hexated/SoraExtractor.kt   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 1a349288..1bde5716 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2277,18 +2277,14 @@ object SoraExtractor : SoraStream() {
         val showboxApi = "https://www.showbox.media"
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
 
-        val res = app.post(
-            "$showboxApi/search/autocomplate2", data = mapOf(
-                "keyword" to "$title"
-            ), headers = mapOf("X-Requested-With" to "XMLHttpRequest")
-        ).parsed<String>().let { Jsoup.parse(it) }
+        val res = app.get("$showboxApi/search?keyword=$title").document
 
-        val mediaRes = res.select("a.nav-item").map {
+        val mediaRes = res.select("div.film_list-wrap div.flw-item").map {
             ShowboxMedia(
-                it.attr("href"),
-                it.select("h3.film-name").text(),
-                it.select("div.film-infor > span:first-child").text(),
-                it.select("div.film-infor > span:last-child").text(),
+                it.select("h2.film-name a").attr("href"),
+                it.select("h2.film-name a").text(),
+                it.select("div.fd-infor > span:first-child").text(),
+                it.select("div.fd-infor > span:last-child").text(),
             )
         }
 
@@ -2331,7 +2327,7 @@ object SoraExtractor : SoraStream() {
             callback.invoke(
                 ExtractorLink(
                     "Febbox",
-                    "Febbox [Server $index]",
+                    "Febbox [Server ${index + 1}]",
                     "$febboxAPI/hls/main/${fileList.oss_fid}.m3u8",
                     "",
                     getIndexQuality(fileList.file_name),

From 8ab71d47e5cc804afeb593180a2b4b8762065643 Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Sat, 23 Dec 2023 10:29:36 +0700
Subject: [PATCH 015/125] small fix

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 1bde5716..9e56345f 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2297,7 +2297,7 @@ object SoraExtractor : SoraStream() {
             it.title.equals(
                 title,
                 true
-            ) && it.infor.contains(if (season == null) "$year" else "SS") && it.type == if (season == null) "Movie" else "TV"
+            ) && it.infor.equals(if (season == null) "$year" else "SS ${lastSeason?.minus(1)}") && it.type == if (season == null) "Movie" else "TV"
         }
 
         val shareId = media?.url?.substringAfterLast("/") ?: return

From 9954986e478d22447a0f76393905c01f4246717b Mon Sep 17 00:00:00 2001
From: lisa <lisa@users.noreply.github.com>
Date: Sat, 23 Dec 2023 17:54:55 +0700
Subject: [PATCH 016/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 9e56345f..1bde5716 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2297,7 +2297,7 @@ object SoraExtractor : SoraStream() {
             it.title.equals(
                 title,
                 true
-            ) && it.infor.equals(if (season == null) "$year" else "SS ${lastSeason?.minus(1)}") && it.type == if (season == null) "Movie" else "TV"
+            ) && it.infor.contains(if (season == null) "$year" else "SS") && it.type == if (season == null) "Movie" else "TV"
         }
 
         val shareId = media?.url?.substringAfterLast("/") ?: return

From f08894d2aa328236d0ec4192a77bb1f15cb41e86 Mon Sep 17 00:00:00 2001
From: irfannajmudinsidik
 <50092754+irfannajmudinsidik@users.noreply.github.com>
Date: Sun, 24 Dec 2023 00:27:54 +0700
Subject: [PATCH 017/125] Update Cgvindo.kt (#466)

* Update Cgvindo.kt

* Update Ngefilm.kt

* Update Ngefilm.kt
---
 RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt b/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt
index 370dda11..da0cb643 100644
--- a/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt
+++ b/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.TvType
 
 class Cgvindo : RebahinProvider() {
-    override var mainUrl = "http://167.86.79.231"
+    override var mainUrl = "http://198.54.124.245"
     override var name = "Cgvindo"
 
 }

From ae93b677e18a49d8670e4951253a677b0074ed8a Mon Sep 17 00:00:00 2001
From: monica <monica@users.noreply.github.com>
Date: Sun, 24 Dec 2023 07:57:10 +0700
Subject: [PATCH 018/125] update

---
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 42 ++++++++------
 .../src/main/kotlin/com/hexated/SoraStream.kt |  2 +-
 .../src/main/kotlin/com/hexated/SoraUtils.kt  | 58 +++----------------
 3 files changed, 33 insertions(+), 69 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 1bde5716..387e19ea 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -252,9 +252,9 @@ object SoraExtractor : SoraStream() {
         val req = app.get(url)
         val directUrl = getBaseUrl(req.url)
         val iframe = req.document.selectFirst("div.pframe iframe")?.attr("src") ?: return
-        if(!iframe.contains("youtube")) {
+        if (!iframe.contains("youtube")) {
             loadExtractor(iframe, "$directUrl/", subtitleCallback) { link ->
-                if(link.quality == Qualities.Unknown.value) {
+                if (link.quality == Qualities.Unknown.value) {
                     callback.invoke(
                         ExtractorLink(
                             link.source,
@@ -1319,7 +1319,7 @@ object SoraExtractor : SoraStream() {
                 }
 
                 type.contains("oiya") || type.contains("rarbgx") -> {
-                    val oiyaLink = extractOiya(fdLink ?: return@apmap null, qualities)
+                    val oiyaLink = extractOiya(fdLink ?: return@apmap null)
                     if (oiyaLink?.contains("gdtot") == true) {
                         val gdBotLink = extractGdbot(oiyaLink)
                         extractGdflix(gdBotLink ?: return@apmap null)
@@ -2211,7 +2211,8 @@ object SoraExtractor : SoraStream() {
             "$cinemaTvAPI/shows/play/$id-$slug-$year"
         }
 
-        val session = "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
+        val session =
+            "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
 
         val headers = mapOf(
             "Cookie" to session,
@@ -2288,16 +2289,16 @@ object SoraExtractor : SoraStream() {
             )
         }
 
-        val media = mediaRes.find {
-            it.title.equals(
-                title,
-                true
-            ) && it.infor.equals(if (season == null) "$year" else "SS $lastSeason") && it.type == if (season == null) "Movie" else "TV"
-        } ?: mediaRes.find {
-            it.title.equals(
-                title,
-                true
-            ) && it.infor.contains(if (season == null) "$year" else "SS") && it.type == if (season == null) "Movie" else "TV"
+        val filter = mediaRes.filter {
+            it.title.equals(title, true) && it.type == if (season == null) "Movie" else "TV"
+        }
+
+        val media = if (season == null) {
+            filter.find { it.infor == "$year" }
+        } else {
+            filter.find { it.infor == "SS $lastSeason" }
+                ?: filter.find { it.infor == "SS ${lastSeason?.minus(1)}" }
+                ?: filter.find { it.infor == "SS 1" }
         }
 
         val shareId = media?.url?.substringAfterLast("/") ?: return
@@ -2307,14 +2308,21 @@ object SoraExtractor : SoraStream() {
                 .parsedSafe<FebboxResponse>()?.data?.link?.substringAfterLast("/")
 
         val headers = mapOf("Accept-Language" to "en")
-        val shareRes = app.get("$febboxAPI/file/file_share_list?share_key=${shareKey ?: return}", headers = headers)
+        val shareRes = app.get(
+            "$febboxAPI/file/file_share_list?share_key=${shareKey ?: return}",
+            headers = headers
+        )
             .parsedSafe<FebboxResponse>()?.data
 
         val fids = if (season == null) {
             shareRes?.file_list
         } else {
-            val parentId = shareRes?.file_list?.find { it.file_name.equals("season $season", true) }?.fid
-            app.get("$febboxAPI/file/file_share_list?share_key=${shareKey}&parent_id=$parentId&page=1", headers = headers)
+            val parentId =
+                shareRes?.file_list?.find { it.file_name.equals("season $season", true) }?.fid
+            app.get(
+                "$febboxAPI/file/file_share_list?share_key=${shareKey}&parent_id=$parentId&page=1",
+                headers = headers
+            )
                 .parsedSafe<FebboxResponse>()?.data?.file_list?.filter {
                     it.file_name?.contains(
                         "s${seasonSlug}e${episodeSlug}",
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 379a47e0..ca283c99 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -116,7 +116,7 @@ open class SoraStream : TmdbProvider() {
         const val aoneroomAPI = "https://api3.aoneroom.com"
         const val febboxAPI = "https://www.febbox.com"
 
-        const val fdMoviesAPI = "https://freedrivemovie.lol"
+        const val fdMoviesAPI = "https://freedrivemovie.com"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
         const val gMoviesAPI = "https://gdrivemovies.xyz"
         const val hdmovies4uAPI = "https://hdmovies4u.band"
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 5b98eeeb..0d349112 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -49,7 +49,6 @@ import kotlin.math.min
 var watchflxCookies: Map<String, String>? = null
 var filmxyCookies: Map<String, String>? = null
 var sfServer: String? = null
-var cinemaCookiesChecker: Boolean? = null
 
 val encodedIndex = arrayOf(
     "GamMovies",
@@ -331,10 +330,8 @@ suspend fun getDrivebotLink(url: String?): String? {
         ?.data()?.substringAfter("window.open('")?.substringBefore("')")
 }
 
-suspend fun extractOiya(url: String, quality: String): String? {
-    val doc = app.get(url).document
-    return doc.selectFirst("div.wp-block-button a:matches((?i)$quality)")?.attr("href")
-        ?: doc.selectFirst("div.wp-block-button a")?.attr("href")
+suspend fun extractOiya(url: String): String? {
+    return app.get(url).document.selectFirst("div.wp-block-button a")?.attr("href")
 }
 
 fun deobfstr(hash: String, index: String): String {
@@ -589,10 +586,11 @@ suspend fun bypassFdAds(url: String?): String? {
 }
 
 suspend fun bypassHrefli(url: String): String? {
-    fun Document.getFormUrl() : String {
+    fun Document.getFormUrl(): String {
         return this.select("form#landing").attr("action")
     }
-    fun Document.getFormData() : Map<String,String> {
+
+    fun Document.getFormData(): Map<String, String> {
         return this.select("form#landing input").associate { it.attr("name") to it.attr("value") }
     }
 
@@ -606,7 +604,8 @@ suspend fun bypassHrefli(url: String): String? {
     formData = res.getFormData()
 
     res = app.post(formUrl, data = formData).document
-    val skToken = res.selectFirst("script:containsData(?go=)")?.data()?.substringAfter("?go=")?.substringBefore("\"") ?: return null
+    val skToken = res.selectFirst("script:containsData(?go=)")?.data()?.substringAfter("?go=")
+        ?.substringBefore("\"") ?: return null
     val driveUrl = app.get(
         "$host?go=$skToken", cookies = mapOf(
             skToken to "${formData["_wp_http2"]}"
@@ -648,49 +647,6 @@ suspend fun getTvMoviesServer(url: String, season: Int?, episode: Int?): Pair<St
     }
 }
 
-suspend fun refreshCinemaCookies(session: String) = cinemaCookiesChecker ?: fetchCinemaCookiesChecker(session).also { cinemaCookiesChecker = it }
-
-suspend fun fetchCinemaCookiesChecker(session: String): Boolean {
-    val wiwiApi = base64Decode("aHR0cHM6Ly9jaW5lbWEud2l3aWNlbnRlci5jb20=")
-    suspend fun createConfig(headers: Map<String, String>) {
-        app.get(
-            "$wiwiApi/api/v1/app-config",
-            headers = headers
-        ).text
-    }
-    suspend fun checkCookies(session: String, headers: Map<String, String>) {
-        app.post(
-            "$wiwiApi/api/v1/cookie",
-            data = mapOf("cookie" to session),
-            headers = headers
-        ).text
-    }
-    val configHeaders = mapOf(
-        "App-version" to "3.4",
-        "Authorization" to "Basic d2l3aTpXaXdpQDIwMjA=",
-        "Country" to "Indonesia",
-        "Device-id" to getDeviceId(),
-        "User-id" to "user-6694327",
-    )
-    listOf(1..2).apmap { createConfig(configHeaders) }
-    val unityData = """
-        {
-          "platform": "android",
-          "idfi": "d1ec7051-f58f-4ddb-9da8-8debb82cfbea",
-          "sdkVersionName": "4.3.0",
-          "gdpr.consent": true,
-          "user.nonbehavioral": false,
-          "unity.privacy.permissions.all": false,
-          "unity.privacy.permissions.gameExp": false,
-          "unity.privacy.permissions.ads": false,
-          "unity.privacy.permissions.external": false
-        }
-    """.trimIndent().toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
-    app.post("https://configv2.unityads.unity3d.com/privacy/4519473/state", requestBody = unityData).text
-    listOf(1..4).map {checkCookies(session, configHeaders)}
-    return true
-}
-
 suspend fun getSfServer() = sfServer ?: fetchSfServer().also { sfServer = it }
 
 suspend fun fetchSfServer(): String {

From d3bd6f16098cb5c9cae41488cde8f5fe8d9b6815 Mon Sep 17 00:00:00 2001
From: Saksham Kushwaha <92094239+LiReNa00@users.noreply.github.com>
Date: Sun, 24 Dec 2023 06:28:43 +0530
Subject: [PATCH 019/125] Update YugenAnime.kt (#462)

* Update YugenAnime.kt

Updated the mainurl (it's .sx now) and search function (/discover instead of /search)

* Update YugenAnime.kt
---
 YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt b/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt
index d8c6c982..af605a82 100644
--- a/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt
+++ b/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt
@@ -13,7 +13,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 class YugenAnime : MainAPI() {
-    override var mainUrl = "https://yugenanime.tv"
+    override var mainUrl = "https://yugenanime.sx"
     override var name = "YugenAnime"
     override val hasMainPage = true
     override var lang = "en"
@@ -84,7 +84,7 @@ class YugenAnime : MainAPI() {
     }
 
     override suspend fun search(query: String): List<SearchResponse> {
-        val document = app.get("$mainUrl/search/?q=$query").document
+        val document = app.get("$mainUrl/discover/?q=$query").document
         return document.select("div.cards-grid a.anime-meta").mapNotNull {
             it.toSearchResult()
         }
@@ -231,4 +231,4 @@ class YugenAnime : MainAPI() {
         @JsonProperty("season") val season: String? = null,
     )
 
-}
\ No newline at end of file
+}

From eb128bf97a272be3d6c731f667ea322d22da33fc Mon Sep 17 00:00:00 2001
From: monica <monica@users.noreply.github.com>
Date: Sun, 24 Dec 2023 16:09:45 +0700
Subject: [PATCH 020/125] sora: added WatchCartoon

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |  6 +++
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 50 ++++++++++++++++++-
 .../src/main/kotlin/com/hexated/SoraStream.kt | 13 +++++
 .../main/kotlin/com/hexated/SoraStreamLite.kt | 12 +++++
 .../kotlin/com/hexated/SoraStreamPlugin.kt    |  1 +
 .../src/main/kotlin/com/hexated/SoraUtils.kt  | 12 +++++
 7 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 327754b2..8ce610c3 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 208
+version = 209
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 0e5ae558..a2e33744 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.extractors.Jeniusplay
 import com.lagradost.cloudstream3.extractors.Pixeldrain
 import com.lagradost.cloudstream3.extractors.Vidplay
 import com.lagradost.cloudstream3.utils.*
@@ -409,4 +410,9 @@ class Vidplay2 : Vidplay() {
 class Flaswish : Filesim() {
     override val name = "Flaswish"
     override var mainUrl = "https://flaswish.com"
+}
+
+class Comedyshow : Jeniusplay() {
+    override val mainUrl = "https://comedyshow.to"
+    override val name = "Comedyshow"
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 387e19ea..ab1e1441 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -14,7 +14,6 @@ import com.lagradost.nicehttp.RequestBodyTypes
 import kotlinx.coroutines.delay
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.internal.closeQuietly
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.select.Elements
@@ -323,6 +322,52 @@ object SoraExtractor : SoraStream() {
 
     }
 
+    suspend fun invokeWatchCartoon(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val fixTitle = title.createSlug()
+        val url = if (season == null) {
+            "$watchCartoonAPI/movies/$fixTitle-$year"
+        } else {
+            "$watchCartoonAPI/episode/$fixTitle-season-$season-episode-$episode"
+        }
+
+        val req = app.get(url)
+        val host = getBaseUrl(req.url)
+        val doc = req.document
+
+        val id = doc.select("link[rel=shortlink]").attr("href").substringAfterLast("=")
+        doc.select("div.form-group.list-server option").apmap {
+            val server = app.get(
+                "$host/ajax-get-link-stream/?server=${it.attr("value")}&filmId=$id",
+                headers = mapOf(
+                    "X-Requested-With" to "XMLHttpRequest"
+                )
+            ).text
+            loadExtractor(server, "$host/", subtitleCallback) { link ->
+                if (link.quality == Qualities.Unknown.value) {
+                    callback.invoke(
+                        ExtractorLink(
+                            "WatchCartoon",
+                            "WatchCartoon",
+                            link.url,
+                            link.referer,
+                            Qualities.P720.value,
+                            link.type,
+                            link.headers,
+                            link.extractorData
+                        )
+                    )
+                }
+            }
+        }
+    }
+
     suspend fun invokeNetmovies(
         title: String? = null,
         year: Int? = null,
@@ -1702,6 +1747,7 @@ object SoraExtractor : SoraStream() {
         imdbId: String? = null,
         season: Int? = null,
         episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
@@ -1717,7 +1763,7 @@ object SoraExtractor : SoraStream() {
         }.apmap {
             when (it.second) {
                 "Player F" -> {
-                    invokeSmashyFfix(it.second, it.first, url, callback)
+                    invokeSmashyFfix(it.second, it.first, url, subtitleCallback, callback)
                 }
 
                 "Player D (Hindi)" -> {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index ca283c99..0ce3233c 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -46,6 +46,7 @@ import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeFebbox
 import com.hexated.SoraExtractor.invokeOmovies
+import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
 import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
@@ -115,6 +116,7 @@ open class SoraStream : TmdbProvider() {
         const val showflixAPI = "https://showflix.space"
         const val aoneroomAPI = "https://api3.aoneroom.com"
         const val febboxAPI = "https://www.febbox.com"
+        const val watchCartoonAPI = "https://www1.watchcartoononline.bz"
 
         const val fdMoviesAPI = "https://freedrivemovie.com"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
@@ -450,6 +452,16 @@ open class SoraStream : TmdbProvider() {
                     callback
                 )
             },
+            {
+                if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
             {
                 if (!res.isAnime) invokeVidsrcto(
                     res.imdbId,
@@ -568,6 +580,7 @@ open class SoraStream : TmdbProvider() {
                     res.imdbId,
                     res.season,
                     res.episode,
+                    subtitleCallback,
                     callback
                 )
             },
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 22f27b3a..90ad38d5 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -32,6 +32,7 @@ import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeFebbox
 import com.hexated.SoraExtractor.invokeOmovies
+import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
 import com.lagradost.cloudstream3.SubtitleFile
@@ -106,6 +107,16 @@ class SoraStreamLite : SoraStream() {
             {
                 invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
             },
+            {
+                if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
             {
                 if (res.isAnime) invokeAnimes(
                     res.title,
@@ -159,6 +170,7 @@ class SoraStreamLite : SoraStream() {
                     res.imdbId,
                     res.season,
                     res.episode,
+                    subtitleCallback,
                     callback
                 )
             },
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
index 23cc44f2..c6cd296e 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
@@ -30,5 +30,6 @@ class SoraStreamPlugin: Plugin() {
         registerExtractorAPI(Netembed())
         registerExtractorAPI(Vidplay2())
         registerExtractorAPI(Flaswish())
+        registerExtractorAPI(Comedyshow())
     }
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 0d349112..89593955 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -402,6 +402,7 @@ suspend fun invokeSmashyFfix(
     name: String,
     url: String,
     ref: String,
+    subtitleCallback: (SubtitleFile) -> Unit,
     callback: (ExtractorLink) -> Unit,
 ) {
     val json = app.get(url, referer = ref, headers = mapOf("X-Requested-With" to "XMLHttpRequest"))
@@ -414,6 +415,17 @@ suspend fun invokeSmashyFfix(
         ).forEach(callback)
     }
 
+    json?.subtitleUrls?.split(",")?.map { sub ->
+        val lang = "\\[(.*)]".toRegex().find(sub)?.groupValues?.get(1)
+        val subUrl = sub.replace("[$lang]", "").trim()
+        subtitleCallback.invoke(
+            SubtitleFile(
+                lang ?: return@map,
+                subUrl
+            )
+        )
+    }
+
 }
 
 suspend fun invokeSmashyD(

From 8178fc171e6a00e024a390dbcc12c60f84df34bf Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Fri, 29 Dec 2023 14:28:10 +0530
Subject: [PATCH 021/125] update: some domains and kgp (#477)

* Update kgp

* Update YomoviesProvider.kt

* Update build.gradle.kts

* Update Movierulzhd.kt

* Update Hdmovie2.kt

* Update build.gradle.kts
---
 Movierulzhd/build.gradle.kts                                    | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt             | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt          | 2 +-
 YomoviesProvider/build.gradle.kts                               | 2 +-
 .../src/main/kotlin/com/hexated/YomoviesProvider.kt             | 2 +-
 build.gradle.kts                                                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index 08c2a426..f12a9845 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 55
+version = 56
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
index 4e0f12b7..5ed281c4 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
@@ -12,7 +12,7 @@ import org.jsoup.Jsoup
 
 class Hdmovie2 : Movierulzhd() {
 
-    override var mainUrl = "https://hdmovie2.li"
+    override var mainUrl = "https://hdmovie2.foo"
     override var name = "Hdmovie2"
     override val mainPage = mainPageOf(
         "trending" to "Trending",
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
index 77260037..85624375 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
@@ -11,7 +11,7 @@ import java.net.URI
 
 open class Movierulzhd : MainAPI() {
 
-    override var mainUrl = "https://movierulzhd.bet"
+    override var mainUrl = "https://movierulzhd.host"
     var directUrl = ""
     override var name = "Movierulzhd"
     override val hasMainPage = true
diff --git a/YomoviesProvider/build.gradle.kts b/YomoviesProvider/build.gradle.kts
index 7934b290..31a810db 100644
--- a/YomoviesProvider/build.gradle.kts
+++ b/YomoviesProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 25
+version = 26
 
 
 cloudstream {
diff --git a/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt b/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
index d84867d4..324130e4 100644
--- a/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
+++ b/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
@@ -10,7 +10,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 open class YomoviesProvider : MainAPI() {
-    override var mainUrl = "https://yomovies.media"
+    override var mainUrl = "https://yomovies.boo"
     private var directUrl = ""
     override var name = "Yomovies"
     override val hasMainPage = true
diff --git a/build.gradle.kts b/build.gradle.kts
index c59fbf5d..15b04626 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:7.0.4")
         // Cloudstream gradle plugin which makes everything work and builds plugins
         classpath("com.github.recloudstream:gradle:-SNAPSHOT")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
     }
 }
 

From 248803c497645920ee3432741c270b256d87d3cc Mon Sep 17 00:00:00 2001
From: irfannajmudinsidik
 <50092754+irfannajmudinsidik@users.noreply.github.com>
Date: Fri, 29 Dec 2023 15:58:19 +0700
Subject: [PATCH 022/125] Update Link Ngefilm (#480)

Update link Ngefilm
---
 Gomov/src/main/kotlin/com/hexated/Ngefilm.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
index c70bebc8..6836fc3f 100644
--- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Ngefilm : Gomov() {
-    override var mainUrl = "https://tv.ngefilm21.homes"
+    override var mainUrl = "https://tv1.ngefilm21.homes"
     override var name = "Ngefilm"
     override val mainPage = mainPageOf(
         "/page/%d/?s&search=advanced&post_type=movie&index&orderby&genre&movieyear&country&quality=" to "Movies Terbaru",

From 638b60dd5d96886ed5102a087067acf86f04fa54 Mon Sep 17 00:00:00 2001
From: monica <monica@users.noreply.github.com>
Date: Sat, 30 Dec 2023 16:09:19 +0700
Subject: [PATCH 023/125] fix #472 fix #473

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 81 +++++++------------
 .../src/main/kotlin/com/hexated/SoraParser.kt | 22 ++---
 .../src/main/kotlin/com/hexated/SoraStream.kt | 17 ++--
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  8 +-
 5 files changed, 51 insertions(+), 79 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 8ce610c3..f8d93318 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 209
+version = 210
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index ab1e1441..3ee5c51a 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1,6 +1,5 @@
 package com.hexated
 
-import com.hexated.AESGCM.decrypt
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
@@ -9,7 +8,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.Session
 import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
-import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.nicehttp.RequestBodyTypes
 import kotlinx.coroutines.delay
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
@@ -294,7 +292,7 @@ object SoraExtractor : SoraStream() {
         }?.subjectId
 
         val data = app.get(
-            "$aoneroomAPI/wefeed-mobile-bff/subject-api/resource?subjectId=${subjectId ?: return}&page=1&perPage=10000&all=0&startPosition=1&endPosition=1&pagerMode=0&resolution=480",
+            "$aoneroomAPI/wefeed-mobile-bff/subject-api/resource?subjectId=${subjectId ?: return}&page=1&perPage=20&all=0&startPosition=1&endPosition=1&pagerMode=0&resolution=480",
             headers = headers
         ).parsedSafe<AoneroomResponse>()?.data?.list?.findLast {
             it.se == (season ?: 0) && it.ep == (episode ?: 0)
@@ -1229,7 +1227,7 @@ object SoraExtractor : SoraStream() {
         val selector =
             if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
         val server = app.get(
-            href ?: return, interceptor = CloudflareKiller()
+            href ?: return, interceptor = wpredisInterceptor
         ).document.selectFirst("div.entry-content > $selector")
             ?.attr("href") ?: return
 
@@ -1695,9 +1693,9 @@ object SoraExtractor : SoraStream() {
         imdbId: String? = null,
         season: Int? = null,
         episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
+        onionUrl: String = "https://onionplay.se/"
     ) {
-        val onionUrl = "https://onionplay.se/"
         val request = if (season == null) {
             val res = app.get("$flixonAPI/$imdbId", referer = onionUrl)
             if (res.text.contains("BEGIN PGP SIGNED MESSAGE")) app.get(
@@ -2319,13 +2317,10 @@ object SoraExtractor : SoraStream() {
         lastSeason: Int? = null,
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit,
+        showboxApi: String = "https://www.showbox.media"
     ) {
-
-        val showboxApi = "https://www.showbox.media"
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-
-        val res = app.get("$showboxApi/search?keyword=$title").document
-
+        val res = app.get("$showboxApi/search?keyword=$title", interceptor = showboxInterceptor).document
         val mediaRes = res.select("div.film_list-wrap div.flw-item").map {
             ShowboxMedia(
                 it.select("h2.film-name a").attr("href"),
@@ -2350,7 +2345,7 @@ object SoraExtractor : SoraStream() {
         val shareId = media?.url?.substringAfterLast("/") ?: return
 
         val shareKey =
-            app.get("$showboxApi/index/share_link?id=${shareId}&type=${if (season == null) "1" else "2"}")
+            app.get("$showboxApi/index/share_link?id=${shareId}&type=${if (season == null) "1" else "2"}", interceptor = showboxInterceptor)
                 .parsedSafe<FebboxResponse>()?.data?.link?.substringAfterLast("/")
 
         val headers = mapOf("Accept-Language" to "en")
@@ -2417,9 +2412,9 @@ object SoraExtractor : SoraStream() {
         imdbId: String? = null,
         season: Int? = null,
         episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
+        referer: String = "https://bflix.gs/"
     ) {
-        val referer = "https://bflix.gs/"
         val slug = getEpisodeSlug(season, episode)
         var url =
             if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
@@ -2472,63 +2467,45 @@ object SoraExtractor : SoraStream() {
             }
     }
 
-    suspend fun invokeNavy(
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        invokeHindi(navyAPI, navyAPI, imdbId, season, episode, callback)
-    }
-
-    suspend fun invokeMoment(
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        invokeHindi(momentAPI, "https://hdmovies4u.band", imdbId, season, episode, callback)
-    }
-
-    private suspend fun invokeHindi(
-        host: String? = null,
-        referer: String? = null,
+    suspend fun invokeAllMovieland(
         imdbId: String? = null,
         season: Int? = null,
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit,
+        host: String = "https://esh-bostewsom-i-273.site",
     ) {
         val res = app.get(
-            "$host/play/$imdbId", referer = "$referer/"
+            "$host/play/$imdbId", referer = "$allmovielandAPI/"
         ).document.selectFirst("script:containsData(player =)")?.data()?.substringAfter("{")
             ?.substringBefore(";")?.substringBefore(")")
-        val json = tryParseJson<NavyPlaylist>("{${res ?: return}")
+        val json = tryParseJson<AllMovielandPlaylist>("{${res ?: return}")
         val headers = mapOf(
             "X-CSRF-TOKEN" to "${json?.key}"
         )
 
         val serverRes = app.get(
-            fixUrl(json?.file ?: return, navyAPI), headers = headers, referer = "$referer/"
+            fixUrl(json?.file ?: return, host), headers = headers, referer = "$allmovielandAPI/"
         ).text.replace(Regex(""",\s*\[]"""), "")
-        val server = tryParseJson<ArrayList<NavyServer>>(serverRes).let { server ->
+        val servers = tryParseJson<ArrayList<AllMovielandServer>>(serverRes).let { server ->
             if (season == null) {
-                server?.find { it.title == "English" }?.file
+                server?.map { it.file to it.title }
             } else {
-                server?.find { it.id.equals("$season") }?.folder?.find { it.episode.equals("$episode") }?.folder?.find {
-                    it.title.equals(
-                        "English"
-                    )
-                }?.file
+                server?.find { it.id.equals("$season") }?.folder?.find { it.episode.equals("$episode") }?.folder?.map {
+                    it.file to it.title
+                }
             }
         }
 
-        val path = app.post(
-            "${host}/playlist/${server ?: return}.txt", headers = headers, referer = "$referer/"
-        ).text
-
-        M3u8Helper.generateM3u8(
-            if (host == navyAPI) "Navy" else "Moment", path, "${referer}/"
-        ).forEach(callback)
+        servers?.apmap { (server, lang) ->
+            val path = app.post(
+                    "${host}/playlist/${server ?: return@apmap}.txt", headers = headers, referer = "$allmovielandAPI/"
+            ).text
+            M3u8Helper.generateM3u8(
+                    "Allmovieland [$lang]",
+                    path,
+                    "$allmovielandAPI/"
+            ).forEach(callback)
+        }
 
     }
 
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 938462bc..21eb55a6 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -269,26 +269,26 @@ data class GokuServer(
     @JsonProperty("data") val data: GokuData? = GokuData(),
 )
 
-data class NavyEpisodeFolder(
+data class AllMovielandEpisodeFolder(
     @JsonProperty("title") val title: String? = null,
     @JsonProperty("id") val id: String? = null,
     @JsonProperty("file") val file: String? = null,
 )
 
-data class NavySeasonFolder(
-    @JsonProperty("episode") val episode: String? = null,
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("folder") val folder: ArrayList<NavyEpisodeFolder>? = arrayListOf(),
+data class AllMovielandSeasonFolder(
+        @JsonProperty("episode") val episode: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("folder") val folder: ArrayList<AllMovielandEpisodeFolder>? = arrayListOf(),
 )
 
-data class NavyServer(
-    @JsonProperty("title") val title: String? = null,
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("file") val file: String? = null,
-    @JsonProperty("folder") val folder: ArrayList<NavySeasonFolder>? = arrayListOf(),
+data class AllMovielandServer(
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("folder") val folder: ArrayList<AllMovielandSeasonFolder>? = arrayListOf(),
 )
 
-data class NavyPlaylist(
+data class AllMovielandPlaylist(
     @JsonProperty("file") val file: String? = null,
     @JsonProperty("key") val key: String? = null,
     @JsonProperty("href") val href: String? = null,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 0ce3233c..7021b572 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -2,6 +2,7 @@ package com.hexated
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.hexated.SoraExtractor.invoke2embed
+import com.hexated.SoraExtractor.invokeAllMovieland
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
 import com.hexated.SoraExtractor.invokeBollyMaza
@@ -25,7 +26,6 @@ import com.hexated.SoraExtractor.invokeKisskh
 import com.hexated.SoraExtractor.invokeLing
 import com.hexated.SoraExtractor.invokeM4uhd
 import com.hexated.SoraExtractor.invokeMoviezAdd
-import com.hexated.SoraExtractor.invokeNavy
 import com.hexated.SoraExtractor.invokeNinetv
 import com.hexated.SoraExtractor.invokeNowTv
 import com.hexated.SoraExtractor.invokeRStream
@@ -34,7 +34,6 @@ import com.hexated.SoraExtractor.invokeSmashyStream
 import com.hexated.SoraExtractor.invokeDumpStream
 import com.hexated.SoraExtractor.invokeEmovies
 import com.hexated.SoraExtractor.invokeHdmovies4u
-import com.hexated.SoraExtractor.invokeMoment
 import com.hexated.SoraExtractor.invokeMultimovies
 import com.hexated.SoraExtractor.invokeNetmovies
 import com.hexated.SoraExtractor.invokeSFMovies
@@ -51,6 +50,7 @@ import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
 import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTMDbId
+import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -68,6 +68,9 @@ open class SoraStream : TmdbProvider() {
         TvType.Anime,
     )
 
+    val showboxInterceptor by lazy { CloudflareKiller() }
+    val wpredisInterceptor by lazy { CloudflareKiller() }
+
     /** AUTHOR : Hexated & Sora */
     companion object {
         /** TOOLS */
@@ -102,12 +105,11 @@ open class SoraStream : TmdbProvider() {
         const val gokuAPI = "https://goku.sx"
         const val zshowAPI = BuildConfig.ZSHOW_API
         const val ridomoviesAPI = "https://ridomovies.pw"
-        const val navyAPI = "https://navy-issue-i-239.site"
         const val emoviesAPI = "https://emovies.si"
         const val multimoviesAPI = "https://multimovies.top"
         const val multimovies2API = "https://multimovies.click"
         const val netmoviesAPI = "https://netmovies.to"
-        const val momentAPI = "https://izzillent-dickstonyx-i-262.site"
+        const val allmovielandAPI = "https://allmovieland.fun"
         const val doomoviesAPI = "https://doomovies.net"
         const val vidsrctoAPI = "https://vidsrc.to"
         const val dramadayAPI = "https://dramaday.me"
@@ -121,7 +123,7 @@ open class SoraStream : TmdbProvider() {
         const val fdMoviesAPI = "https://freedrivemovie.com"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
         const val gMoviesAPI = "https://gdrivemovies.xyz"
-        const val hdmovies4uAPI = "https://hdmovies4u.band"
+        const val hdmovies4uAPI = "https://hdmovies4u.dad"
         const val vegaMoviesAPI = "https://vegamovies.dad"
         const val dotmoviesAPI = "https://dotmovies.bet"
         const val tvMoviesAPI = "https://www.tvseriesnmovies.com"
@@ -632,10 +634,7 @@ open class SoraStream : TmdbProvider() {
                 )
             },
             {
-                invokeNavy(res.imdbId, res.season, res.episode, callback)
-            },
-            {
-                invokeMoment(res.imdbId, res.season, res.episode, callback)
+                if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
             },
             {
                 if (!res.isAnime) invokeEmovies(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 90ad38d5..fb015f5d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -1,6 +1,7 @@
 package com.hexated
 
 import com.hexated.SoraExtractor.invoke2embed
+import com.hexated.SoraExtractor.invokeAllMovieland
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
 import com.hexated.SoraExtractor.invokeDbgo
@@ -14,7 +15,6 @@ import com.hexated.SoraExtractor.invokeKimcartoon
 import com.hexated.SoraExtractor.invokeKisskh
 import com.hexated.SoraExtractor.invokeLing
 import com.hexated.SoraExtractor.invokeM4uhd
-import com.hexated.SoraExtractor.invokeNavy
 import com.hexated.SoraExtractor.invokeNinetv
 import com.hexated.SoraExtractor.invokeNowTv
 import com.hexated.SoraExtractor.invokeRStream
@@ -22,7 +22,6 @@ import com.hexated.SoraExtractor.invokeRidomovies
 import com.hexated.SoraExtractor.invokeSmashyStream
 import com.hexated.SoraExtractor.invokeDumpStream
 import com.hexated.SoraExtractor.invokeEmovies
-import com.hexated.SoraExtractor.invokeMoment
 import com.hexated.SoraExtractor.invokeMultimovies
 import com.hexated.SoraExtractor.invokeNetmovies
 import com.hexated.SoraExtractor.invokeSFMovies
@@ -244,9 +243,6 @@ class SoraStreamLite : SoraStream() {
                     callback
                 )
             },
-            {
-                invokeNavy(res.imdbId, res.season, res.episode, callback)
-            },
             {
                 if (!res.isAnime && res.season == null) invokeRidomovies(
                     res.id,
@@ -281,7 +277,7 @@ class SoraStreamLite : SoraStream() {
                 )
             },
             {
-                invokeMoment(res.imdbId, res.season, res.episode, callback)
+                if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
             },
             {
                 if (!res.isAnime && res.season == null) invokeDoomovies(

From 1e2f7466768d5f21fec91441efebb11b7b16a514 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 31 Dec 2023 12:07:11 +0700
Subject: [PATCH 024/125] fix layarkaca

---
 LayarKacaProvider/build.gradle.kts            |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt | 86 +++++++++++++++++++
 .../kotlin/com/hexated/LayarKacaProvider.kt   | 85 +++++++-----------
 .../com/hexated/LayarKacaProviderPlugin.kt    |  1 +
 4 files changed, 117 insertions(+), 57 deletions(-)
 create mode 100644 LayarKacaProvider/src/main/kotlin/com/hexated/Extractors.kt

diff --git a/LayarKacaProvider/build.gradle.kts b/LayarKacaProvider/build.gradle.kts
index 85bf1cb9..7003fef2 100644
--- a/LayarKacaProvider/build.gradle.kts
+++ b/LayarKacaProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 18
+version = 19
 
 
 cloudstream {
diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/Extractors.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/Extractors.kt
new file mode 100644
index 00000000..8aa99fd9
--- /dev/null
+++ b/LayarKacaProvider/src/main/kotlin/com/hexated/Extractors.kt
@@ -0,0 +1,86 @@
+package com.hexated
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.Filesim
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.INFER_TYPE
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.getQualityFromName
+
+open class Emturbovid : ExtractorApi() {
+    override val name = "Emturbovid"
+    override val mainUrl = "https://emturbovid.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+            url: String,
+            referer: String?,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, referer = referer)
+        val m3u8 = Regex("[\"'](.*?master\\.m3u8.*?)[\"']").find(response.text)?.groupValues?.getOrNull(1)
+        M3u8Helper.generateM3u8(
+                name,
+                m3u8 ?: return,
+                mainUrl
+        ).forEach(callback)
+    }
+
+}
+
+open class Hownetwork : ExtractorApi() {
+    override val name = "Hownetwork"
+    override val mainUrl = "https://stream.hownetwork.xyz"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+            url: String,
+            referer: String?,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
+    ) {
+        val id = url.substringAfter("id=")
+        val res = app.post(
+                "$mainUrl/api.php?id=$id",
+                data = mapOf(
+                        "r" to "https://playeriframe.shop/",
+                        "d" to "stream.hownetwork.xyz",
+                ),
+                referer = url,
+                headers = mapOf(
+                        "X-Requested-With" to "XMLHttpRequest"
+                )
+        ).parsedSafe<Sources>()
+
+        res?.data?.map {
+            callback.invoke(
+                    ExtractorLink(
+                            this.name,
+                            this.name,
+                            it.file,
+                            url,
+                            getQualityFromName(it.label),
+                            INFER_TYPE
+                    )
+            )
+        }
+
+    }
+
+    data class Sources(
+            val data: ArrayList<Data>
+    ) {
+        data class Data(
+                val file: String,
+                val label: String?,
+        )
+    }
+}
+
+class Furher : Filesim() {
+    override val name = "Furher"
+    override var mainUrl = "https://furher.in"
+}
\ No newline at end of file
diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
index 552e412e..05b9dcd0 100644
--- a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
+++ b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
@@ -8,29 +8,29 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class LayarKacaProvider : MainAPI() {
-    override var mainUrl = "https://tv6.lk21official.wiki"
-    private var seriesUrl = "https://tv8.nontondrama.click"
+    override var mainUrl = "https://tv7.lk21official.wiki"
+    private var seriesUrl = "https://tv9.nontondrama.click"
     override var name = "LayarKaca"
     override val hasMainPage = true
     override var lang = "id"
     override val supportedTypes = setOf(
-        TvType.Movie,
-        TvType.TvSeries,
-        TvType.AsianDrama
+            TvType.Movie,
+            TvType.TvSeries,
+            TvType.AsianDrama
     )
 
     override val mainPage = mainPageOf(
-        "$mainUrl/populer/page/" to "Film Terplopuler",
-        "$mainUrl/rating/page/" to "Film Berdasarkan IMDb Rating",
-        "$mainUrl/most-commented/page/" to "Film Dengan Komentar Terbanyak",
-        "$seriesUrl/latest/page/" to "Series Terbaru",
-        "$seriesUrl/series/asian/page/" to "Film Asian Terbaru",
-        "$mainUrl/latest/page/" to "Film Upload Terbaru",
+            "$mainUrl/populer/page/" to "Film Terplopuler",
+            "$mainUrl/rating/page/" to "Film Berdasarkan IMDb Rating",
+            "$mainUrl/most-commented/page/" to "Film Dengan Komentar Terbanyak",
+            "$seriesUrl/latest-series/page/" to "Series Terbaru",
+            "$seriesUrl/series/asian/page/" to "Film Asian Terbaru",
+            "$mainUrl/latest/page/" to "Film Upload Terbaru",
     )
 
     override suspend fun getMainPage(
-        page: Int,
-        request: MainPageRequest
+            page: Int,
+            request: MainPageRequest
     ): HomePageResponse {
         val document = app.get(request.data + page).document
         val home = document.select("article.mega-item").mapNotNull {
@@ -54,10 +54,10 @@ class LayarKacaProvider : MainAPI() {
         val href = fixUrl(this.selectFirst("a")!!.attr("href"))
         val posterUrl = fixUrlNull(this.selectFirst("img")?.attr("src"))
         val type =
-            if (this.selectFirst("div.last-episode") == null) TvType.Movie else TvType.TvSeries
+                if (this.selectFirst("div.last-episode") == null) TvType.Movie else TvType.TvSeries
         return if (type == TvType.TvSeries) {
             val episode = this.selectFirst("div.last-episode span")?.text()?.filter { it.isDigit() }
-                ?.toIntOrNull()
+                    ?.toIntOrNull()
             newAnimeSearchResponse(title, href, TvType.TvSeries) {
                 this.posterUrl = posterUrl
                 addSub(episode)
@@ -92,23 +92,23 @@ class LayarKacaProvider : MainAPI() {
         val tags = document.select("div.content > div:nth-child(5) > h3 > a").map { it.text() }
 
         val year = Regex("\\d, (\\d+)").find(
-            document.select("div.content > div:nth-child(7) > h3").text().trim()
+                document.select("div.content > div:nth-child(7) > h3").text().trim()
         )?.groupValues?.get(1).toString().toIntOrNull()
         val tvType = if (document.select("div.serial-wrapper")
-                .isNotEmpty()
+                        .isNotEmpty()
         ) TvType.TvSeries else TvType.Movie
         val description = document.select("div.content > blockquote").text().trim()
         val trailer = document.selectFirst("div.action-player li > a.fancybox")?.attr("href")
         val rating =
-            document.selectFirst("div.content > div:nth-child(6) > h3")?.text()?.toRatingInt()
+                document.selectFirst("div.content > div:nth-child(6) > h3")?.text()?.toRatingInt()
         val actors =
-            document.select("div.col-xs-9.content > div:nth-child(3) > h3 > a").map { it.text() }
+                document.select("div.col-xs-9.content > div:nth-child(3) > h3 > a").map { it.text() }
 
         val recommendations = document.select("div.row.item-media").map {
             val recName = it.selectFirst("h3")?.text()?.trim().toString()
             val recHref = it.selectFirst(".content-media > a")!!.attr("href")
             val recPosterUrl =
-                fixUrl(it.selectFirst(".poster-media > a > img")?.attr("src").toString())
+                    fixUrl(it.selectFirst(".poster-media > a > img")?.attr("src").toString())
             newTvSeriesSearchResponse(recName, recHref, TvType.TvSeries) {
                 this.posterUrl = recPosterUrl
             }
@@ -119,12 +119,12 @@ class LayarKacaProvider : MainAPI() {
                 val href = fixUrl(it.attr("href"))
                 val episode = it.text().toIntOrNull()
                 val season =
-                    it.attr("href").substringAfter("season-").substringBefore("-").toIntOrNull()
+                        it.attr("href").substringAfter("season-").substringBefore("-").toIntOrNull()
                 Episode(
-                    href,
-                    "Episode $episode",
-                    season,
-                    episode,
+                        href,
+                        "Episode $episode",
+                        season,
+                        episode,
                 )
             }.reversed()
             newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
@@ -152,10 +152,10 @@ class LayarKacaProvider : MainAPI() {
     }
 
     override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            data: String,
+            isCasting: Boolean,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ): Boolean {
 
         val document = app.get(data).document
@@ -173,30 +173,3 @@ class LayarKacaProvider : MainAPI() {
     }
 
 }
-
-open class Emturbovid : ExtractorApi() {
-    override val name = "Emturbovid"
-    override val mainUrl = "https://emturbovid.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val response = app.get(url, referer = referer)
-        val m3u8 = Regex("[\"'](.*?master\\.m3u8.*?)[\"']").find(response.text)?.groupValues?.getOrNull(1)
-        M3u8Helper.generateM3u8(
-            name,
-            m3u8 ?: return,
-            mainUrl
-        ).forEach(callback)
-    }
-
-}
-
-class Furher : Filesim() {
-    override val name = "Furher"
-    override var mainUrl = "https://furher.in"
-}
diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProviderPlugin.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProviderPlugin.kt
index 9a73cdc1..d3a57242 100644
--- a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProviderPlugin.kt
+++ b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProviderPlugin.kt
@@ -12,5 +12,6 @@ class LayarKacaProviderPlugin: Plugin() {
         registerMainAPI(LayarKacaProvider())
         registerExtractorAPI(Emturbovid())
         registerExtractorAPI(Furher())
+        registerExtractorAPI(Hownetwork())
     }
 }
\ No newline at end of file

From aada4b49fe1f458b7f89440dc4e919ae76ab406c Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 1 Jan 2024 18:42:32 +0700
Subject: [PATCH 025/125] sora: fix crunchy

---
 Samehadaku/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/Samehadaku.kt |  5 ++-
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 20 ++++-----
 .../src/main/kotlin/com/hexated/SoraParser.kt | 43 ++++++++++++-------
 .../src/main/kotlin/com/hexated/SoraUtils.kt  | 18 +++++---
 6 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/Samehadaku/build.gradle.kts b/Samehadaku/build.gradle.kts
index 25a86ea3..0ef8f5ed 100644
--- a/Samehadaku/build.gradle.kts
+++ b/Samehadaku/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 18
+version = 19
 
 
 cloudstream {
diff --git a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
index 69bdf841..b31f4c7e 100644
--- a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
+++ b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
@@ -217,9 +217,10 @@ class Samehadaku : MainAPI() {
     }
 
     private fun String.fixQuality() : Int {
-        return when(this) {
-            "MP4HD" -> Qualities.P720.value
+        return when(this.uppercase()) {
+            "4K" -> Qualities.P2160.value
             "FULLHD" -> Qualities.P1080.value
+            "MP4HD" -> Qualities.P720.value
             else -> this.filter { it.isDigit() }.toIntOrNull() ?: Qualities.Unknown.value
         }
     }
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index f8d93318..8c2f717a 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 210
+version = 211
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 3ee5c51a..677c7bc2 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1505,7 +1505,8 @@ object SoraExtractor : SoraStream() {
             "en-US",
             "zh-CN",
         )
-        val headers = getCrunchyrollToken()
+        val token = getCrunchyrollToken()
+        val headers = mapOf("Authorization" to "${token.tokenType} ${token.accessToken}")
         val seasonIdData = app.get(
             "$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons", headers = headers
         ).parsedSafe<CrunchyrollResponses>()?.data?.let { s ->
@@ -1532,17 +1533,18 @@ object SoraExtractor : SoraStream() {
                 it.title.equals(epsTitle, true) || it.slug_title.equals(
                     epsTitle.createSlug(), true
                 ) || it.episode_number == episode
-            }?.streams_link
-            val sources =
-                app.get(fixUrl(streamsLink ?: return@apmap, crunchyrollAPI), headers = headers)
-                    .parsedSafe<CrunchyrollSourcesResponses>()
+            }?.streams_link?.substringAfter("/videos/")?.substringBefore("/streams") ?: return@apmap
+            val sources = app.get(
+                    "$crunchyrollAPI/cms/v2${token.bucket}/videos/$streamsLink/streams?Policy=${token.policy}&Signature=${token.signature}&Key-Pair-Id=${token.key_pair_id}",
+            headers = headers
+            ).parsedSafe<CrunchyrollSourcesResponses>()
 
             listOf(
                 "adaptive_hls", "vo_adaptive_hls"
             ).map { hls ->
                 val name = if (hls == "adaptive_hls") "Crunchyroll" else "Vrv"
                 val audio = if (audioL == "en-US") "English Dub" else "Raw"
-                val source = sources?.data?.firstOrNull()?.let {
+                val source = sources?.streams?.let {
                     if (hls == "adaptive_hls") it.adaptive_hls else it.vo_adaptive_hls
                 }
                 M3u8Helper.generateM3u8(
@@ -1552,7 +1554,7 @@ object SoraExtractor : SoraStream() {
                 ).forEach(callback)
             }
 
-            sources?.meta?.subtitles?.map { sub ->
+            sources?.subtitles?.map { sub ->
                 subtitleCallback.invoke(
                     SubtitleFile(
                         "${fixCrunchyrollLang(sub.key) ?: sub.key} [ass]",
@@ -1560,8 +1562,6 @@ object SoraExtractor : SoraStream() {
                     )
                 )
             }
-
-
         }
     }
 
@@ -2135,7 +2135,7 @@ object SoraExtractor : SoraStream() {
             media.third.substringAfterLast("/") to iframe.substringAfterLast("/")
                 .substringBefore("-")
         }
-        val res = app.get(fixUrl(iframe, api))
+        val res = app.get(fixUrl(iframe, api), verify = false)
         delay(2000)
         val serverUrl = res.document.selectFirst("script:containsData(pushState)")?.data()?.let {
             """,\s*'([^']+)""".toRegex().find(it)?.groupValues?.get(1)
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 21eb55a6..03eafa4c 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -2,6 +2,15 @@ package com.hexated
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
+data class CrunchyrollAccessToken(
+        val accessToken: String? = null,
+        val tokenType: String? = null,
+        val bucket: String? = null,
+        val policy: String? = null,
+        val signature: String? = null,
+        val key_pair_id: String? = null,
+)
+
 data class ShowboxMedia(
     val url: String,
     val title: String,
@@ -207,12 +216,17 @@ data class AnilistResponses(
 )
 
 data class CrunchyrollToken(
-    @JsonProperty("access_token") val accessToken: String? = null,
-    @JsonProperty("expires_in") val expiresIn: Int? = null,
-    @JsonProperty("token_type") val tokenType: String? = null,
-    @JsonProperty("scope") val scope: String? = null,
-    @JsonProperty("country") val country: String? = null
-)
+        @JsonProperty("access_token") val accessToken: String? = null,
+        @JsonProperty("token_type") val tokenType: String? = null,
+        @JsonProperty("cms") val cms: Cms? = null,
+) {
+    data class Cms(
+            @JsonProperty("bucket") var bucket: String? = null,
+            @JsonProperty("policy") var policy: String? = null,
+            @JsonProperty("signature") var signature: String? = null,
+            @JsonProperty("key_pair_id") var key_pair_id: String? = null,
+    )
+}
 
 data class CrunchyrollVersions(
     @JsonProperty("audio_locale") val audio_locale: String? = null,
@@ -227,22 +241,21 @@ data class CrunchyrollData(
     @JsonProperty("episode_number") val episode_number: Int? = null,
     @JsonProperty("versions") val versions: ArrayList<CrunchyrollVersions>? = null,
     @JsonProperty("streams_link") val streams_link: String? = null,
-    @JsonProperty("adaptive_hls") val adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
-    @JsonProperty("vo_adaptive_hls") val vo_adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
 )
 
 data class CrunchyrollResponses(
     @JsonProperty("data") val data: ArrayList<CrunchyrollData>? = arrayListOf(),
 )
 
-data class CrunchyrollMeta(
-    @JsonProperty("subtitles") val subtitles: HashMap<String, HashMap<String, String>>? = hashMapOf(),
-)
-
 data class CrunchyrollSourcesResponses(
-    @JsonProperty("data") val data: ArrayList<CrunchyrollData>? = arrayListOf(),
-    @JsonProperty("meta") val meta: CrunchyrollMeta? = null,
-)
+        @JsonProperty("streams") val streams: Streams? = Streams(),
+        @JsonProperty("subtitles") val subtitles: HashMap<String, HashMap<String, String>>? = hashMapOf(),
+) {
+    data class Streams(
+            @JsonProperty("adaptive_hls") val adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
+            @JsonProperty("vo_adaptive_hls") val vo_adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
+    )
+}
 
 data class MALSyncSites(
     @JsonProperty("Zoro") val zoro: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 89593955..22c68cac 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -734,7 +734,7 @@ fun Document.findTvMoviesIframe(): String? {
 }
 
 //modified code from https://github.com/jmir1/aniyomi-extensions/blob/master/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/AccessTokenInterceptor.kt
-suspend fun getCrunchyrollToken(): Map<String, String> {
+suspend fun getCrunchyrollToken(): CrunchyrollAccessToken {
     val client = app.baseClient.newBuilder()
         .proxy(Proxy(Proxy.Type.SOCKS, InetSocketAddress("cr-unblocker.us.to", 1080)))
         .build()
@@ -760,9 +760,17 @@ suspend fun getCrunchyrollToken(): Map<String, String> {
         )
     )
 
-    val response = tryParseJson<CrunchyrollToken>(client.newCall(request).execute().body.string())
-    return mapOf("Authorization" to "${response?.tokenType} ${response?.accessToken}")
-
+    val token = tryParseJson<CrunchyrollToken>(client.newCall(request).execute().body.string())
+    val headers = mapOf("Authorization" to "${token?.tokenType} ${token?.accessToken}")
+    val cms = app.get("$crunchyrollAPI/index/v2", headers = headers).parsedSafe<CrunchyrollToken>()?.cms
+    return CrunchyrollAccessToken(
+            token?.accessToken,
+            token?.tokenType,
+            cms?.bucket,
+            cms?.policy,
+            cms?.signature,
+            cms?.key_pair_id,
+    )
 }
 
 suspend fun getCrunchyrollId(aniId: String?): String? {
@@ -796,7 +804,7 @@ suspend fun getCrunchyrollId(aniId: String?): String? {
 
     return (externalLinks?.find { it.site == "VRV" }
         ?: externalLinks?.find { it.site == "Crunchyroll" })?.url?.let {
-        Regex("series/(\\w+)/?").find(it)?.groupValues?.get(1)
+        app.get(it).url.substringAfter("/series/").substringBefore("/")
     }
 }
 

From bbe17aabed4f7d8753549ba2886ec5a624435fe3 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 1 Jan 2024 19:05:41 +0700
Subject: [PATCH 026/125] fix

---
 SoraStream/src/main/kotlin/com/hexated/Extractors.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index a2e33744..9f50b592 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -11,7 +11,7 @@ import com.lagradost.cloudstream3.apmap
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.extractors.Jeniusplay
-import com.lagradost.cloudstream3.extractors.Pixeldrain
+import com.lagradost.cloudstream3.extractors.PixelDrain
 import com.lagradost.cloudstream3.extractors.Vidplay
 import com.lagradost.cloudstream3.utils.*
 import java.math.BigInteger
@@ -364,7 +364,7 @@ class FilelionsTo : Filesim() {
     override var mainUrl = "https://filelions.to"
 }
 
-class Pixeldra : Pixeldrain() {
+class Pixeldra : PixelDrain() {
     override val mainUrl = "https://pixeldra.in"
 }
 

From 03c2641c86eda9d801f46812e808fada4da0f662 Mon Sep 17 00:00:00 2001
From: irfannajmudinsidik
 <50092754+irfannajmudinsidik@users.noreply.github.com>
Date: Mon, 1 Jan 2024 19:06:40 +0700
Subject: [PATCH 027/125] Update Ngefilm.kt (#486)

Update
---
 Gomov/src/main/kotlin/com/hexated/Ngefilm.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
index 6836fc3f..5061d790 100644
--- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Ngefilm : Gomov() {
-    override var mainUrl = "https://tv1.ngefilm21.homes"
+    override var mainUrl = "https://tv2.ngefilm21.homes"
     override var name = "Ngefilm"
     override val mainPage = mainPageOf(
         "/page/%d/?s&search=advanced&post_type=movie&index&orderby&genre&movieyear&country&quality=" to "Movies Terbaru",

From 4643275ab45042f95ac02e517f2397ac27acd19e Mon Sep 17 00:00:00 2001
From: Saksham Kushwaha <92094239+LiReNa00@users.noreply.github.com>
Date: Mon, 1 Jan 2024 17:39:03 +0530
Subject: [PATCH 028/125] Updated Consumet Instance (#484)

* Update YugenAnime.kt

consumet has closed it's public api instance for months now and to use it consumet a person has to host his/her own instance so just updated the instance

* Update Anilibria.kt

* Update Kickassanime.kt

* Update Loklok.kt
---
 Anilibria/src/main/kotlin/com/hexated/Anilibria.kt       | 4 ++--
 Kickassanime/src/main/kotlin/com/hexated/Kickassanime.kt | 6 +++---
 Loklok/src/main/kotlin/com/hexated/Loklok.kt             | 2 +-
 YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt b/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt
index c51afb3c..d4975a0b 100644
--- a/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt
+++ b/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt
@@ -144,7 +144,7 @@ class Anilibria : MainAPI() {
     }
 
     private suspend fun getTracker(title: String?, type: String?, year: Int?): Tracker {
-        val res = app.get("https://api.consumet.org/meta/anilist/$title")
+        val res = app.get("https://consumet-instance.vercel.app/meta/anilist/$title")
             .parsedSafe<AniSearch>()?.results?.find { media ->
                 (media.title?.english.equals(title, true) || media.title?.romaji.equals(
                     title,
@@ -194,4 +194,4 @@ class Anilibria : MainAPI() {
         @JsonProperty("mes") val mes: String? = null,
     )
 
-}
\ No newline at end of file
+}
diff --git a/Kickassanime/src/main/kotlin/com/hexated/Kickassanime.kt b/Kickassanime/src/main/kotlin/com/hexated/Kickassanime.kt
index 75184a6e..2ca2465e 100644
--- a/Kickassanime/src/main/kotlin/com/hexated/Kickassanime.kt
+++ b/Kickassanime/src/main/kotlin/com/hexated/Kickassanime.kt
@@ -35,8 +35,8 @@ open class Kickassanime : MainAPI() {
 
     companion object {
         const val kaast = "https://kaast1.com"
-        private const val consumetAnilist = "https://api.consumet.org/meta/anilist"
-        private const val consumetMal = "https://api.consumet.org/meta/mal"
+        private const val consumetAnilist = "https://consumet-instance.vercel.app/meta/anilist"
+        private const val consumetMal = "https://consumet-instance.vercel.app/meta/mal"
         fun getType(t: String): TvType {
             return when {
                 t.contains("Ova", true) -> TvType.OVA
@@ -379,4 +379,4 @@ open class Kickassanime : MainAPI() {
         @JsonProperty("title") val title: SyncTitle? = null,
     )
 
-}
\ No newline at end of file
+}
diff --git a/Loklok/src/main/kotlin/com/hexated/Loklok.kt b/Loklok/src/main/kotlin/com/hexated/Loklok.kt
index 5e8c8ca5..143d5c01 100644
--- a/Loklok/src/main/kotlin/com/hexated/Loklok.kt
+++ b/Loklok/src/main/kotlin/com/hexated/Loklok.kt
@@ -268,7 +268,7 @@ class Loklok : MainAPI() {
     }
 
     private suspend fun getTracker(title: String?, type: String?, year: Int?): Tracker {
-        val res = app.get("https://api.consumet.org/meta/anilist/$title")
+        val res = app.get("https://consumet-instance.vercel.app/meta/anilist/$title")
             .parsedSafe<AniSearch>()?.results?.find { media ->
                 (media.title?.english.equals(title, true) || media.title?.romaji.equals(
                     title,
diff --git a/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt b/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt
index af605a82..5a99253f 100644
--- a/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt
+++ b/YugenAnime/src/main/kotlin/com/hexated/YugenAnime.kt
@@ -31,8 +31,8 @@ class YugenAnime : MainAPI() {
     )
 
     companion object {
-        private const val consumetAnilist = "https://api.consumet.org/meta/anilist"
-        private const val consumetMal = "https://api.consumet.org/meta/mal"
+        private const val consumetAnilist = "https://consumet-instance.vercel.app/meta/anilist"
+        private const val consumetMal = "https://consumet-instance.vercel.app/meta/mal"
 
         fun getType(t: String): TvType {
             return if (t.contains("OVA", true) || t.contains("Special", true)) TvType.OVA

From 4c14b600e53e9f37587fd765fe83a719148b3d4e Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 2 Jan 2024 01:07:49 +0700
Subject: [PATCH 029/125] update

---
 Anilibria/build.gradle.kts                    |  2 +-
 .../src/main/kotlin/com/hexated/Anilibria.kt  | 52 ++-----------------
 .../src/main/kotlin/com/hexated/SoraStream.kt | 20 +++----
 .../main/kotlin/com/hexated/SoraStreamLite.kt | 20 +++----
 4 files changed, 26 insertions(+), 68 deletions(-)

diff --git a/Anilibria/build.gradle.kts b/Anilibria/build.gradle.kts
index 061d5f39..f29ed62f 100644
--- a/Anilibria/build.gradle.kts
+++ b/Anilibria/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
diff --git a/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt b/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt
index d4975a0b..254fdade 100644
--- a/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt
+++ b/Anilibria/src/main/kotlin/com/hexated/Anilibria.kt
@@ -84,17 +84,13 @@ class Anilibria : MainAPI() {
         val document = app.get(url).document
 
         val title = document.selectFirst("h1.release-title")?.text() ?: return null
-        val poster = fixUrlNull(document.selectFirst("img#adminPoster")?.attr("src"))
-        val trackTitle = (document.selectFirst("h1.release-title br")?.nextSibling()
+        val enTitle = (document.selectFirst("h1.release-title br")?.nextSibling()
             ?: document.selectFirst("h1.release-title")?.text()?.substringAfter("/")?.trim()).toString()
+        val poster = fixUrlNull(document.selectFirst("img#adminPoster")?.attr("src"))
         val type = document.selectFirst("div#xreleaseInfo b:contains(Тип:)")?.nextSibling()
             .toString().substringBefore(",").trim()
-        val trackType = type.let {
-            if(it.contains("Фильм", true)) "movie" else "tv"
-        }
         val year = document.selectFirst("div#xreleaseInfo b:contains(Сезон:)")?.nextElementSibling()
             ?.text()?.filter { it.isDigit() }?.toIntOrNull()
-        val (malId, anilistId, image, cover) = getTracker(trackTitle, trackType, year)
         val episodes = document.select("script").find { it.data().contains("var player =") }?.data()
             ?.substringAfter("file:[")?.substringBefore("],")?.let { data ->
                 tryParseJson<List<Episodes>>("[$data]")?.mapNotNull { eps ->
@@ -106,15 +102,14 @@ class Anilibria : MainAPI() {
                 }
             }
         return newAnimeLoadResponse(title, url, getType(type)) {
-            posterUrl = image ?: poster
-            backgroundPosterUrl = cover ?: image ?: poster
+            japName = enTitle
+            posterUrl = poster
+            backgroundPosterUrl = poster
             this.year = year
             addEpisodes(DubStatus.Subbed, episodes)
             plot = document.select("p.detail-description").text().trim()
             this.tags = document.selectFirst("div#xreleaseInfo b:contains(Жанры:)")?.nextSibling()
                 .toString().split(",").map { it.trim() }
-            addMalId(malId)
-            addAniListId(anilistId?.toIntOrNull())
         }
     }
 
@@ -143,43 +138,6 @@ class Anilibria : MainAPI() {
         return true
     }
 
-    private suspend fun getTracker(title: String?, type: String?, year: Int?): Tracker {
-        val res = app.get("https://consumet-instance.vercel.app/meta/anilist/$title")
-            .parsedSafe<AniSearch>()?.results?.find { media ->
-                (media.title?.english.equals(title, true) || media.title?.romaji.equals(
-                    title,
-                    true
-                )) || (media.type.equals(type, true) && media.releaseDate == year)
-            }
-        return Tracker(res?.malId, res?.aniId, res?.image, res?.cover)
-    }
-
-    data class Tracker(
-        val malId: Int? = null,
-        val aniId: String? = null,
-        val image: String? = null,
-        val cover: String? = null,
-    )
-
-    data class Title(
-        @JsonProperty("romaji") val romaji: String? = null,
-        @JsonProperty("english") val english: String? = null,
-    )
-
-    data class Results(
-        @JsonProperty("id") val aniId: String? = null,
-        @JsonProperty("malId") val malId: Int? = null,
-        @JsonProperty("title") val title: Title? = null,
-        @JsonProperty("releaseDate") val releaseDate: Int? = null,
-        @JsonProperty("type") val type: String? = null,
-        @JsonProperty("image") val image: String? = null,
-        @JsonProperty("cover") val cover: String? = null,
-    )
-
-    data class AniSearch(
-        @JsonProperty("results") val results: ArrayList<Results>? = arrayListOf(),
-    )
-
     private data class Episodes(
         @JsonProperty("file") val file: String? = null,
         @JsonProperty("title") val title: String? = null,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 7021b572..141c5839 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -365,16 +365,16 @@ open class SoraStream : TmdbProvider() {
         val res = parseJson<LinkData>(data)
 
         argamap(
-            {
-                invokeFebbox(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.lastSeason,
-                    res.episode,
-                    callback
-                )
-            },
+//            {
+//                invokeFebbox(
+//                    res.title,
+//                    res.year,
+//                    res.season,
+//                    res.lastSeason,
+//                    res.episode,
+//                    callback
+//                )
+//            },
             {
                 invokeDumpStream(
                     res.title,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index fb015f5d..3b9e975f 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -52,16 +52,16 @@ class SoraStreamLite : SoraStream() {
         val res = AppUtils.parseJson<LinkData>(data)
 
         argamap(
-            {
-                invokeFebbox(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.lastSeason,
-                    res.episode,
-                    callback
-                )
-            },
+//            {
+//                invokeFebbox(
+//                    res.title,
+//                    res.year,
+//                    res.season,
+//                    res.lastSeason,
+//                    res.episode,
+//                    callback
+//                )
+//            },
             {
                 if (!res.isAnime) invokeWatchsomuch(
                     res.imdbId,

From 2d23f05fa0a070a426b4d7751eff3f0d46ca82dd Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 2 Jan 2024 02:00:28 +0700
Subject: [PATCH 030/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 677c7bc2..1a9392d6 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2092,7 +2092,7 @@ object SoraExtractor : SoraStream() {
             "$title Season $season"
         }
         val savedCookies = mapOf(
-            "_identitygomovies7" to "52fdc70b008c0b1d881dac0f01cca819edd512de01cc8bbc1224ed4aafb78b52a%3A2%3A%7Bi%3A0%3Bs%3A18%3A%22_identitygomovies7%22%3Bi%3A1%3Bs%3A52%3A%22%5B2050366%2C%22HnVRRAObTASOJEr45YyCM8wiHol0V1ko%22%2C2592000%5D%22%3B%7D",
+            base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
         )
         val req = app.get("$api/search/$query")
         val doc = req.document

From 29c78d2468f2f2ce7ceb28cd6d7f1875df30ba44 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 3 Jan 2024 06:57:41 +0700
Subject: [PATCH 031/125] sora: added mMovies & fix oploverz

---
 OploverzProvider/build.gradle.kts             |    2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |   35 +
 .../kotlin/com/hexated/OploverzProvider.kt    |    2 +-
 .../com/hexated/OploverzProviderPlugin.kt     |    1 +
 SoraStream/build.gradle.kts                   |    2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |    8 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 1872 +++++------------
 .../src/main/kotlin/com/hexated/SoraParser.kt |  362 ++--
 .../src/main/kotlin/com/hexated/SoraStream.kt |  879 +++-----
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  402 +---
 10 files changed, 1079 insertions(+), 2486 deletions(-)

diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts
index e2ebbfc0..a8b4e717 100644
--- a/OploverzProvider/build.gradle.kts
+++ b/OploverzProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 24
+version = 25
 
 
 cloudstream {
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt b/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt
index c38c13b8..02a8f86d 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt
@@ -42,4 +42,39 @@ open class Qiwi : ExtractorApi() {
             ?: Qualities.Unknown.value
     }
 
+}
+
+open class Mediafire : ExtractorApi() {
+    override val name = "Mediafire"
+    override val mainUrl = "https://www.mediafire.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+            url: String,
+            referer: String?,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url, referer = referer).document
+        val title = res.select("div.dl-btn-label").text()
+        val video = res.selectFirst("a#downloadButton")?.attr("href")
+
+        callback.invoke(
+                ExtractorLink(
+                        this.name,
+                        this.name,
+                        video ?: return,
+                        "",
+                        getQuality(title),
+                        INFER_TYPE
+                )
+        )
+
+    }
+
+    private fun getQuality(str: String?): Int {
+        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
+                ?: Qualities.Unknown.value
+    }
+
 }
\ No newline at end of file
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
index 8ed03196..4d5dc26d 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class OploverzProvider : MainAPI() {
-    override var mainUrl = "https://oploverz.red"
+    override var mainUrl = "https://oploverz.life"
     override var name = "Oploverz"
     override val hasMainPage = true
     override var lang = "id"
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt
index ba7c0b85..a635a694 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt
@@ -11,5 +11,6 @@ class OploverzProviderPlugin: Plugin() {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(OploverzProvider())
         registerExtractorAPI(Qiwi())
+        registerExtractorAPI(Mediafire())
     }
 }
\ No newline at end of file
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 8c2f717a..f157e229 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 211
+version = 212
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 9f50b592..1674ebc2 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -339,13 +339,7 @@ open class Netembed : ExtractorApi() {
         val script = getAndUnpack(response.text)
         val m3u8 = Regex("((https:|http:)//.*\\.m3u8)").find(script)?.groupValues?.getOrNull(1) ?: return
 
-        if (!m3u8.startsWith("https://www.febbox.com")) {
-            M3u8Helper.generateM3u8(
-                this.name,
-                m3u8,
-                "$mainUrl/",
-            ).forEach(callback)
-        }
+        M3u8Helper.generateM3u8(this.name, m3u8, "$mainUrl/", ).forEach(callback)
     }
 }
 
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 1a9392d6..5e556735 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -10,6 +10,7 @@ import com.lagradost.nicehttp.Session
 import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.nicehttp.RequestBodyTypes
 import kotlinx.coroutines.delay
+import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.jsoup.Jsoup
@@ -20,35 +21,20 @@ val session = Session(Requests().baseClient)
 
 object SoraExtractor : SoraStream() {
 
-    suspend fun invokeGoku(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        lastSeason: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val headers = mapOf(
-            "X-Requested-With" to "XMLHttpRequest"
-        )
+    suspend fun invokeGoku(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
 
         fun Document.getServers(): List<Pair<String, String>> {
             return this.select("a").map { it.attr("data-id") to it.text() }
         }
 
-        val media = app.get(
-            "$gokuAPI/ajax/movie/search?keyword=$title", headers = headers
-        ).document.select("div.item").find { ele ->
+        val media = app.get("$gokuAPI/ajax/movie/search?keyword=$title", headers = headers).document.select("div.item").find { ele ->
             val url = ele.selectFirst("a.movie-link")?.attr("href")
             val titleMedia = ele.select("h3.movie-name").text()
             val titleSlug = title.createSlug()
             val yearMedia = ele.select("div.info-split > div:first-child").text().toIntOrNull()
-            val lastSeasonMedia =
-                ele.select("div.info-split > div:nth-child(2)").text().substringAfter("SS")
-                    .substringBefore("/").trim().toIntOrNull()
-            (titleMedia.equals(title, true) || titleMedia.createSlug()
-                .equals(titleSlug) || url?.contains("$titleSlug-") == true) && (if (season == null) {
+            val lastSeasonMedia = ele.select("div.info-split > div:nth-child(2)").text().substringAfter("SS").substringBefore("/").trim().toIntOrNull()
+            (titleMedia.equals(title, true) || titleMedia.createSlug().equals(titleSlug) || url?.contains("$titleSlug-") == true) && (if (season == null) {
                 yearMedia == year && url?.contains("/movie/") == true
             } else {
                 lastSeasonMedia == lastSeason && url?.contains("/series/") == true
@@ -56,160 +42,91 @@ object SoraExtractor : SoraStream() {
         } ?: return
 
         val serversId = if (season == null) {
-            val movieId = app.get(
-                fixUrl(
-                    media.selectFirst("a")?.attr("href") ?: return, gokuAPI
-                )
-            ).url.substringAfterLast("/")
-            app.get(
-                "$gokuAPI/ajax/movie/episode/servers/$movieId", headers = headers
-            ).document.getServers()
+            val movieId = app.get(fixUrl(media.selectFirst("a")?.attr("href")
+                    ?: return, gokuAPI)).url.substringAfterLast("/")
+            app.get("$gokuAPI/ajax/movie/episode/servers/$movieId", headers = headers).document.getServers()
         } else {
-            val seasonId = app.get(
-                "$gokuAPI/ajax/movie/seasons/${
-                    media.selectFirst("a.btn-wl")?.attr("data-id") ?: return
-                }", headers = headers
-            ).document.select("a.ss-item").find { it.ownText().equals("Season $season", true) }
-                ?.attr("data-id")
-            val episodeId = app.get(
-                "$gokuAPI/ajax/movie/season/episodes/${seasonId ?: return}", headers = headers
-            ).document.select("div.item").find {
+            val seasonId = app.get("$gokuAPI/ajax/movie/seasons/${
+                media.selectFirst("a.btn-wl")?.attr("data-id") ?: return
+            }", headers = headers).document.select("a.ss-item").find { it.ownText().equals("Season $season", true) }?.attr("data-id")
+            val episodeId = app.get("$gokuAPI/ajax/movie/season/episodes/${seasonId ?: return}", headers = headers).document.select("div.item").find {
                 it.selectFirst("strong")?.text().equals("Eps $episode:", true)
             }?.selectFirst("a")?.attr("data-id")
 
-            app.get(
-                "$gokuAPI/ajax/movie/episode/servers/${episodeId ?: return}", headers = headers
-            ).document.getServers()
+            app.get("$gokuAPI/ajax/movie/episode/servers/${episodeId ?: return}", headers = headers).document.getServers()
         }
 
         serversId.apmap { (id, name) ->
-            val iframe =
-                app.get("$gokuAPI/ajax/movie/episode/server/sources/$id", headers = headers)
-                    .parsedSafe<GokuServer>()?.data?.link ?: return@apmap
+            val iframe = app.get("$gokuAPI/ajax/movie/episode/server/sources/$id", headers = headers).parsedSafe<GokuServer>()?.data?.link
+                    ?: return@apmap
             loadCustomExtractor(
-                name,
-                iframe,
-                "$gokuAPI/",
-                subtitleCallback,
-                callback,
+                    name,
+                    iframe,
+                    "$gokuAPI/",
+                    subtitleCallback,
+                    callback,
             )
         }
     }
 
-    suspend fun invokeVidSrc(
-        id: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeVidSrc(id: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val url = if (season == null) {
             "$vidSrcAPI/embed/movie?tmdb=$id"
         } else {
             "$vidSrcAPI/embed/tv?tmdb=$id&season=$season&episode=$episode"
         }
 
-        val iframedoc =
-            app.get(url).document.select("iframe#player_iframe").attr("src").let { httpsify(it) }
+        val iframedoc = app.get(url).document.select("iframe#player_iframe").attr("src").let { httpsify(it) }
         val doc = app.get(iframedoc, referer = url).document
 
         val index = doc.select("body").attr("data-i")
         val hash = doc.select("div#hidden").attr("data-h")
         val srcrcp = deobfstr(hash, index)
 
-        val script = app.get(
-            httpsify(srcrcp),
-            referer = iframedoc
-        ).document.selectFirst("script:containsData(Playerjs)")?.data()
-        val video = script?.substringAfter("file:\"#2")?.substringBefore("\"")
-            ?.replace(Regex("(//\\S+?=)"), "")?.let { base64Decode(it) }
+        val script = app.get(httpsify(srcrcp), referer = iframedoc).document.selectFirst("script:containsData(Playerjs)")?.data()
+        val video = script?.substringAfter("file:\"#2")?.substringBefore("\"")?.replace(Regex("(//\\S+?=)"), "")?.let { base64Decode(it) }
 
-        callback.invoke(
-            ExtractorLink(
-                "Vidsrc",
-                "Vidsrc",
-                video ?: return,
-                "https://vidsrc.stream/",
-                Qualities.P1080.value,
-                INFER_TYPE
-            )
-        )
+        callback.invoke(ExtractorLink("Vidsrc", "Vidsrc", video
+                ?: return, "https://vidsrc.stream/", Qualities.P1080.value, INFER_TYPE))
     }
 
-    suspend fun invokeDbgo(
-        id: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeDbgo(id: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
 
         val iframeDbgo: String?
         val script = if (season == null) {
             val doc = app.get("$dbgoAPI/imdb.php?id=$id").document
             iframeDbgo = doc.select("div.myvideo iframe").attr("src")
-            app.get(iframeDbgo, referer = "$dbgoAPI/").document.select("script")
-                .find { it.data().contains("CDNplayerConfig =") }?.data()
+            app.get(iframeDbgo, referer = "$dbgoAPI/").document.select("script").find { it.data().contains("CDNplayerConfig =") }?.data()
         } else {
             val doc = app.get("$dbgoAPI/tv-imdb.php?id=$id&s=$season").document
             iframeDbgo = doc.select("div.myvideo iframe").attr("src")
-            val token = app.get(
-                iframeDbgo, referer = "$dbgoAPI/"
-            ).document.selectFirst("select#translator-name option")?.attr("data-token")
-            app.get("https://voidboost.net/serial/$token/iframe?s=$season&e=$episode&h=dbgo.fun").document.select(
-                "script"
-            ).find { it.data().contains("CDNplayerConfig =") }?.data()
+            val token = app.get(iframeDbgo, referer = "$dbgoAPI/").document.selectFirst("select#translator-name option")?.attr("data-token")
+            app.get("https://voidboost.net/serial/$token/iframe?s=$season&e=$episode&h=dbgo.fun").document.select("script").find { it.data().contains("CDNplayerConfig =") }?.data()
         } ?: return
 
-        val source =
-            Regex("['|\"]file['|\"]:\\s['|\"](#\\S+?)['|\"]").find(script)?.groupValues?.get(
-                1
-            ) ?: return
-        val subtitle =
-            Regex("['|\"]subtitle['|\"]:\\s['|\"](\\S+?)['|\"]").find(script)?.groupValues?.get(
-                1
-            )
+        val source = Regex("['|\"]file['|\"]:\\s['|\"](#\\S+?)['|\"]").find(script)?.groupValues?.get(1)
+                ?: return
+        val subtitle = Regex("['|\"]subtitle['|\"]:\\s['|\"](\\S+?)['|\"]").find(script)?.groupValues?.get(1)
 
         val ref = getBaseUrl(iframeDbgo)
         decryptStreamUrl(source).split(",").map { links ->
             val quality = Regex("\\[(\\d*p.*?)]").find(links)?.groupValues?.getOrNull(1)?.trim()
-                ?: return@map null
+                    ?: return@map null
             links.replace("[$quality]", "").split(" or ").map { it.trim() }.map { link ->
                 val name = if (link.contains(".m3u8")) "Dbgo (Main)" else "Dbgo (Backup)"
-                callback.invoke(
-                    ExtractorLink(
-                        name,
-                        name,
-                        link,
-                        "$ref/",
-                        getQuality(quality),
-                        isM3u8 = link.contains(".m3u8"),
-                        headers = mapOf(
-                            "Origin" to ref
-                        )
-                    )
-                )
+                callback.invoke(ExtractorLink(name, name, link, "$ref/", getQuality(quality), isM3u8 = link.contains(".m3u8"), headers = mapOf("Origin" to ref)))
             }
         }
 
         subtitle?.split(",")?.map { sub ->
             val language = Regex("\\[(.*)]").find(sub)?.groupValues?.getOrNull(1) ?: return@map null
             val link = sub.replace("[$language]", "").trim()
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    getDbgoLanguage(language), link
-                )
-            )
+            subtitleCallback.invoke(SubtitleFile(getDbgoLanguage(language), link))
         }
 
     }
 
-    suspend fun invokeDreamfilm(
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeDreamfilm(title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$dreamfilmAPI/$fixTitle"
@@ -219,27 +136,13 @@ object SoraExtractor : SoraStream() {
 
         val doc = app.get(url).document
         doc.select("div#videosen a").apmap {
-            val iframe = app.get(it.attr("href")).document.selectFirst("div.card-video iframe")
-                ?.attr("data-src")
-            loadCustomExtractor(
-                null,
-                iframe ?: return@apmap,
-                "$dreamfilmAPI/",
-                subtitleCallback,
-                callback,
-                Qualities.P1080.value
-            )
+            val iframe = app.get(it.attr("href")).document.selectFirst("div.card-video iframe")?.attr("data-src")
+            loadCustomExtractor(null, iframe
+                    ?: return@apmap, "$dreamfilmAPI/", subtitleCallback, callback, Qualities.P1080.value)
         }
     }
 
-    suspend fun invokeMultimovies(
-        apiUrl: String,
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeMultimovies(apiUrl: String, title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$apiUrl/movies/$fixTitle"
@@ -252,82 +155,47 @@ object SoraExtractor : SoraStream() {
         if (!iframe.contains("youtube")) {
             loadExtractor(iframe, "$directUrl/", subtitleCallback) { link ->
                 if (link.quality == Qualities.Unknown.value) {
-                    callback.invoke(
-                        ExtractorLink(
-                            link.source,
-                            link.name,
-                            link.url,
-                            link.referer,
-                            Qualities.P1080.value,
-                            link.type,
-                            link.headers,
-                            link.extractorData
-                        )
-                    )
+                    callback.invoke(ExtractorLink(link.source, link.name, link.url, link.referer, Qualities.P1080.value, link.type, link.headers, link.extractorData))
                 }
             }
         }
     }
 
     suspend fun invokeAoneroom(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
     ) {
-        val headers = mapOf(
-            "Authorization" to "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOjcyODc3MjQ5OTg4MzA0NzM5NzYsInV0cCI6MSwiZXhwIjoxNzEwMzg4NzczLCJpYXQiOjE3MDI2MTI3NzN9.Myt-gVHfPfQFbFyRX3WXtiiwvRzDwBrXTEKy1l-GDRU"
-        )
-        val subjectId = app.post(
-            "$aoneroomAPI/wefeed-mobile-bff/subject-api/search", data = mapOf(
+        val headers = mapOf("Authorization" to "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOjcyODc3MjQ5OTg4MzA0NzM5NzYsInV0cCI6MSwiZXhwIjoxNzEwMzg4NzczLCJpYXQiOjE3MDI2MTI3NzN9.Myt-gVHfPfQFbFyRX3WXtiiwvRzDwBrXTEKy1l-GDRU")
+        val subjectId = app.post("$aoneroomAPI/wefeed-mobile-bff/subject-api/search", data = mapOf(
                 "page" to "1",
                 "perPage" to "10",
                 "keyword" to "$title",
                 "subjectType" to if (season == null) "1" else "2",
-            ), headers = headers
-        ).parsedSafe<AoneroomResponse>()?.data?.items?.find {
+        ), headers = headers).parsedSafe<AoneroomResponse>()?.data?.items?.find {
             it.title.equals(title, true) && it.releaseDate?.substringBefore("-") == "$year"
         }?.subjectId
 
-        val data = app.get(
-            "$aoneroomAPI/wefeed-mobile-bff/subject-api/resource?subjectId=${subjectId ?: return}&page=1&perPage=20&all=0&startPosition=1&endPosition=1&pagerMode=0&resolution=480",
-            headers = headers
-        ).parsedSafe<AoneroomResponse>()?.data?.list?.findLast {
+        val data = app.get("$aoneroomAPI/wefeed-mobile-bff/subject-api/resource?subjectId=${subjectId ?: return}&page=1&perPage=20&all=0&startPosition=1&endPosition=1&pagerMode=0&resolution=480", headers = headers).parsedSafe<AoneroomResponse>()?.data?.list?.findLast {
             it.se == (season ?: 0) && it.ep == (episode ?: 0)
         }
 
-        callback.invoke(
-            ExtractorLink(
-                "Aoneroom",
-                "Aoneroom",
-                data?.resourceLink ?: return,
-                "",
-                data.resolution ?: Qualities.Unknown.value,
-                INFER_TYPE
-            )
-        )
+        callback.invoke(ExtractorLink("Aoneroom", "Aoneroom", data?.resourceLink
+                ?: return, "", data.resolution ?: Qualities.Unknown.value, INFER_TYPE))
 
         data.extCaptions?.map { sub ->
-            subtitleCallback.invoke(
-                SubtitleFile(
+            subtitleCallback.invoke(SubtitleFile(
                     sub.lanName ?: return@map,
                     sub.url ?: return@map,
-                )
-            )
+            ))
         }
 
     }
 
-    suspend fun invokeWatchCartoon(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeWatchCartoon(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$watchCartoonAPI/movies/$fixTitle-$year"
@@ -341,39 +209,16 @@ object SoraExtractor : SoraStream() {
 
         val id = doc.select("link[rel=shortlink]").attr("href").substringAfterLast("=")
         doc.select("div.form-group.list-server option").apmap {
-            val server = app.get(
-                "$host/ajax-get-link-stream/?server=${it.attr("value")}&filmId=$id",
-                headers = mapOf(
-                    "X-Requested-With" to "XMLHttpRequest"
-                )
-            ).text
+            val server = app.get("$host/ajax-get-link-stream/?server=${it.attr("value")}&filmId=$id", headers = mapOf("X-Requested-With" to "XMLHttpRequest")).text
             loadExtractor(server, "$host/", subtitleCallback) { link ->
                 if (link.quality == Qualities.Unknown.value) {
-                    callback.invoke(
-                        ExtractorLink(
-                            "WatchCartoon",
-                            "WatchCartoon",
-                            link.url,
-                            link.referer,
-                            Qualities.P720.value,
-                            link.type,
-                            link.headers,
-                            link.extractorData
-                        )
-                    )
+                    callback.invoke(ExtractorLink("WatchCartoon", "WatchCartoon", link.url, link.referer, Qualities.P720.value, link.type, link.headers, link.extractorData))
                 }
             }
         }
     }
 
-    suspend fun invokeNetmovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeNetmovies(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$netmoviesAPI/movies/$fixTitle-$year"
@@ -383,14 +228,7 @@ object SoraExtractor : SoraStream() {
         invokeWpmovies(null, url, subtitleCallback, callback)
     }
 
-    suspend fun invokeZshow(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeZshow(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$zshowAPI/movie/$fixTitle-$year"
@@ -400,43 +238,45 @@ object SoraExtractor : SoraStream() {
         invokeWpmovies("ZShow", url, subtitleCallback, callback, encrypt = true)
     }
 
+    suspend fun invokeMMovies(title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        val fixTitle = title.createSlug()
+        val url = if (season == null) {
+            "$mMoviesAPI/movies/$fixTitle"
+        } else {
+            "$mMoviesAPI/episodes/$fixTitle-${season}x${episode}"
+        }
+
+        invokeWpmovies(null, url, subtitleCallback, callback, true, hasCloudflare = true, interceptor = multiInterceptor)
+    }
+
     private suspend fun invokeWpmovies(
-        name: String? = null,
-        url: String? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-        fixIframe: Boolean = false,
-        encrypt: Boolean = false,
+            name: String? = null,
+            url: String? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
+            fixIframe: Boolean = false,
+            encrypt: Boolean = false,
+            hasCloudflare: Boolean = false,
+            interceptor: Interceptor? = null,
     ) {
         fun String.fixBloat(): String {
             return this.replace("\"", "").replace("\\", "")
         }
 
-        val res = app.get(url ?: return)
+        val res = app.get(url ?: return, interceptor = if (hasCloudflare) interceptor else null)
         val referer = getBaseUrl(res.url)
         val document = res.document
         document.select("ul#playeroptionsul > li").map {
-            Triple(
-                it.attr("data-post"), it.attr("data-nume"), it.attr("data-type")
-            )
+            Triple(it.attr("data-post"), it.attr("data-nume"), it.attr("data-type"))
         }.apmap { (id, nume, type) ->
             delay(1000)
-            val json = app.post(
-                url = "$referer/wp-admin/admin-ajax.php",
-                data = mapOf(
-                    "action" to "doo_player_ajax", "post" to id, "nume" to nume, "type" to type
-                ),
-                headers = mapOf("Accept" to "*/*", "X-Requested-With" to "XMLHttpRequest"),
-                referer = url
-            )
+            val json = app.post(url = "$referer/wp-admin/admin-ajax.php", data = mapOf("action" to "doo_player_ajax", "post" to id, "nume" to nume, "type" to type), headers = mapOf("Accept" to "*/*", "X-Requested-With" to "XMLHttpRequest"), referer = url, interceptor = if (hasCloudflare) interceptor else null)
             val source = tryParseJson<ResponseHash>(json.text)?.let {
                 when {
                     encrypt -> {
                         val meta = tryParseJson<ZShowEmbed>(it.embed_url)?.meta ?: return@apmap
                         val key = generateWpKey(it.key ?: return@apmap, meta)
-                        cryptoAESHandler(
-                            it.embed_url, key.toByteArray(), false
-                        )?.fixBloat()
+                        cryptoAESHandler(it.embed_url, key.toByteArray(), false)?.fixBloat()
                     }
 
                     fixIframe -> Jsoup.parse(it.embed_url).select("IFRAME").attr("SRC")
@@ -451,38 +291,21 @@ object SoraExtractor : SoraStream() {
         }
     }
 
-    suspend fun invokeDoomovies(
-        title: String? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeDoomovies(title: String? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val res = app.get("$doomoviesAPI/movies/${title.createSlug()}/")
         val host = getBaseUrl(res.url)
         val document = res.document
-        document.select("ul#playeroptionsul > li")
-            .filter { element -> element.select("span.flag img").attr("src").contains("/en.") }
-            .map {
-                Triple(
-                    it.attr("data-post"), it.attr("data-nume"), it.attr("data-type")
-                )
-            }.apmap { (id, nume, type) ->
-                val source = app.get(
-                    "$host/wp-json/dooplayer/v2/${id}/${type}/${nume}",
-                    headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-                    referer = "$host/"
-                ).parsed<ResponseHash>().embed_url
-                if (!source.contains("youtube")) {
-                    loadExtractor(source, "$host/", subtitleCallback, callback)
-                }
+        document.select("ul#playeroptionsul > li").filter { element -> element.select("span.flag img").attr("src").contains("/en.") }.map {
+            Triple(it.attr("data-post"), it.attr("data-nume"), it.attr("data-type"))
+        }.apmap { (id, nume, type) ->
+            val source = app.get("$host/wp-json/dooplayer/v2/${id}/${type}/${nume}", headers = mapOf("X-Requested-With" to "XMLHttpRequest"), referer = "$host/").parsed<ResponseHash>().embed_url
+            if (!source.contains("youtube")) {
+                loadExtractor(source, "$host/", subtitleCallback, callback)
             }
+        }
     }
 
-    suspend fun invokeNoverse(
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeNoverse(title: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$noverseAPI/movie/$fixTitle/download/"
@@ -497,36 +320,27 @@ object SoraExtractor : SoraStream() {
                 it.select("a").attr("href") to it.selectFirst("td")?.text()
             }
         } else {
-            doc.select("table.table-striped tbody tr")
-                .find { it.text().contains("Episode $episode") }?.select("td")?.map {
-                    it.select("a").attr("href") to it.select("a").text()
-                }
+            doc.select("table.table-striped tbody tr").find { it.text().contains("Episode $episode") }?.select("td")?.map {
+                it.select("a").attr("href") to it.select("a").text()
+            }
         } ?: return
 
         delay(4000)
         links.map { (link, quality) ->
-            val name =
-                quality?.replace(Regex("\\d{3,4}p"), "Noverse")?.replace(".", " ") ?: "Noverse"
-            callback.invoke(
-                ExtractorLink(
+            val name = quality?.replace(Regex("\\d{3,4}p"), "Noverse")?.replace(".", " ")
+                    ?: "Noverse"
+            callback.invoke(ExtractorLink(
                     "Noverse",
                     name,
                     link,
                     "",
                     getQualityFromName("${quality?.substringBefore("p")?.trim()}p"),
-                )
-            )
+            ))
         }
 
     }
 
-    suspend fun invokeFilmxy(
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeFilmxy(imdbId: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val url = if (season == null) {
             "${filmxyAPI}/movie/$imdbId"
         } else {
@@ -536,18 +350,15 @@ object SoraExtractor : SoraStream() {
         val doc = app.get(url, cookies = filmxyCookies).document
         val script = doc.selectFirst("script:containsData(var isSingle)")?.data() ?: return
 
-        val sourcesData =
-            Regex("listSE\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
-                tryParseJson<HashMap<String, HashMap<String, List<String>>>>(it)
-            }
-        val sourcesDetail =
-            Regex("linkDetails\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
-                tryParseJson<HashMap<String, HashMap<String, String>>>(it)
-            }
-        val subSourcesData =
-            Regex("dSubtitles\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
-                tryParseJson<HashMap<String, HashMap<String, HashMap<String, String>>>>(it)
-            }
+        val sourcesData = Regex("listSE\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
+            tryParseJson<HashMap<String, HashMap<String, List<String>>>>(it)
+        }
+        val sourcesDetail = Regex("linkDetails\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
+            tryParseJson<HashMap<String, HashMap<String, String>>>(it)
+        }
+        val subSourcesData = Regex("dSubtitles\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
+            tryParseJson<HashMap<String, HashMap<String, HashMap<String, String>>>>(it)
+        }
 
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
 
@@ -562,34 +373,24 @@ object SoraExtractor : SoraStream() {
             subSourcesData?.get("s$seasonSlug")?.get("e$episodeSlug")
         }
 
-        val scriptUser =
-            doc.select("script").find { it.data().contains("var userNonce") }?.data() ?: return
-        val userNonce =
-            Regex("var\\suserNonce.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
-        val userId =
-            Regex("var\\suser_id.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
+        val scriptUser = doc.select("script").find { it.data().contains("var userNonce") }?.data()
+                ?: return
+        val userNonce = Regex("var\\suserNonce.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
+        val userId = Regex("var\\suser_id.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
 
-        val listSources = sources.withIndex()
-            .groupBy { it.index / 2 }
-            .map { entry -> entry.value.map { it.value } }
+        val listSources = sources.withIndex().groupBy { it.index / 2 }.map { entry -> entry.value.map { it.value } }
 
         listSources.apmap { src ->
             val linkIDs = src.joinToString("") {
                 "&linkIDs%5B%5D=$it"
             }.replace("\"", "")
-            val json = app.post(
-                "$filmxyAPI/wp-admin/admin-ajax.php",
-                requestBody = "action=get_vid_links$linkIDs&user_id=$userId&nonce=$userNonce".toRequestBody(),
-                referer = url,
-                headers = mapOf(
+            val json = app.post("$filmxyAPI/wp-admin/admin-ajax.php", requestBody = "action=get_vid_links$linkIDs&user_id=$userId&nonce=$userNonce".toRequestBody(), referer = url, headers = mapOf(
                     "Accept" to "*/*",
                     "DNT" to "1",
                     "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8",
                     "Origin" to filmxyAPI,
                     "X-Requested-With" to "XMLHttpRequest",
-                ),
-                cookies = filmxyCookies
-            ).text.let { tryParseJson<HashMap<String, String>>(it) }
+            ), cookies = filmxyCookies).text.let { tryParseJson<HashMap<String, String>>(it) }
 
             src.map { source ->
                 val link = json?.get(source)
@@ -597,42 +398,22 @@ object SoraExtractor : SoraStream() {
                 val server = sourcesDetail?.get(source)?.get("server")
                 val size = sourcesDetail?.get(source)?.get("size")
 
-                callback.invoke(
-                    ExtractorLink(
-                        "Filmxy",
-                        "Filmxy $server [$size]",
-                        link ?: return@map,
-                        "$filmxyAPI/",
-                        getQualityFromName(quality)
-                    )
-                )
+                callback.invoke(ExtractorLink("Filmxy", "Filmxy $server [$size]", link
+                        ?: return@map, "$filmxyAPI/", getQualityFromName(quality)))
             }
         }
 
         subSources?.mapKeys { sub ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    SubtitleHelper.fromTwoLettersToLanguage(sub.key) ?: return@mapKeys,
-                    "https://www.mysubs.org/get-subtitle/${sub.value}"
-                )
-            )
+            subtitleCallback.invoke(SubtitleFile(SubtitleHelper.fromTwoLettersToLanguage(sub.key)
+                    ?: return@mapKeys, "https://www.mysubs.org/get-subtitle/${sub.value}"))
         }
 
     }
 
-    suspend fun invokeDramaday(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        fun String.getQuality(): String? =
-            Regex("""\d{3,4}[pP]""").find(this)?.groupValues?.getOrNull(0)
+    suspend fun invokeDramaday(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        fun String.getQuality(): String? = Regex("""\d{3,4}[pP]""").find(this)?.groupValues?.getOrNull(0)
 
-        fun String.getTag(): String? =
-            Regex("""\d{3,4}[pP]\s*(.*)""").find(this)?.groupValues?.getOrNull(1)
+        fun String.getTag(): String? = Regex("""\d{3,4}[pP]\s*(.*)""").find(this)?.groupValues?.getOrNull(1)
 
         val slug = title.createSlug()
         val epsSlug = getEpisodeSlug(season, episode)
@@ -646,19 +427,18 @@ object SoraExtractor : SoraStream() {
         val servers = if (season == null) {
             val player = res.select("div.tabs__pane p a[href*=https://ouo]").attr("href")
             val ouo = bypassOuo(player)
-            app.get(ouo ?: return).document.select("article p:matches(\\d{3,4}[pP]) + p:has(a)")
-                .flatMap { ele ->
-                    val entry = ele.previousElementSibling()?.text() ?: ""
-                    ele.select("a").map {
-                        Triple(entry.getQuality(), entry.getTag(), it.attr("href"))
-                    }.filter {
-                        it.third.startsWith("https://pixeldrain.com") || it.third.startsWith("https://krakenfiles.com")
-                    }
+            app.get(ouo
+                    ?: return).document.select("article p:matches(\\d{3,4}[pP]) + p:has(a)").flatMap { ele ->
+                val entry = ele.previousElementSibling()?.text() ?: ""
+                ele.select("a").map {
+                    Triple(entry.getQuality(), entry.getTag(), it.attr("href"))
+                }.filter {
+                    it.third.startsWith("https://pixeldrain.com") || it.third.startsWith("https://krakenfiles.com")
                 }
+            }
         } else {
             val data = res.select("tbody tr:has(td[data-order=${epsSlug.second}])")
-            val qualities =
-                data.select("td:nth-child(2)").attr("data-order").split("<br>").map { it }
+            val qualities = data.select("td:nth-child(2)").attr("data-order").split("<br>").map { it }
             val iframe = data.select("a[href*=https://ouo]").map { it.attr("href") }
             qualities.zip(iframe).map {
                 Triple(it.first.getQuality(), it.first.getTag(), it.second)
@@ -667,74 +447,13 @@ object SoraExtractor : SoraStream() {
 
         servers.filter { it.first == "720p" || it.first == "1080p" }.apmap {
             val server = if (it.third.startsWith("https://ouo")) bypassOuo(it.third) else it.third
-            loadCustomTagExtractor(
-                it.second,
-                server ?: return@apmap,
-                "$dramadayAPI/",
-                subtitleCallback,
-                callback,
-                getQualityFromName(it.first)
-            )
+            loadCustomTagExtractor(it.second, server
+                    ?: return@apmap, "$dramadayAPI/", subtitleCallback, callback, getQualityFromName(it.first))
         }
 
     }
 
-    suspend fun invokeWatchflx(
-        tmdbId: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val epsSlug = getEpisodeSlug(season, episode)
-        val cookies = getWatchflxCookies()
-        val url = if (season == null) {
-            "$watchflxAPI/browse/playmovie/$tmdbId/directplay"
-        } else {
-            "$watchflxAPI/Playseries/series/$tmdbId/directplay"
-        }
-        val res = app.get(url, cookies = cookies).document
-
-        val showUrl = if (season == null) {
-            res.selectFirst("iframe.movie_player")?.attr("src")
-        } else {
-            val seasonUrl =
-                res.select("ul.nav.nav-tabs.tabs-left li:matches(Season $season\$) a").attr("href")
-            val episodeUrl = app.get(
-                seasonUrl, cookies = cookies
-            ).document.select("div.thumb-nail-list a:contains(${epsSlug.second}:)").attr("href")
-            app.get(episodeUrl, cookies = cookies).document.selectFirst("iframe.movie_player")
-                ?.attr("src")
-        }
-        val iframe = app.get(
-            showUrl ?: return, referer = "$watchflxAPI/"
-        ).document.selectFirst("div#the_frame iframe")?.attr("src")
-            ?.let { fixUrl(it, getBaseUrl(showUrl)) } ?: return
-
-        val video = app.get(iframe.replace("/loc/", "/pro/"), referer = iframe).text.let {
-            """mp4_url\s*=\s*["'](.*)["'];""".toRegex().find(it)?.groupValues?.getOrNull(1)
-        }
-
-        callback.invoke(
-            ExtractorLink(
-                "Watchflx",
-                "Watchflx",
-                video ?: return,
-                "$watchflxAPI/",
-                Qualities.P1080.value,
-                INFER_TYPE
-            )
-        )
-
-
-    }
-
-    suspend fun invokeKimcartoon(
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeKimcartoon(title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val doc = if (season == null || season == 1) {
             app.get("$kimcartoonAPI/Cartoon/$fixTitle").document
@@ -750,9 +469,7 @@ object SoraExtractor : SoraStream() {
                 it.attr("href").contains(Regex("(?i)Episode-0*$episode"))
             }?.attr("href")
         } ?: return
-        val servers =
-            app.get(fixUrl(iframe, kimcartoonAPI)).document.select("#selectServer > option")
-                .map { fixUrl(it.attr("value"), kimcartoonAPI) }
+        val servers = app.get(fixUrl(iframe, kimcartoonAPI)).document.select("#selectServer > option").map { fixUrl(it.attr("value"), kimcartoonAPI) }
 
         servers.apmap {
             app.get(it).document.select("#my_video_1").attr("src").let { iframe ->
@@ -764,83 +481,53 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeDumpStream(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val (id, type) = getDumpIdAndType(title, year, season)
         val json = fetchDumpEpisodes("$id", "$type", episode) ?: return
 
         json.subtitlingList?.map { sub ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    getVipLanguage(sub.languageAbbr ?: return@map), sub.subtitlingUrl ?: return@map
-                )
-            )
+            subtitleCallback.invoke(SubtitleFile(getVipLanguage(sub.languageAbbr
+                    ?: return@map), sub.subtitlingUrl ?: return@map))
         }
     }
 
-    suspend fun invokeVidsrcto(
-        imdbId: String?,
-        season: Int?,
-        episode: Int?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeVidsrcto(imdbId: String?, season: Int?, episode: Int?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val url = if (season == null) {
             "$vidsrctoAPI/embed/movie/$imdbId"
         } else {
             "$vidsrctoAPI/embed/tv/$imdbId/$season/$episode"
         }
 
-        val mediaId =
-            app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id") ?: return
+        val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id")
+                ?: return
 
-        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources")
-            .parsedSafe<VidsrctoSources>()?.result?.apmap {
-                val encUrl = app.get("$vidsrctoAPI/ajax/embed/source/${it.id}")
-                    .parsedSafe<VidsrctoResponse>()?.result?.url
-                loadExtractor(
-                    vidsrctoDecrypt(encUrl ?: return@apmap),
-                    "$vidsrctoAPI/",
-                    subtitleCallback,
-                    callback
-                )
-            }
+        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources").parsedSafe<VidsrctoSources>()?.result?.apmap {
+            val encUrl = app.get("$vidsrctoAPI/ajax/embed/source/${it.id}").parsedSafe<VidsrctoResponse>()?.result?.url
+            loadExtractor(vidsrctoDecrypt(encUrl
+                    ?: return@apmap), "$vidsrctoAPI/", subtitleCallback, callback)
+        }
 
         val subtitles = app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/subtitles").text
         tryParseJson<List<VidsrctoSubtitles>>(subtitles)?.map {
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    it.label ?: "",
-                    it.file ?: return@map
-                )
-            )
+            subtitleCallback.invoke(SubtitleFile(it.label ?: "", it.file ?: return@map))
         }
 
     }
 
-    suspend fun invokeKisskh(
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        isAnime: Boolean = false,
-        lastSeason: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeKisskh(title: String? = null, season: Int? = null, episode: Int? = null, isAnime: Boolean = false, lastSeason: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val slug = title.createSlug() ?: return
         val type = when {
             isAnime -> "3"
             season == null -> "2"
             else -> "1"
         }
-        val res = app.get(
-            "$kissKhAPI/api/DramaList/Search?q=$title&type=$type", referer = "$kissKhAPI/"
-        ).text.let {
+        val res = app.get("$kissKhAPI/api/DramaList/Search?q=$title&type=$type", referer = "$kissKhAPI/").text.let {
             tryParseJson<ArrayList<KisskhResults>>(it)
         } ?: return
 
@@ -852,20 +539,15 @@ object SoraExtractor : SoraStream() {
                 when {
                     season == null -> slugTitle == slug
                     lastSeason == 1 -> slugTitle.contains(slug)
-                    else -> (slugTitle.contains(slug) && it.title?.contains(
-                        "Season $season",
-                        true
-                    ) == true)
+                    else -> (slugTitle.contains(slug) && it.title?.contains("Season $season", true) == true)
                 }
             } ?: res.find { it.title.equals(title) }
             data?.id to data?.title
         }
 
-        val resDetail = app.get(
-            "$kissKhAPI/api/DramaList/Drama/$id?isq=false", referer = "$kissKhAPI/Drama/${
-                getKisskhTitle(contentTitle)
-            }?id=$id"
-        ).parsedSafe<KisskhDetail>() ?: return
+        val resDetail = app.get("$kissKhAPI/api/DramaList/Drama/$id?isq=false", referer = "$kissKhAPI/Drama/${
+            getKisskhTitle(contentTitle)
+        }?id=$id").parsedSafe<KisskhDetail>() ?: return
 
         val epsId = if (season == null) {
             resDetail.episodes?.first()?.id
@@ -873,80 +555,45 @@ object SoraExtractor : SoraStream() {
             resDetail.episodes?.find { it.number == episode }?.id
         }
 
-        app.get(
-            "$kissKhAPI/api/DramaList/Episode/$epsId.png?err=false&ts=&time=",
-            referer = "$kissKhAPI/Drama/${getKisskhTitle(contentTitle)}/Episode-${episode ?: 0}?id=$id&ep=$epsId&page=0&pageSize=100"
-        ).parsedSafe<KisskhSources>()?.let { source ->
+        app.get("$kissKhAPI/api/DramaList/Episode/$epsId.png?err=false&ts=&time=", referer = "$kissKhAPI/Drama/${getKisskhTitle(contentTitle)}/Episode-${episode ?: 0}?id=$id&ep=$epsId&page=0&pageSize=100").parsedSafe<KisskhSources>()?.let { source ->
             listOf(source.video, source.thirdParty).apmap { link ->
                 if (link?.contains(".m3u8") == true) {
-                    M3u8Helper.generateM3u8(
-                        "Kisskh", link, "$kissKhAPI/", headers = mapOf("Origin" to kissKhAPI)
-                    ).forEach(callback)
+                    M3u8Helper.generateM3u8("Kisskh", link, "$kissKhAPI/", headers = mapOf("Origin" to kissKhAPI)).forEach(callback)
                 } else {
-                    loadExtractor(
-                        link?.substringBefore("=http") ?: return@apmap null,
-                        "$kissKhAPI/",
-                        subtitleCallback,
-                        callback
-                    )
+                    loadExtractor(link?.substringBefore("=http")
+                            ?: return@apmap null, "$kissKhAPI/", subtitleCallback, callback)
                 }
             }
         }
 
         app.get("$kissKhAPI/api/Sub/$epsId").text.let { resSub ->
             tryParseJson<List<KisskhSubtitle>>(resSub)?.map { sub ->
-                subtitleCallback.invoke(
-                    SubtitleFile(
-                        getLanguage(sub.label ?: return@map), sub.src ?: return@map
-                    )
-                )
+                subtitleCallback.invoke(SubtitleFile(getLanguage(sub.label ?: return@map), sub.src
+                        ?: return@map))
             }
         }
 
 
     }
 
-    suspend fun invokeAnimes(
-        title: String? = null,
-        epsTitle: String? = null,
-        date: String?,
-        airedDate: String?,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeAnimes(title: String? = null, epsTitle: String? = null, date: String?, airedDate: String?, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
 
-        val (aniId, malId) = convertTmdbToAnimeId(
-            title, date, airedDate, if (season == null) TvType.AnimeMovie else TvType.Anime
-        )
+        val (aniId, malId) = convertTmdbToAnimeId(title, date, airedDate, if (season == null) TvType.AnimeMovie else TvType.Anime)
 
         argamap({
             invokeAnimetosho(malId, season, episode, subtitleCallback, callback)
         }, {
             invokeAniwatch(malId, episode, subtitleCallback, callback)
         }, {
-            if (season != null) invokeCrunchyroll(
-                aniId, malId, epsTitle, season, episode, subtitleCallback, callback
-            )
+            if (season != null) invokeCrunchyroll(aniId, malId, epsTitle, season, episode, subtitleCallback, callback)
         })
     }
 
-    private suspend fun invokeAnimetosho(
-        malId: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    private suspend fun invokeAnimetosho(malId: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         fun Elements.getLinks(): List<Triple<String, String, Int>> {
             return this.flatMap { ele ->
                 ele.select("div.links a:matches(KrakenFiles|GoFile)").map {
-                    Triple(
-                        it.attr("href"),
-                        ele.select("div.size").text(),
-                        getIndexQuality(ele.select("div.link a").text())
-                    )
+                    Triple(it.attr("href"), ele.select("div.size").text(), getIndexQuality(ele.select("div.link a").text()))
                 }
             }
         }
@@ -954,80 +601,54 @@ object SoraExtractor : SoraStream() {
         val (seasonSLug, episodeSlug) = getEpisodeSlug(season, episode)
         val jikan = app.get("$jikanAPI/anime/$malId/full").parsedSafe<JikanResponse>()?.data
         val aniId = jikan?.external?.find { it.name == "AniDB" }?.url?.substringAfterLast("=")
-        val res =
-            app.get("$animetoshoAPI/series/${jikan?.title?.createSlug()}.$aniId?filter[0][t]=nyaa_class&filter[0][v]=trusted").document
+        val res = app.get("$animetoshoAPI/series/${jikan?.title?.createSlug()}.$aniId?filter[0][t]=nyaa_class&filter[0][v]=trusted").document
 
         val servers = if (season == null) {
             res.select("div.home_list_entry:has(div.links)").getLinks()
         } else {
-            res.select("div.home_list_entry:has(div.link a:matches([\\.\\s]$episodeSlug[\\.\\s]|S${seasonSLug}E$episodeSlug))")
-                .getLinks()
+            res.select("div.home_list_entry:has(div.link a:matches([\\.\\s]$episodeSlug[\\.\\s]|S${seasonSLug}E$episodeSlug))").getLinks()
         }
 
         servers.filter { it.third in arrayOf(Qualities.P1080.value, Qualities.P720.value) }.apmap {
-            loadCustomTagExtractor(
-                it.second, it.first, "$animetoshoAPI/", subtitleCallback, callback, it.third
-            )
+            loadCustomTagExtractor(it.second, it.first, "$animetoshoAPI/", subtitleCallback, callback, it.third)
         }
 
     }
 
-    private suspend fun invokeAniwatch(
-        malId: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    private suspend fun invokeAniwatch(malId: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val headers = mapOf(
-            "X-Requested-With" to "XMLHttpRequest",
+                "X-Requested-With" to "XMLHttpRequest",
         )
-        val animeId = app.get("$malsyncAPI/mal/anime/${malId ?: return}")
-            .parsedSafe<MALSyncResponses>()?.sites?.zoro?.keys?.map { it }
+        val animeId = app.get("$malsyncAPI/mal/anime/${malId ?: return}").parsedSafe<MALSyncResponses>()?.sites?.zoro?.keys?.map { it }
         animeId?.apmap { id ->
-            val episodeId = app.get(
-                "$aniwatchAPI/ajax/v2/episode/list/${id ?: return@apmap}", headers = headers
-            ).parsedSafe<AniwatchResponses>()?.html?.let {
+            val episodeId = app.get("$aniwatchAPI/ajax/v2/episode/list/${id ?: return@apmap}", headers = headers).parsedSafe<AniwatchResponses>()?.html?.let {
                 Jsoup.parse(it)
-            }?.select("div.ss-list a")?.find { it.attr("data-number") == "${episode ?: 1}" }
-                ?.attr("data-id")
+            }?.select("div.ss-list a")?.find { it.attr("data-number") == "${episode ?: 1}" }?.attr("data-id")
 
-            val servers = app.get(
-                "$aniwatchAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}",
-                headers = headers
-            ).parsedSafe<AniwatchResponses>()?.html?.let { Jsoup.parse(it) }
-                ?.select("div.item.server-item")?.map {
-                    Triple(
+            val servers = app.get("$aniwatchAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}", headers = headers).parsedSafe<AniwatchResponses>()?.html?.let { Jsoup.parse(it) }?.select("div.item.server-item")?.map {
+                Triple(
                         it.text(),
                         it.attr("data-id"),
                         it.attr("data-type"),
-                    )
-                }
+                )
+            }
 
             servers?.apmap servers@{ server ->
-                val iframe = app.get(
-                    "$aniwatchAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}",
-                    headers = headers
-                ).parsedSafe<AniwatchResponses>()?.link ?: return@servers
+                val iframe = app.get("$aniwatchAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}", headers = headers).parsedSafe<AniwatchResponses>()?.link
+                        ?: return@servers
                 val audio = if (server.third == "sub") "Raw" else "English Dub"
                 loadCustomExtractor(
-                    "${server.first} [$audio]",
-                    iframe,
-                    "$aniwatchAPI/",
-                    subtitleCallback,
-                    callback,
+                        "${server.first} [$audio]",
+                        iframe,
+                        "$aniwatchAPI/",
+                        subtitleCallback,
+                        callback,
                 )
             }
         }
     }
 
-    suspend fun invokeLing(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeLing(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title?.replace("–", "-")
         val url = if (season == null) {
             "$lingAPI/en/videos/films/?title=$fixTitle"
@@ -1037,9 +658,9 @@ object SoraExtractor : SoraStream() {
 
         val scriptData = app.get(url).document.select("div.blk.padding_b0 div.col-sm-30").map {
             Triple(
-                it.selectFirst("div.video-body h5")?.text(),
-                it.selectFirst("div.video-body > p")?.text(),
-                it.selectFirst("div.video-body a")?.attr("href"),
+                    it.selectFirst("div.video-body h5")?.text(),
+                    it.selectFirst("div.video-body > p")?.text(),
+                    it.selectFirst("div.video-body a")?.attr("href"),
             )
         }
 
@@ -1047,9 +668,7 @@ object SoraExtractor : SoraStream() {
             scriptData.first()
         } else {
             scriptData.find {
-                it.first?.contains(
-                    "$fixTitle", true
-                ) == true && it.second?.contains("$year") == true
+                it.first?.contains("$fixTitle", true) == true && it.second?.contains("$year") == true
             }
         }
 
@@ -1057,36 +676,21 @@ object SoraExtractor : SoraStream() {
         val iframe = (if (season == null) {
             doc.selectFirst("a.video-js.vjs-default-skin")?.attr("data-href")
         } else {
-            doc.select("div.blk div#tab_$season li")[episode!!.minus(1)].select("h5 a")
-                .attr("data-href")
+            doc.select("div.blk div#tab_$season li")[episode!!.minus(1)].select("h5 a").attr("data-href")
         })?.let { fixUrl(it, lingAPI) }
 
         val source = app.get(iframe ?: return)
         val link = Regex("((https:|http:)//.*\\.mp4)").find(source.text)?.value ?: return
-        callback.invoke(
-            ExtractorLink(
-                "Ling", "Ling", "$link/index.m3u8", "$lingAPI/", Qualities.P720.value, INFER_TYPE
-            )
-        )
+        callback.invoke(ExtractorLink("Ling", "Ling", "$link/index.m3u8", "$lingAPI/", Qualities.P720.value, INFER_TYPE))
 
         source.document.select("div#player-tracks track").map {
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    SubtitleHelper.fromTwoLettersToLanguage(it.attr("srclang")) ?: return@map null,
-                    it.attr("src")
-                )
-            )
+            subtitleCallback.invoke(SubtitleFile(SubtitleHelper.fromTwoLettersToLanguage(it.attr("srclang"))
+                    ?: return@map null, it.attr("src")))
         }
 
     }
 
-    suspend fun invokeUhdmovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeUhdmovies(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
 
@@ -1119,12 +723,10 @@ object SoraExtractor : SoraStream() {
             val driveReq = app.get(driveLink)
             val driveRes = driveReq.document
             val bitLink = driveRes.select("a.btn.btn-outline-success").attr("href")
-            val insLink =
-                driveRes.select("a.btn.btn-danger:contains(Instant Download)").attr("href")
+            val insLink = driveRes.select("a.btn.btn-danger:contains(Instant Download)").attr("href")
             val downloadLink = when {
                 insLink.isNotEmpty() -> extractInstantUHD(insLink)
-                driveRes.select("button.btn.btn-success").text()
-                    .contains("Direct Download", true) -> extractDirectUHD(driveLink, driveReq)
+                driveRes.select("button.btn.btn-success").text().contains("Direct Download", true) -> extractDirectUHD(driveLink, driveReq)
 
                 bitLink.isNullOrEmpty() -> {
                     val backupIframe = driveRes.select("a.btn.btn-outline-warning").attr("href")
@@ -1139,70 +741,20 @@ object SoraExtractor : SoraStream() {
             val tags = getUhdTags(quality)
             val qualities = getIndexQuality(quality)
             val size = getIndexSize(quality)
-            callback.invoke(
-                ExtractorLink(
-                    "UHDMovies",
-                    "UHDMovies $tags [$size]",
-                    downloadLink ?: return@apmap,
-                    "",
-                    qualities
-                )
-            )
+            callback.invoke(ExtractorLink("UHDMovies", "UHDMovies $tags [$size]", downloadLink
+                    ?: return@apmap, "", qualities))
         }
     }
 
-    suspend fun invokeDotmovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        lastSeason: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        invokeWpredis(
-            title,
-            year,
-            season,
-            lastSeason,
-            episode,
-            subtitleCallback,
-            callback,
-            dotmoviesAPI
-        )
+    suspend fun invokeDotmovies(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        invokeWpredis(title, year, season, lastSeason, episode, subtitleCallback, callback, dotmoviesAPI)
     }
 
-    suspend fun invokeVegamovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        lastSeason: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        invokeWpredis(
-            title,
-            year,
-            season,
-            lastSeason,
-            episode,
-            subtitleCallback,
-            callback,
-            vegaMoviesAPI
-        )
+    suspend fun invokeVegamovies(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+        invokeWpredis(title, year, season, lastSeason, episode, subtitleCallback, callback, vegaMoviesAPI)
     }
 
-    private suspend fun invokeWpredis(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        lastSeason: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-        api: String
-    ) {
+    private suspend fun invokeWpredis(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit, api: String) {
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
         var res = app.get("$api/search/$title").document
         val match = when (season) {
@@ -1210,68 +762,42 @@ object SoraExtractor : SoraStream() {
             1 -> "Season 1"
             else -> "Season 1 – $lastSeason"
         }
-        val media =
-            res.selectFirst("div.blog-items article:has(h3.entry-title:matches((?i)$title.*$match)) a")
-                ?.attr("href")
+        val media = res.selectFirst("div.blog-items article:has(h3.entry-title:matches((?i)$title.*$match)) a")?.attr("href")
 
         res = app.get(media ?: return).document
         val hTag = if (season == null) "h5" else "h3"
         val aTag = if (season == null) "Download Now" else "V-Cloud"
         val sTag = if (season == null) "" else "(Season $season|S$seasonSlug)"
-        val entry = res.select("div.entry-content > $hTag:matches((?i)$sTag.*(1080p|2160p))")
-            .findLast { element -> !element.text().contains("Download", true) } ?: return
-        val tags =
-            """(?:1080p|2160p)(.*)""".toRegex().find(entry.text())?.groupValues?.get(1)?.trim()
-        val href =
-            entry.nextElementSibling()?.select("a:contains($aTag)")?.attr("href")
-        val selector =
-            if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
-        val server = app.get(
-            href ?: return, interceptor = wpredisInterceptor
-        ).document.selectFirst("div.entry-content > $selector")
-            ?.attr("href") ?: return
+        val entry = res.select("div.entry-content > $hTag:matches((?i)$sTag.*(1080p|2160p))").findLast { element -> !element.text().contains("Download", true) }
+                ?: return
+        val tags = """(?:1080p|2160p)(.*)""".toRegex().find(entry.text())?.groupValues?.get(1)?.trim()
+        val href = entry.nextElementSibling()?.select("a:contains($aTag)")?.attr("href")
+        val selector = if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
+        val server = app.get(href
+                ?: return, interceptor = wpredisInterceptor).document.selectFirst("div.entry-content > $selector")?.attr("href")
+                ?: return
 
-        loadCustomTagExtractor(
-            tags,
-            server,
-            "$api/",
-            subtitleCallback,
-            callback,
-            getIndexQuality(entry.text())
-        )
+        loadCustomTagExtractor(tags, server, "$api/", subtitleCallback, callback, getIndexQuality(entry.text()))
     }
 
-    suspend fun invokeHdmovies4u(
-        title: String? = null,
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeHdmovies4u(title: String? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         fun String.decodeLink(): String {
             return base64Decode(this.substringAfterLast("/"))
         }
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-        val media =
-            app.get("$hdmovies4uAPI/?s=${if (season == null) imdbId else title}").document.let {
-                val selector =
-                    if (season == null) "a" else "a:matches((?i)$title.*Season $season)"
-                it.selectFirst("div.gridxw.gridxe $selector")?.attr("href")
-            }
+        val media = app.get("$hdmovies4uAPI/?s=${if (season == null) imdbId else title}").document.let {
+            val selector = if (season == null) "a" else "a:matches((?i)$title.*Season $season)"
+            it.selectFirst("div.gridxw.gridxe $selector")?.attr("href")
+        }
         val selector = if (season == null) "1080p|2160p" else "(?i)Episode.*(?:1080p|2160p)"
-        app.get(
-            media ?: return
-        ).document.select("section h4:matches($selector)").apmap { ele ->
+        app.get(media ?: return).document.select("section h4:matches($selector)").apmap { ele ->
             val (tags, size) = ele.select("span").map {
                 it.text()
             }.let { it[it.lastIndex - 1] to it.last().substringAfter("-").trim() }
             val link = ele.nextElementSibling()?.select("a:contains(DriveTOT)")?.attr("href")
             val iframe = bypassBqrecipes(link?.decodeLink() ?: return@apmap).let {
                 if (it?.contains("/pack/") == true) {
-                    val href =
-                        app.get(it).document.select("table tbody tr:contains(S${seasonSlug}E${episodeSlug}) a")
-                            .attr("href")
+                    val href = app.get(it).document.select("table tbody tr:contains(S${seasonSlug}E${episodeSlug}) a").attr("href")
                     bypassBqrecipes(href.decodeLink())
                 } else {
                     it
@@ -1281,14 +807,7 @@ object SoraExtractor : SoraStream() {
         }
     }
 
-    suspend fun invokeGMovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeGMovies(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null || season == 1) {
             "$gMoviesAPI/$fixTitle-$year"
@@ -1304,8 +823,7 @@ object SoraExtractor : SoraStream() {
             }
         } else {
             doc.select("div.is-content-justification-center").find {
-                it.previousElementSibling()?.text()
-                    ?.contains(Regex("(?i)episode\\s?$episode")) == true
+                it.previousElementSibling()?.text()?.contains(Regex("(?i)episode\\s?$episode")) == true
             }?.select("div.wp-block-button")?.map {
                 it.select("a").attr("href") to it.text()
             }
@@ -1315,23 +833,11 @@ object SoraExtractor : SoraStream() {
 
         iframe.apmap { (iframeLink, title) ->
             val size = Regex("(?i)\\s(\\S+gb|mb)").find(title)?.groupValues?.getOrNull(1)
-            loadCustomTagExtractor(
-                "[$size]",
-                iframeLink,
-                "$gMoviesAPI/",
-                subtitleCallback,
-                callback,
-                getIndexQuality(title)
-            )
+            loadCustomTagExtractor("[$size]", iframeLink, "$gMoviesAPI/", subtitleCallback, callback, getIndexQuality(title))
         }
     }
 
-    suspend fun invokeFDMovies(
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeFDMovies(title: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$fdMoviesAPI/movies/$fixTitle"
@@ -1343,12 +849,7 @@ object SoraExtractor : SoraStream() {
         if (!request.isSuccessful) return
 
         val iframe = request.document.select("div#download tbody tr").map {
-            FDMovieIFrame(
-                it.select("a").attr("href"),
-                it.select("strong.quality").text(),
-                it.select("td:nth-child(4)").text(),
-                it.select("img").attr("src")
-            )
+            FDMovieIFrame(it.select("a").attr("href"), it.select("strong.quality").text(), it.select("td:nth-child(4)").text(), it.select("img").attr("src"))
         }.filter {
             it.quality.contains(Regex("(?i)(1080p|4k)")) && it.type.contains(Regex("(gdtot|oiya|rarbgx)"))
         }
@@ -1376,46 +877,26 @@ object SoraExtractor : SoraStream() {
                 }
             }
 
-            callback.invoke(
-                ExtractorLink(
-                    "FDMovies",
-                    "FDMovies [$size]",
-                    videoLink ?: return@apmap null,
-                    "",
-                    getQualityFromName(qualities)
-                )
-            )
+            callback.invoke(ExtractorLink("FDMovies", "FDMovies [$size]", videoLink
+                    ?: return@apmap null, "", getQualityFromName(qualities)))
         }
 
     }
 
-    suspend fun invokeM4uhd(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeM4uhd(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val slugTitle = title.createSlug()
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
         val req = app.get("$m4uhdAPI/search/$slugTitle.html")
         val referer = getBaseUrl(req.url)
         val scriptData = req.document.select("div.row div.item").map { ele ->
-            Triple(
-                ele.select("div.tiptitle p").text().substringBefore("(").trim().createSlug(),
-                ele.select("div.jtip-top div:last-child").text().filter { it.isDigit() },
-                ele.selectFirst("a")?.attr("href")
-            )
+            Triple(ele.select("div.tiptitle p").text().substringBefore("(").trim().createSlug(), ele.select("div.jtip-top div:last-child").text().filter { it.isDigit() }, ele.selectFirst("a")?.attr("href"))
         }
 
         val script = if (scriptData.size == 1) {
             scriptData.firstOrNull()
         } else {
             scriptData.find {
-                it.first.equals(slugTitle) && it.second == "$year" && if (season != null) it.third?.contains(
-                    "-tvshow-"
-                ) == true else it.third?.contains("-movie-") == true
+                it.first.equals(slugTitle) && it.second == "$year" && if (season != null) it.third?.contains("-tvshow-") == true else it.third?.contains("-movie-") == true
             }
         }
 
@@ -1429,28 +910,20 @@ object SoraExtractor : SoraStream() {
         val m4uData = if (season == null) {
             doc.select("div.le-server span").map { it.attr("data") }
         } else {
-            val idepisode =
-                doc.selectFirst("div.detail > p:matches((?i)S$seasonSlug-E$episodeSlug) button")
-                    ?.attr("idepisode")
+            val idepisode = doc.selectFirst("div.detail > p:matches((?i)S$seasonSlug-E$episodeSlug) button")?.attr("idepisode")
                     ?: return
-            val requestEmbed = app.post(
-                "$referer/ajaxtv", data = mapOf(
-                    "idepisode" to idepisode, "_token" to "$token"
-                ), referer = link, headers = headers, cookies = cookies
-            )
+            val requestEmbed = app.post("$referer/ajaxtv", data = mapOf("idepisode" to idepisode, "_token" to "$token"), referer = link, headers = headers, cookies = cookies)
             cookies = requestEmbed.cookies
             requestEmbed.document.select("div.le-server span").map { it.attr("data") }
         }
 
         m4uData.apmap { data ->
             val iframe = app.post(
-                "$referer/ajax",
-                data = mapOf(
-                    "m4u" to data, "_token" to "$token"
-                ),
-                referer = link,
-                headers = headers,
-                cookies = cookies,
+                    "$referer/ajax",
+                    data = mapOf("m4u" to data, "_token" to "$token"),
+                    referer = link,
+                    headers = headers,
+                    cookies = cookies,
             ).document.select("iframe").attr("src")
 
             loadExtractor(iframe, referer, subtitleCallback, callback)
@@ -1458,12 +931,7 @@ object SoraExtractor : SoraStream() {
 
     }
 
-    suspend fun invokeTvMovies(
-        title: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeTvMovies(title: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$tvMoviesAPI/show/$fixTitle"
@@ -1473,43 +941,25 @@ object SoraExtractor : SoraStream() {
 
         val server = getTvMoviesServer(url, season, episode) ?: return
         val videoData = extractCovyn(server.second ?: return)
-        val quality =
-            Regex("(\\d{3,4})p").find(server.first)?.groupValues?.getOrNull(1)?.toIntOrNull()
+        val quality = Regex("(\\d{3,4})p").find(server.first)?.groupValues?.getOrNull(1)?.toIntOrNull()
 
-        callback.invoke(
-            ExtractorLink(
-                "TVMovies",
-                "TVMovies [${videoData?.second}]",
-                videoData?.first ?: return,
-                "",
-                quality ?: Qualities.Unknown.value
-            )
-        )
+        callback.invoke(ExtractorLink("TVMovies", "TVMovies [${videoData?.second}]", videoData?.first
+                ?: return, "", quality ?: Qualities.Unknown.value))
 
 
     }
 
-    private suspend fun invokeCrunchyroll(
-        aniId: Int? = null,
-        malId: Int? = null,
-        epsTitle: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    private suspend fun invokeCrunchyroll(aniId: Int? = null, malId: Int? = null, epsTitle: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val id = getCrunchyrollId("${aniId ?: return}")
-            ?: getCrunchyrollIdFromMalSync("${malId ?: return}")
+                ?: getCrunchyrollIdFromMalSync("${malId ?: return}")
         val audioLocal = listOf(
-            "ja-JP",
-            "en-US",
-            "zh-CN",
+                "ja-JP",
+                "en-US",
+                "zh-CN",
         )
         val token = getCrunchyrollToken()
         val headers = mapOf("Authorization" to "${token.tokenType} ${token.accessToken}")
-        val seasonIdData = app.get(
-            "$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons", headers = headers
-        ).parsedSafe<CrunchyrollResponses>()?.data?.let { s ->
+        val seasonIdData = app.get("$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons", headers = headers).parsedSafe<CrunchyrollResponses>()?.data?.let { s ->
             if (s.size == 1) {
                 s.firstOrNull()
             } else {
@@ -1522,82 +972,41 @@ object SoraExtractor : SoraStream() {
                 } ?: s.find { it.season_number?.plus(1) == season }
             }
         }
-        val seasonId = seasonIdData?.versions?.filter { it.audio_locale in audioLocal }
-            ?.map { it.guid to it.audio_locale } ?: listOf(seasonIdData?.id to "ja-JP")
+        val seasonId = seasonIdData?.versions?.filter { it.audio_locale in audioLocal }?.map { it.guid to it.audio_locale }
+                ?: listOf(seasonIdData?.id to "ja-JP")
 
         seasonId.apmap { (sId, audioL) ->
-            val streamsLink = app.get(
-                "$crunchyrollAPI/content/v2/cms/seasons/${sId ?: return@apmap}/episodes",
-                headers = headers
-            ).parsedSafe<CrunchyrollResponses>()?.data?.find {
-                it.title.equals(epsTitle, true) || it.slug_title.equals(
-                    epsTitle.createSlug(), true
-                ) || it.episode_number == episode
+            val streamsLink = app.get("$crunchyrollAPI/content/v2/cms/seasons/${sId ?: return@apmap}/episodes", headers = headers).parsedSafe<CrunchyrollResponses>()?.data?.find {
+                it.title.equals(epsTitle, true) || it.slug_title.equals(epsTitle.createSlug(), true) || it.episode_number == episode
             }?.streams_link?.substringAfter("/videos/")?.substringBefore("/streams") ?: return@apmap
-            val sources = app.get(
-                    "$crunchyrollAPI/cms/v2${token.bucket}/videos/$streamsLink/streams?Policy=${token.policy}&Signature=${token.signature}&Key-Pair-Id=${token.key_pair_id}",
-            headers = headers
-            ).parsedSafe<CrunchyrollSourcesResponses>()
+            val sources = app.get("$crunchyrollAPI/cms/v2${token.bucket}/videos/$streamsLink/streams?Policy=${token.policy}&Signature=${token.signature}&Key-Pair-Id=${token.key_pair_id}", headers = headers).parsedSafe<CrunchyrollSourcesResponses>()
 
-            listOf(
-                "adaptive_hls", "vo_adaptive_hls"
-            ).map { hls ->
+            listOf("adaptive_hls", "vo_adaptive_hls").map { hls ->
                 val name = if (hls == "adaptive_hls") "Crunchyroll" else "Vrv"
                 val audio = if (audioL == "en-US") "English Dub" else "Raw"
                 val source = sources?.streams?.let {
                     if (hls == "adaptive_hls") it.adaptive_hls else it.vo_adaptive_hls
                 }
-                M3u8Helper.generateM3u8(
-                    "$name [$audio]",
-                    source?.get("")?.get("url") ?: return@map,
-                    "https://static.crunchyroll.com/"
-                ).forEach(callback)
+                M3u8Helper.generateM3u8("$name [$audio]", source?.get("")?.get("url")
+                        ?: return@map, "https://static.crunchyroll.com/").forEach(callback)
             }
 
             sources?.subtitles?.map { sub ->
-                subtitleCallback.invoke(
-                    SubtitleFile(
-                        "${fixCrunchyrollLang(sub.key) ?: sub.key} [ass]",
-                        sub.value["url"] ?: return@map null
-                    )
-                )
+                subtitleCallback.invoke(SubtitleFile("${fixCrunchyrollLang(sub.key) ?: sub.key} [ass]", sub.value["url"]
+                        ?: return@map null))
             }
         }
     }
 
-    suspend fun invokeMoviezAdd(
-        apiUrl: String? = null,
-        api: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeMoviezAdd(apiUrl: String? = null, api: String? = null, title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         invokeBloginguru(apiUrl, api, title, year, season, episode, callback)
     }
 
-    suspend fun invokeBollyMaza(
-        apiUrl: String? = null,
-        api: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeBollyMaza(apiUrl: String? = null, api: String? = null, title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         invokeBloginguru(apiUrl, api, title, year, season, episode, callback)
     }
 
-    private suspend fun invokeBloginguru(
-        apiUrl: String? = null,
-        api: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    private suspend fun invokeBloginguru(apiUrl: String? = null, api: String? = null, title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val fixTitle = title?.createSlug()?.replace("-", " ")
         val doc = app.get("$apiUrl/?s=$fixTitle").document
 
@@ -1611,97 +1020,55 @@ object SoraExtractor : SoraStream() {
             }
         }
 
-        val mediaLink =
-            app.get(matchMedia?.first ?: return).document.selectFirst("a#jake1")?.attr("href")
+        val mediaLink = app.get(matchMedia?.first
+                ?: return).document.selectFirst("a#jake1")?.attr("href")
         val detailDoc = app.get(mediaLink ?: return).document
-        val media = detailDoc.selectFirst("div.entry-content pre span")?.text()
-            ?.split("|")
-            ?.map { it.trim() }
+        val media = detailDoc.selectFirst("div.entry-content pre span")?.text()?.split("|")?.map { it.trim() }
 
         val iframe = (if (season == null) {
             media?.mapIndexed { index, name ->
-                detailDoc.select("div.entry-content > h2")[index].selectFirst("a")
-                    ?.attr("href") to name
+                detailDoc.select("div.entry-content > h2")[index].selectFirst("a")?.attr("href") to name
             }
         } else {
             media?.mapIndexed { index, name ->
-                val linkMedia =
-                    detailDoc.select("div.entry-content > h2")[index].selectFirst("a")
-                        ?.attr("href")
-                app.get(
-                    linkMedia ?: return@mapIndexed null
-                ).document.selectFirst("div.entry-content strong:matches((?i)S0?${season}E0?${episode}) a")
-                    ?.attr("href") to name
+                val linkMedia = detailDoc.select("div.entry-content > h2")[index].selectFirst("a")?.attr("href")
+                app.get(linkMedia
+                        ?: return@mapIndexed null).document.selectFirst("div.entry-content strong:matches((?i)S0?${season}E0?${episode}) a")?.attr("href") to name
             }
         })?.filter { it?.first?.startsWith("http") == true }
 
         iframe?.apmap {
             val iframeDoc = app.get(it?.first ?: return@apmap).document
             val formUrl = iframeDoc.select("form").attr("action")
-            val formData =
-                iframeDoc.select("form button").associate { v -> v.attr("name") to v.attr("value") }
+            val formData = iframeDoc.select("form button").associate { v -> v.attr("name") to v.attr("value") }
 
-            val videoUrl = app.post(
-                formUrl,
-                data = formData,
-                referer = it.first
-            ).document.selectFirst("div.d-flex.justify-content-center.flex-wrap a")?.attr("href")
-            val quality =
-                Regex("(\\d{3,4})p").find(it.second)?.groupValues?.getOrNull(1)?.toIntOrNull()
+            val videoUrl = app.post(formUrl, data = formData, referer = it.first).document.selectFirst("div.d-flex.justify-content-center.flex-wrap a")?.attr("href")
+            val quality = Regex("(\\d{3,4})p").find(it.second)?.groupValues?.getOrNull(1)?.toIntOrNull()
             val qualityName = it.second.replace("${quality}p", "").trim()
 
-            callback.invoke(
-                ExtractorLink(
-                    "$api",
-                    "$api $qualityName",
-                    videoUrl ?: return@apmap,
-                    "",
-                    quality ?: Qualities.Unknown.value
-                )
-            )
+            callback.invoke(ExtractorLink("$api", "$api $qualityName", videoUrl
+                    ?: return@apmap, "", quality ?: Qualities.Unknown.value))
         }
 
     }
 
-    suspend fun invokeRStream(
-        id: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeRStream(id: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
         val url = if (season == null) {
             "$rStreamAPI/e/?tmdb=$id"
         } else {
             "$rStreamAPI/e/?tmdb=$id&s=$season&e=$episode"
         }
 
-        val res = app.get(
-            "$url&apikey=whXgvN4kVyoubGwqXpw26Oy3PVryl8dm",
-            referer = "https://watcha.movie/"
-        ).text
+        val res = app.get("$url&apikey=whXgvN4kVyoubGwqXpw26Oy3PVryl8dm", referer = "https://watcha.movie/").text
         val link = Regex("\"file\":\"(http.*?)\"").find(res)?.groupValues?.getOrNull(1) ?: return
 
-        callback.invoke(
-            ExtractorLink(
-                "RStream", "RStream", link, "$rStreamAPI/", Qualities.P1080.value, INFER_TYPE
-            )
-        )
+        callback.invoke(ExtractorLink("RStream", "RStream", link, "$rStreamAPI/", Qualities.P1080.value, INFER_TYPE))
     }
 
-    suspend fun invokeFlixon(
-        tmdbId: Int? = null,
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-        onionUrl: String = "https://onionplay.se/"
-    ) {
+    suspend fun invokeFlixon(tmdbId: Int? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit, onionUrl: String = "https://onionplay.se/") {
         val request = if (season == null) {
             val res = app.get("$flixonAPI/$imdbId", referer = onionUrl)
-            if (res.text.contains("BEGIN PGP SIGNED MESSAGE")) app.get(
-                "$flixonAPI/$imdbId-1",
-                referer = onionUrl
-            ) else res
+            if (res.text.contains("BEGIN PGP SIGNED MESSAGE")) app.get("$flixonAPI/$imdbId-1", referer = onionUrl) else res
         } else {
             app.get("$flixonAPI/$tmdbId-$season-$episode", referer = onionUrl)
         }
@@ -1709,44 +1076,30 @@ object SoraExtractor : SoraStream() {
         val script = request.document.selectFirst("script:containsData(= \"\";)")?.data()
         val collection = script?.substringAfter("= [")?.substringBefore("];")
         val num = script?.substringAfterLast("(value) -")?.substringBefore(");")?.trim()?.toInt()
-            ?: return
+                ?: return
 
         val iframe = collection?.split(",")?.map { it.trim().toInt() }?.map { nums ->
             nums.minus(num).toChar()
-        }?.joinToString("")?.let { Jsoup.parse(it) }?.selectFirst("button.redirect")
-            ?.attr("onclick")?.substringAfter("('")?.substringBefore("')")
+        }?.joinToString("")?.let { Jsoup.parse(it) }?.selectFirst("button.redirect")?.attr("onclick")?.substringAfter("('")?.substringBefore("')")
 
         delay(1000)
-        val unPacker = app.get(
-            iframe ?: return, referer = "$flixonAPI/"
-        ).document.selectFirst("script:containsData(JuicyCodes.Run)")?.data()
-            ?.substringAfter("JuicyCodes.Run(")?.substringBefore(");")?.split("+")
-            ?.joinToString("") { it.replace("\"", "").trim() }
-            ?.let { getAndUnpack(base64Decode(it)) }
+        val unPacker = app.get(iframe
+                ?: return, referer = "$flixonAPI/").document.selectFirst("script:containsData(JuicyCodes.Run)")?.data()?.substringAfter("JuicyCodes.Run(")?.substringBefore(");")?.split("+")?.joinToString("") { it.replace("\"", "").trim() }?.let { getAndUnpack(base64Decode(it)) }
 
-        val link = Regex("[\"']file[\"']:[\"'](.+?)[\"'],").find(
-            unPacker ?: return
-        )?.groupValues?.getOrNull(1)
+        val link = Regex("[\"']file[\"']:[\"'](.+?)[\"'],").find(unPacker
+                ?: return)?.groupValues?.getOrNull(1)
 
-        callback.invoke(
-            ExtractorLink(
-                "Flixon",
-                "Flixon",
-                link ?: return,
-                "https://onionplay.stream/",
-                Qualities.P720.value,
-                link.contains(".m3u8")
-            )
-        )
+        callback.invoke(ExtractorLink("Flixon", "Flixon", link
+                ?: return, "https://onionplay.stream/", Qualities.P720.value, link.contains(".m3u8")))
 
     }
 
     suspend fun invokeSmashyStream(
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+            imdbId: String? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
             "$smashyStreamAPI/playere.php?imdb=$imdbId"
@@ -1754,9 +1107,7 @@ object SoraExtractor : SoraStream() {
             "$smashyStreamAPI/playere.php?imdb=$imdbId&season=$season&episode=$episode"
         }
 
-        app.get(
-            url, referer = "https://smashystream.com/"
-        ).document.select("div#_default-servers a.server").map {
+        app.get(url, referer = "https://smashystream.com/").document.select("div#_default-servers a.server").map {
             it.attr("data-url") to it.text()
         }.apmap {
             when (it.second) {
@@ -1776,21 +1127,13 @@ object SoraExtractor : SoraStream() {
 
     //TODO only subs
     suspend fun invokeWatchsomuch(
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
+            imdbId: String? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
     ) {
         val id = imdbId?.removePrefix("tt")
-        val epsId = app.post(
-            "$watchSomuchAPI/Watch/ajMovieTorrents.aspx", data = mapOf(
-                "index" to "0",
-                "mid" to "$id",
-                "wsk" to "f6ea6cde-e42b-4c26-98d3-b4fe48cdd4fb",
-                "lid" to "",
-                "liu" to ""
-            ), headers = mapOf("X-Requested-With" to "XMLHttpRequest")
-        ).parsedSafe<WatchsomuchResponses>()?.movie?.torrents?.let { eps ->
+        val epsId = app.post("$watchSomuchAPI/Watch/ajMovieTorrents.aspx", data = mapOf("index" to "0", "mid" to "$id", "wsk" to "f6ea6cde-e42b-4c26-98d3-b4fe48cdd4fb", "lid" to "", "liu" to ""), headers = mapOf("X-Requested-With" to "XMLHttpRequest")).parsedSafe<WatchsomuchResponses>()?.movie?.torrents?.let { eps ->
             if (season == null) {
                 eps.firstOrNull()?.id
             } else {
@@ -1807,191 +1150,145 @@ object SoraExtractor : SoraStream() {
         }
 
         app.get(subUrl).parsedSafe<WatchsomuchSubResponses>()?.subtitles?.map { sub ->
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    sub.label ?: "", fixUrl(sub.url ?: return@map null, watchSomuchAPI)
-                )
-            )
+            subtitleCallback.invoke(SubtitleFile(sub.label ?: "", fixUrl(sub.url
+                    ?: return@map null, watchSomuchAPI)))
         }
 
 
     }
 
     suspend fun invokeShinobiMovies(
-        apiUrl: String,
-        api: String,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
+            apiUrl: String,
+            api: String,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
     ) {
         invokeIndex(
-            apiUrl,
-            api,
-            title,
-            year,
-            season,
-            episode,
-            callback,
+                apiUrl,
+                api,
+                title,
+                year,
+                season,
+                episode,
+                callback,
         )
     }
 
     private suspend fun invokeIndex(
-        apiUrl: String,
-        api: String,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-        password: String = "",
+            apiUrl: String,
+            api: String,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
+            password: String = "",
     ) {
-        val passHeaders = mapOf(
-            "Authorization" to password
-        )
+        val passHeaders = mapOf("Authorization" to password)
         val query = getIndexQuery(title, year, season, episode).let {
             if (api in mkvIndex) "$it mkv" else it
         }
-        val body =
-            """{"q":"$query","password":null,"page_token":null,"page_index":0}""".toRequestBody(
-                RequestBodyTypes.JSON.toMediaTypeOrNull()
-            )
-        val data = mapOf(
-            "q" to query, "page_token" to "", "page_index" to "0"
-        )
+        val body = """{"q":"$query","password":null,"page_token":null,"page_index":0}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
+        val data = mapOf("q" to query, "page_token" to "", "page_index" to "0")
         val search = if (api in encodedIndex) {
-            decodeIndexJson(
-                if (api in lockedIndex) app.post(
-                    "${apiUrl}search",
-                    data = data,
-                    headers = passHeaders,
-                    referer = apiUrl,
-                    timeout = 120L
-                ).text else app.post(
-                    "${apiUrl}search", data = data, referer = apiUrl
-                ).text
-            )
+            decodeIndexJson(if (api in lockedIndex) app.post("${apiUrl}search", data = data, headers = passHeaders, referer = apiUrl, timeout = 120L).text else app.post("${apiUrl}search", data = data, referer = apiUrl).text)
         } else {
             app.post("${apiUrl}search", requestBody = body, referer = apiUrl, timeout = 120L).text
         }
-        val media = if (api in untrimmedIndex) searchIndex(
-            title, season, episode, year, search, false
-        ) else searchIndex(title, season, episode, year, search)
+        val media = if (api in untrimmedIndex) searchIndex(title, season, episode, year, search, false) else searchIndex(title, season, episode, year, search)
         media?.apmap { file ->
-            val pathBody = """{"id":"${file.id ?: return@apmap null}"}""".toRequestBody(
-                RequestBodyTypes.JSON.toMediaTypeOrNull()
-            )
+            val pathBody = """{"id":"${file.id ?: return@apmap null}"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
             val pathData = mapOf(
-                "id" to file.id,
+                    "id" to file.id,
             )
             val path = (if (api in encodedIndex) {
                 if (api in lockedIndex) {
-                    app.post(
-                        "${apiUrl}id2path",
-                        data = pathData,
-                        headers = passHeaders,
-                        referer = apiUrl,
-                        timeout = 120L
-                    )
+                    app.post("${apiUrl}id2path", data = pathData, headers = passHeaders, referer = apiUrl, timeout = 120L)
                 } else {
-                    app.post(
-                        "${apiUrl}id2path", data = pathData, referer = apiUrl, timeout = 120L
-                    )
+                    app.post("${apiUrl}id2path", data = pathData, referer = apiUrl, timeout = 120L)
                 }
             } else {
-                app.post(
-                    "${apiUrl}id2path", requestBody = pathBody, referer = apiUrl, timeout = 120L
-                )
+                app.post("${apiUrl}id2path", requestBody = pathBody, referer = apiUrl, timeout = 120L)
             }).text.let { path ->
                 if (api in ddomainIndex) {
-                    val worker = app.get(
-                        "${fixUrl(path, apiUrl).encodeUrl()}?a=view",
-                        referer = if (api in needRefererIndex) apiUrl else "",
-                        timeout = 120L
-                    ).document.selectFirst("script:containsData(downloaddomain)")?.data()
-                        ?.substringAfter("\"downloaddomain\":\"")?.substringBefore("\",")?.let {
-                            "$it/0:"
-                        }
+                    val worker = app.get("${fixUrl(path, apiUrl).encodeUrl()}?a=view", referer = if (api in needRefererIndex) apiUrl else "", timeout = 120L).document.selectFirst("script:containsData(downloaddomain)")?.data()?.substringAfter("\"downloaddomain\":\"")?.substringBefore("\",")?.let {
+                        "$it/0:"
+                    }
                     fixUrl(path, worker ?: return@apmap null)
                 } else {
                     fixUrl(path, apiUrl)
                 }
             }.encodeUrl()
 
-            val size =
-                "%.2f GB".format(bytesToGigaBytes(file.size?.toDouble() ?: return@apmap null))
+            val size = "%.2f GB".format(bytesToGigaBytes(file.size?.toDouble()
+                    ?: return@apmap null))
             val quality = getIndexQuality(file.name)
             val tags = getIndexQualityTags(file.name)
 
-            callback.invoke(
-                ExtractorLink(
+            callback.invoke(ExtractorLink(
                     api,
                     "$api $tags [$size]",
                     path,
                     if (api in needRefererIndex) apiUrl else "",
                     quality,
-                )
-            )
+            ))
 
         }
 
     }
 
     suspend fun invokeGdbotMovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val query = getIndexQuery(title, null, season, episode)
         val files = app.get("$gdbot/search?q=$query").document.select("ul.divide-y li").map {
-            Triple(
-                it.select("a").attr("href"), it.select("a").text(), it.select("span").text()
-            )
+            Triple(it.select("a").attr("href"), it.select("a").text(), it.select("span").text())
         }.filter {
             matchingIndex(
-                it.second,
-                null,
-                title,
-                year,
-                season,
-                episode,
+                    it.second,
+                    null,
+                    title,
+                    year,
+                    season,
+                    episode,
             )
         }.sortedByDescending {
             it.third.getFileSize()
         }
 
         files.let { file ->
-            listOfNotNull(file.find { it.second.contains("2160p", true) },
-                file.find { it.second.contains("1080p", true) })
+            listOfNotNull(file.find { it.second.contains("2160p", true) }, file.find { it.second.contains("1080p", true) })
         }.apmap { file ->
             val videoUrl = extractGdflix(file.first)
             val quality = getIndexQuality(file.second)
             val tags = getIndexQualityTags(file.second)
             val size = Regex("(\\d+\\.?\\d+\\sGB|MB)").find(file.third)?.groupValues?.get(0)?.trim()
 
-            callback.invoke(
-                ExtractorLink(
+            callback.invoke(ExtractorLink(
                     "GdbotMovies",
                     "GdbotMovies $tags [$size]",
                     videoUrl ?: return@apmap null,
                     "",
                     quality,
-                )
-            )
+            ))
 
         }
 
     }
 
     suspend fun invokeDahmerMovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
             "$dahmerMoviesAPI/movies/${title?.replace(":", "")} ($year)/"
@@ -2015,35 +1312,27 @@ object SoraExtractor : SoraStream() {
         paths.map {
             val quality = getIndexQuality(it.first)
             val tags = getIndexQualityTags(it.first)
-            callback.invoke(
-                ExtractorLink(
+            callback.invoke(ExtractorLink(
                     "DahmerMovies",
                     "DahmerMovies $tags",
                     (url + it.second).encodeUrl(),
                     "",
                     quality,
-                )
-            )
+            ))
 
         }
 
     }
 
-    suspend fun invoke2embed(
-        imdbId: String?,
-        season: Int?,
-        episode: Int?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invoke2embed(imdbId: String?, season: Int?, episode: Int?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val url = if (season == null) {
             "$twoEmbedAPI/embed/$imdbId"
         } else {
             "$twoEmbedAPI/embedtv/$imdbId&s=$season&e=$episode"
         }
 
-        val framesrc =
-            app.get(url).document.selectFirst("iframe#iframesrc")?.attr("data-src") ?: return
+        val framesrc = app.get(url).document.selectFirst("iframe#iframesrc")?.attr("data-src")
+                ?: return
         val ref = getBaseUrl(framesrc)
         val id = framesrc.substringAfter("id=").substringBefore("&")
         loadExtractor("https://wishfast.top/e/$id", "$ref/", subtitleCallback, callback)
@@ -2051,35 +1340,25 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeOmovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
     ) {
-        invokeGpress(
-            title,
-            year,
-            season,
-            episode,
-            callback,
-            BuildConfig.OMOVIES_API,
-            "Omovies",
-            base64Decode("X3NtUWFtQlFzRVRi"),
-            base64Decode("X3NCV2NxYlRCTWFU")
-        )
+        invokeGpress(title, year, season, episode, callback, BuildConfig.OMOVIES_API, "Omovies", base64Decode("X3NtUWFtQlFzRVRi"), base64Decode("X3NCV2NxYlRCTWFU"))
     }
 
     private suspend fun invokeGpress(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-        api: String,
-        name: String,
-        mediaSelector: String,
-        episodeSelector: String,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
+            api: String,
+            name: String,
+            mediaSelector: String,
+            episodeSelector: String,
     ) {
         fun String.decrypt(key: String): List<GpressSources>? {
             return tryParseJson<List<GpressSources>>(base64Decode(this).decodePrimewireXor(key))
@@ -2092,23 +1371,19 @@ object SoraExtractor : SoraStream() {
             "$title Season $season"
         }
         val savedCookies = mapOf(
-            base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
+                base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
         )
         val req = app.get("$api/search/$query")
         val doc = req.document
         val media = doc.select("div.$mediaSelector").map {
-            Triple(
-                it.attr("data-filmName"), it.attr("data-year"), it.select("a").attr("href")
-            )
+            Triple(it.attr("data-filmName"), it.attr("data-year"), it.select("a").attr("href"))
         }.let { el ->
             if (el.size == 1) {
                 el.firstOrNull()
             } else {
                 el.find {
                     if (season == null) {
-                        (it.first.equals(title, true) || it.first.equals(
-                            "$title ($year)", true
-                        )) && it.second.equals("$year")
+                        (it.first.equals(title, true) || it.first.equals("$title ($year)", true)) && it.second.equals("$year")
                     } else {
                         it.first.equals("$title - Season $season", true)
                     }
@@ -2119,21 +1394,14 @@ object SoraExtractor : SoraStream() {
         val iframe = if (season == null) {
             media.third
         } else {
-            val res = app.get(
-                fixUrl(
-                    media.third,
-                    api
-                )
-            )
-            res.document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")
-                ?.attr("href")
+            val res = app.get(fixUrl(media.third, api))
+            res.document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")?.attr("href")
         } ?: return
 
         val users = if (season == null) {
             media.third.substringAfterLast("/") to "0"
         } else {
-            media.third.substringAfterLast("/") to iframe.substringAfterLast("/")
-                .substringBefore("-")
+            media.third.substringAfterLast("/") to iframe.substringAfterLast("/").substringBefore("-")
         }
         val res = app.get(fixUrl(iframe, api), verify = false)
         delay(2000)
@@ -2144,33 +1412,23 @@ object SoraExtractor : SoraStream() {
         val url = res.document.select("meta[property=og:url]").attr("content")
         val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         val qualities = intArrayOf(2160, 1440, 1080, 720, 480, 360)
-        val serverRes = app.get(
-            "$api/user/servers/${users.first}?ep=${users.second}",
-            cookies = cookies, referer = url, headers = headers
-        )
+        val serverRes = app.get("$api/user/servers/${users.first}?ep=${users.second}", cookies = cookies, referer = url, headers = headers)
         val unpack = getAndUnpack(serverRes.text)
         val key = unpack.substringAfter("(key=").substringBefore(")")
         val key2 = unpack.substringAfter("<\"").substringBefore("\".")
         serverRes.document.select("ul li").amap { el ->
             val server = el.attr("data-value")
-            val encryptedData = app.get(
-                "${fixUrl(serverUrl, api)}?server=$server&_=$unixTimeMS",
-                cookies = cookies,
-                referer = url,
-                headers = headers
-            ).text
+            val encryptedData = app.get("${fixUrl(serverUrl, api)}?server=$server&_=$unixTimeMS", cookies = cookies, referer = url, headers = headers).text
             val links = encryptedData.decrypt(key) ?: encryptedData.decrypt(key2) ?: return@amap
             links.forEach { video ->
                 qualities.filter { it <= video.max.toInt() }.forEach {
-                    callback(
-                        ExtractorLink(
+                    callback(ExtractorLink(
                             name,
                             name,
                             video.src.split("360", limit = 3).joinToString(it.toString()),
                             "$api/",
                             it,
-                        )
-                    )
+                    ))
                 }
             }
         }
@@ -2178,12 +1436,12 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeShowflix(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val where = if (season == null) "movieName" else "seriesName"
         val classes = if (season == null) "movies" else "series"
@@ -2204,31 +1462,24 @@ object SoraExtractor : SoraStream() {
         }
     """.trimIndent().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
 
-        val data =
-            app.post("https://parse.showflix.tk/parse/classes/$classes", requestBody = body).text
+        val data = app.post("https://parse.showflix.tk/parse/classes/$classes", requestBody = body).text
         val iframes = if (season == null) {
             val result = tryParseJson<ShowflixSearchMovies>(data)?.resultsMovies?.find {
-                it.movieName.equals(
-                    "$title ($year)",
-                    true
-                )
+                it.movieName.equals("$title ($year)", true)
             }
             listOf(
-                "https://streamwish.to/e/${result?.streamwish}",
-                "https://filelions.to/v/${result?.filelions}.html",
-                "https://streamruby.com/e/${result?.streamruby}.html",
+                    "https://streamwish.to/e/${result?.streamwish}",
+                    "https://filelions.to/v/${result?.filelions}.html",
+                    "https://streamruby.com/e/${result?.streamruby}.html",
             )
         } else {
             val result = tryParseJson<ShowflixSearchSeries>(data)?.resultsSeries?.find {
-                it.seriesName.equals(
-                    title,
-                    true
-                )
+                it.seriesName.equals(title, true)
             }
             listOf(
-                result?.streamwish?.get("Season $season")?.get(episode!!),
-                result?.filelions?.get("Season $season")?.get(episode!!),
-                result?.streamruby?.get("Season $season")?.get(episode!!),
+                    result?.streamwish?.get("Season $season")?.get(episode!!),
+                    result?.filelions?.get("Season $season")?.get(episode!!),
+                    result?.streamruby?.get("Season $season")?.get(episode!!),
             )
         }
 
@@ -2239,13 +1490,13 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeCinemaTv(
-        imdbId: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+            imdbId: String? = null,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val id = imdbId?.removePrefix("tt")
         val slug = title.createSlug()
@@ -2255,12 +1506,11 @@ object SoraExtractor : SoraStream() {
             "$cinemaTvAPI/shows/play/$id-$slug-$year"
         }
 
-        val session =
-            "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
+        val session = "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
 
         val headers = mapOf(
-            "Cookie" to session,
-            "x-requested-with" to "com.wwcinematv",
+                "Cookie" to session,
+                "x-requested-with" to "com.wwcinematv",
         )
 
         val doc = app.get(url, headers = headers).document
@@ -2279,213 +1529,81 @@ object SoraExtractor : SoraStream() {
             "$cinemaTvAPI/api/v1/security/episode-access?id_episode=$episodeId&hash=$hash&expires=$expires"
         }
 
-        val sources = app.get(
-            videoUrl,
-            referer = url,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
-        ).parsedSafe<CinemaTvResponse>()
+        val sources = app.get(videoUrl, referer = url, headers = mapOf("X-Requested-With" to "XMLHttpRequest")).parsedSafe<CinemaTvResponse>()
 
         sources?.streams?.mapKeys { source ->
-            callback.invoke(
-                ExtractorLink(
-                    "CinemaTv",
-                    "CinemaTv",
-                    source.value,
-                    "$cinemaTvAPI/",
-                    getQualityFromName(source.key),
-                    true
-                )
-            )
+            callback.invoke(ExtractorLink("CinemaTv", "CinemaTv", source.value, "$cinemaTvAPI/", getQualityFromName(source.key), true))
         }
 
         sources?.subtitles?.map { sub ->
             val file = sub.file.toString()
-            subtitleCallback.invoke(
-                SubtitleFile(
+            subtitleCallback.invoke(SubtitleFile(
                     sub.language ?: return@map,
                     if (file.startsWith("[")) return@map else fixUrl(file, cinemaTvAPI),
-                )
-            )
+            ))
         }
 
     }
 
-    suspend fun invokeFebbox(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        lastSeason: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-        showboxApi: String = "https://www.showbox.media"
-    ) {
-        val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-        val res = app.get("$showboxApi/search?keyword=$title", interceptor = showboxInterceptor).document
-        val mediaRes = res.select("div.film_list-wrap div.flw-item").map {
-            ShowboxMedia(
-                it.select("h2.film-name a").attr("href"),
-                it.select("h2.film-name a").text(),
-                it.select("div.fd-infor > span:first-child").text(),
-                it.select("div.fd-infor > span:last-child").text(),
-            )
-        }
-
-        val filter = mediaRes.filter {
-            it.title.equals(title, true) && it.type == if (season == null) "Movie" else "TV"
-        }
-
-        val media = if (season == null) {
-            filter.find { it.infor == "$year" }
-        } else {
-            filter.find { it.infor == "SS $lastSeason" }
-                ?: filter.find { it.infor == "SS ${lastSeason?.minus(1)}" }
-                ?: filter.find { it.infor == "SS 1" }
-        }
-
-        val shareId = media?.url?.substringAfterLast("/") ?: return
-
-        val shareKey =
-            app.get("$showboxApi/index/share_link?id=${shareId}&type=${if (season == null) "1" else "2"}", interceptor = showboxInterceptor)
-                .parsedSafe<FebboxResponse>()?.data?.link?.substringAfterLast("/")
-
-        val headers = mapOf("Accept-Language" to "en")
-        val shareRes = app.get(
-            "$febboxAPI/file/file_share_list?share_key=${shareKey ?: return}",
-            headers = headers
-        )
-            .parsedSafe<FebboxResponse>()?.data
-
-        val fids = if (season == null) {
-            shareRes?.file_list
-        } else {
-            val parentId =
-                shareRes?.file_list?.find { it.file_name.equals("season $season", true) }?.fid
-            app.get(
-                "$febboxAPI/file/file_share_list?share_key=${shareKey}&parent_id=$parentId&page=1",
-                headers = headers
-            )
-                .parsedSafe<FebboxResponse>()?.data?.file_list?.filter {
-                    it.file_name?.contains(
-                        "s${seasonSlug}e${episodeSlug}",
-                        true
-                    ) == true
-                }
-        }
-
-        fids?.mapIndexed { index, fileList ->
-            callback.invoke(
-                ExtractorLink(
-                    "Febbox",
-                    "Febbox [Server ${index + 1}]",
-                    "$febboxAPI/hls/main/${fileList.oss_fid}.m3u8",
-                    "",
-                    getIndexQuality(fileList.file_name),
-                    isM3u8 = true
-                )
-            )
-        }
-
-    }
-
-    suspend fun invokeNinetv(
-        tmdbId: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
+    suspend fun invokeNinetv(tmdbId: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
         val url = if (season == null) {
             "$nineTvAPI/movie/$tmdbId"
         } else {
             "$nineTvAPI/tv/$tmdbId-$season-$episode"
         }
 
-        val iframe = app.get(url, referer = "https://pressplay.top/").document.selectFirst("iframe")
-            ?.attr("src")
+        val iframe = app.get(url, referer = "https://pressplay.top/").document.selectFirst("iframe")?.attr("src")
 
         loadExtractor(iframe ?: return, "$nineTvAPI/", subtitleCallback, callback)
 
     }
 
-    suspend fun invokeNowTv(
-        tmdbId: Int? = null,
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-        referer: String = "https://bflix.gs/"
-    ) {
+    suspend fun invokeNowTv(tmdbId: Int? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit, referer: String = "https://bflix.gs/") {
         val slug = getEpisodeSlug(season, episode)
-        var url =
-            if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
+        var url = if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
         if (!app.get(url, referer = referer).isSuccessful) {
-            url =
-                if (season == null) "$nowTvAPI/$imdbId.mp4" else "$nowTvAPI/tv/$imdbId/s${season}e${slug.second}.mp4"
+            url = if (season == null) "$nowTvAPI/$imdbId.mp4" else "$nowTvAPI/tv/$imdbId/s${season}e${slug.second}.mp4"
             if (!app.get(url, referer = referer).isSuccessful) return
         }
-        callback.invoke(
-            ExtractorLink(
+        callback.invoke(ExtractorLink(
                 "NowTv",
                 "NowTv",
                 url,
                 referer,
                 Qualities.P1080.value,
-            )
-        )
+        ))
     }
 
     suspend fun invokeRidomovies(
-        tmdbId: Int? = null,
-        imdbId: String? = null,
-        callback: (ExtractorLink) -> Unit,
+            tmdbId: Int? = null,
+            imdbId: String? = null,
+            callback: (ExtractorLink) -> Unit,
     ) {
-        val slug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
-            .parsedSafe<RidoSearch>()?.data?.items?.find {
-                it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
-            }?.slug ?: return
-        app.get("$ridomoviesAPI/core/api/movies/$slug/videos")
-            .parsedSafe<RidoResponses>()?.data?.apmap { link ->
-                val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
-                val unpacked =
-                    getAndUnpack(
-                        app.get(
-                            iframe,
-                            referer = "$ridomoviesAPI/"
-                        ).text
-                    )
-                val video = Regex("=\"(aHR.*?)\";").find(unpacked)?.groupValues?.get(1)
-                callback.invoke(
-                    ExtractorLink(
-                        "Ridomovies",
-                        "Ridomovies",
-                        base64Decode(video ?: return@apmap),
-                        "${getBaseUrl(iframe)}/",
-                        Qualities.P1080.value,
-                        isM3u8 = true
-                    )
-                )
-            }
+        val slug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId").parsedSafe<RidoSearch>()?.data?.items?.find {
+            it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
+        }?.slug ?: return
+        app.get("$ridomoviesAPI/core/api/movies/$slug/videos").parsedSafe<RidoResponses>()?.data?.apmap { link ->
+            val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
+            val unpacked = getAndUnpack(app.get(iframe, referer = "$ridomoviesAPI/").text)
+            val video = Regex("=\"(aHR.*?)\";").find(unpacked)?.groupValues?.get(1)
+            callback.invoke(ExtractorLink("Ridomovies", "Ridomovies", base64Decode(video
+                    ?: return@apmap), "${getBaseUrl(iframe)}/", Qualities.P1080.value, isM3u8 = true))
+        }
     }
 
     suspend fun invokeAllMovieland(
-        imdbId: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
-        host: String = "https://esh-bostewsom-i-273.site",
+            imdbId: String? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
+            host: String = "https://esh-bostewsom-i-273.site",
     ) {
-        val res = app.get(
-            "$host/play/$imdbId", referer = "$allmovielandAPI/"
-        ).document.selectFirst("script:containsData(player =)")?.data()?.substringAfter("{")
-            ?.substringBefore(";")?.substringBefore(")")
+        val res = app.get("$host/play/$imdbId", referer = "$allmovielandAPI/").document.selectFirst("script:containsData(player =)")?.data()?.substringAfter("{")?.substringBefore(";")?.substringBefore(")")
         val json = tryParseJson<AllMovielandPlaylist>("{${res ?: return}")
-        val headers = mapOf(
-            "X-CSRF-TOKEN" to "${json?.key}"
-        )
+        val headers = mapOf("X-CSRF-TOKEN" to "${json?.key}")
 
-        val serverRes = app.get(
-            fixUrl(json?.file ?: return, host), headers = headers, referer = "$allmovielandAPI/"
-        ).text.replace(Regex(""",\s*\[]"""), "")
+        val serverRes = app.get(fixUrl(json?.file
+                ?: return, host), headers = headers, referer = "$allmovielandAPI/").text.replace(Regex(""",\s*\[]"""), "")
         val servers = tryParseJson<ArrayList<AllMovielandServer>>(serverRes).let { server ->
             if (season == null) {
                 server?.map { it.file to it.title }
@@ -2497,25 +1615,19 @@ object SoraExtractor : SoraStream() {
         }
 
         servers?.apmap { (server, lang) ->
-            val path = app.post(
-                    "${host}/playlist/${server ?: return@apmap}.txt", headers = headers, referer = "$allmovielandAPI/"
-            ).text
-            M3u8Helper.generateM3u8(
-                    "Allmovieland [$lang]",
-                    path,
-                    "$allmovielandAPI/"
-            ).forEach(callback)
+            val path = app.post("${host}/playlist/${server ?: return@apmap}.txt", headers = headers, referer = "$allmovielandAPI/").text
+            M3u8Helper.generateM3u8("Allmovieland [$lang]", path, "$allmovielandAPI/").forEach(callback)
         }
 
     }
 
     suspend fun invokeEmovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
     ) {
         val slug = title.createSlug()
         val url = if (season == null) {
@@ -2531,22 +1643,16 @@ object SoraExtractor : SoraStream() {
             res.selectFirst("select#selectServer option[sv=oserver]")?.attr("value")
         } else {
             res.select("div.le-server a").find {
-                val num =
-                    Regex("Episode (\\d+)").find(it.text())?.groupValues?.get(1)?.toIntOrNull()
+                val num = Regex("Episode (\\d+)").find(it.text())?.groupValues?.get(1)?.toIntOrNull()
                 num == episode
             }?.attr("href")
         })?.substringAfter("id=")?.substringBefore("&")
 
-        val server = app.get(
-            "$emoviesAPI/ajax/v4_get_sources?s=oserver&id=${id ?: return}&_=${unixTimeMS}",
-            headers = mapOf(
-                "X-Requested-With" to "XMLHttpRequest"
-            )
-        ).parsedSafe<EMovieServer>()?.value
+        val server = app.get("$emoviesAPI/ajax/v4_get_sources?s=oserver&id=${id ?: return}&_=${unixTimeMS}", headers = mapOf("X-Requested-With" to "XMLHttpRequest")).parsedSafe<EMovieServer>()?.value
 
-        val script = app.get(
-            server ?: return, referer = "$emoviesAPI/"
-        ).document.selectFirst("script:containsData(sources:)")?.data() ?: return
+        val script = app.get(server
+                ?: return, referer = "$emoviesAPI/").document.selectFirst("script:containsData(sources:)")?.data()
+                ?: return
         val sources = Regex("sources:\\s*\\[(.*)],").find(script)?.groupValues?.get(1)?.let {
             tryParseJson<List<EMovieSources>>("[$it]")
         }
@@ -2555,59 +1661,39 @@ object SoraExtractor : SoraStream() {
         }
 
         sources?.map { source ->
-            M3u8Helper.generateM3u8(
-                "Emovies", source.file ?: return@map, "https://embed.vodstream.xyz/"
-            ).forEach(callback)
+            M3u8Helper.generateM3u8("Emovies", source.file
+                    ?: return@map, "https://embed.vodstream.xyz/").forEach(callback)
         }
 
         tracks?.map { track ->
-            subtitleCallback.invoke(
-                SubtitleFile(
+            subtitleCallback.invoke(SubtitleFile(
                     track.label ?: "",
                     track.file ?: return@map,
-                )
-            )
+            ))
         }
 
 
     }
 
     suspend fun invokeSFMovies(
-        tmdbId: Int? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit,
+            tmdbId: Int? = null,
+            title: String? = null,
+            year: Int? = null,
+            season: Int? = null,
+            episode: Int? = null,
+            callback: (ExtractorLink) -> Unit,
     ) {
-        val headers =
-            mapOf("Authorization" to "Bearer 44d784c55e9a1e3dbb586f24b18b1cbcd1521673bd6178ef385890d2f989681fe22d05e291e2e0f03fce99cbc50cd520219e52cc6e30c944a559daf53a129af18349ec98f6a0e4e66b8d370a354f4f7fbd49df0ab806d533a3db71eecc7f75131a59ce8cffc5e0cc38e8af5919c23c0d904fbe31995308f065f0ff9cd1eda488")
-        val data = app.get(
-            "${BuildConfig.SFMOVIES_API}/api/mains?filters[title][\$contains]=$title",
-            headers = headers
-        )
-            .parsedSafe<SFMoviesSearch>()?.data
+        val headers = mapOf("Authorization" to "Bearer 44d784c55e9a1e3dbb586f24b18b1cbcd1521673bd6178ef385890d2f989681fe22d05e291e2e0f03fce99cbc50cd520219e52cc6e30c944a559daf53a129af18349ec98f6a0e4e66b8d370a354f4f7fbd49df0ab806d533a3db71eecc7f75131a59ce8cffc5e0cc38e8af5919c23c0d904fbe31995308f065f0ff9cd1eda488")
+        val data = app.get("${BuildConfig.SFMOVIES_API}/api/mains?filters[title][\$contains]=$title", headers = headers).parsedSafe<SFMoviesSearch>()?.data
         val media = data?.find {
-            it.attributes?.contentId.equals("$tmdbId") || (it.attributes?.title.equals(
-                title,
-                true
-            ) || it.attributes?.releaseDate?.substringBefore("-").equals("$year"))
+            it.attributes?.contentId.equals("$tmdbId") || (it.attributes?.title.equals(title, true) || it.attributes?.releaseDate?.substringBefore("-").equals("$year"))
         }
         val video = if (season == null || episode == null) {
             media?.attributes?.video
         } else {
             media?.attributes?.seriess?.get(season - 1)?.get(episode - 1)?.svideos
         } ?: return
-        callback.invoke(
-            ExtractorLink(
-                "SFMovies",
-                "SFMovies",
-                fixUrl(video, getSfServer()),
-                "",
-                Qualities.P1080.value,
-                INFER_TYPE
-            )
-        )
+        callback.invoke(ExtractorLink("SFMovies", "SFMovies", fixUrl(video, getSfServer()), "", Qualities.P1080.value, INFER_TYPE))
     }
 
 }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 03eafa4c..c4378663 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -11,209 +11,185 @@ data class CrunchyrollAccessToken(
         val key_pair_id: String? = null,
 )
 
-data class ShowboxMedia(
-    val url: String,
-    val title: String,
-    val infor: String,
-    val type: String,
-)
 data class FDMovieIFrame(
-    val link: String,
-    val quality: String,
-    val size: String,
-    val type: String,
+        val link: String,
+        val quality: String,
+        val size: String,
+        val type: String,
 )
 
-data class AniIds(
-    var id: Int? = null,
-    var idMal: Int? = null
-)
+data class AniIds(var id: Int? = null, var idMal: Int? = null)
 
 data class TmdbDate(
-    val today: String,
-    val nextWeek: String,
+        val today: String,
+        val nextWeek: String,
 )
 
-data class AniMedia(
-    @JsonProperty("id") var id: Int? = null,
-    @JsonProperty("idMal") var idMal: Int? = null
-)
+data class AniMedia(@JsonProperty("id") var id: Int? = null, @JsonProperty("idMal") var idMal: Int? = null)
 
-data class AniPage(
-    @JsonProperty("media") var media: java.util.ArrayList<AniMedia> = arrayListOf()
-)
+data class AniPage(@JsonProperty("media") var media: java.util.ArrayList<AniMedia> = arrayListOf())
 
-data class AniData(
-    @JsonProperty("Page") var Page: AniPage? = AniPage()
-)
+data class AniData(@JsonProperty("Page") var Page: AniPage? = AniPage())
 
-data class AniSearch(
-    @JsonProperty("data") var data: AniData? = AniData()
-)
+data class AniSearch(@JsonProperty("data") var data: AniData? = AniData())
 
 data class GpressSources(
-    @JsonProperty("src") val src: String,
-    @JsonProperty("file") val file: String? = null,
-    @JsonProperty("label") val label: Int? = null,
-    @JsonProperty("max") val max: String,
+        @JsonProperty("src") val src: String,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: Int? = null,
+        @JsonProperty("max") val max: String,
 )
 
 data class UHDBackupUrl(
-    @JsonProperty("url") val url: String? = null,
+        @JsonProperty("url") val url: String? = null,
 )
 
 data class ResponseHash(
-    @JsonProperty("embed_url") val embed_url: String,
-    @JsonProperty("key") val key: String? = null,
-    @JsonProperty("type") val type: String? = null,
+        @JsonProperty("embed_url") val embed_url: String,
+        @JsonProperty("key") val key: String? = null,
+        @JsonProperty("type") val type: String? = null,
 )
 
 data class KisskhSources(
-    @JsonProperty("Video") val video: String?,
-    @JsonProperty("ThirdParty") val thirdParty: String?,
+        @JsonProperty("Video") val video: String?,
+        @JsonProperty("ThirdParty") val thirdParty: String?,
 )
 
 data class KisskhSubtitle(
-    @JsonProperty("src") val src: String?,
-    @JsonProperty("label") val label: String?,
+        @JsonProperty("src") val src: String?,
+        @JsonProperty("label") val label: String?,
 )
 
 data class KisskhEpisodes(
-    @JsonProperty("id") val id: Int?,
-    @JsonProperty("number") val number: Int?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("number") val number: Int?,
 )
 
 data class KisskhDetail(
-    @JsonProperty("episodes") val episodes: ArrayList<KisskhEpisodes>? = arrayListOf(),
+        @JsonProperty("episodes") val episodes: ArrayList<KisskhEpisodes>? = arrayListOf(),
 )
 
 data class KisskhResults(
-    @JsonProperty("id") val id: Int?,
-    @JsonProperty("title") val title: String?,
+        @JsonProperty("id") val id: Int?,
+        @JsonProperty("title") val title: String?,
 )
 
 data class DriveBotLink(
-    @JsonProperty("url") val url: String? = null,
+        @JsonProperty("url") val url: String? = null,
 )
 
 data class DirectDl(
-    @JsonProperty("download_url") val download_url: String? = null,
+        @JsonProperty("download_url") val download_url: String? = null,
 )
 
 data class Safelink(
-    @JsonProperty("safelink") val safelink: String? = null,
+        @JsonProperty("safelink") val safelink: String? = null,
 )
 
 data class FDAds(
-    @JsonProperty("linkr") val linkr: String? = null,
+        @JsonProperty("linkr") val linkr: String? = null,
 )
 
 data class ZShowEmbed(
-    @JsonProperty("m") val meta: String? = null,
+        @JsonProperty("m") val meta: String? = null,
 )
 
 data class WatchsomuchTorrents(
-    @JsonProperty("id") val id: Int? = null,
-    @JsonProperty("movieId") val movieId: Int? = null,
-    @JsonProperty("season") val season: Int? = null,
-    @JsonProperty("episode") val episode: Int? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("movieId") val movieId: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
 )
 
 data class WatchsomuchMovies(
-    @JsonProperty("torrents") val torrents: ArrayList<WatchsomuchTorrents>? = arrayListOf(),
+        @JsonProperty("torrents") val torrents: ArrayList<WatchsomuchTorrents>? = arrayListOf(),
 )
 
 data class WatchsomuchResponses(
-    @JsonProperty("movie") val movie: WatchsomuchMovies? = null,
+        @JsonProperty("movie") val movie: WatchsomuchMovies? = null,
 )
 
 data class WatchsomuchSubtitles(
-    @JsonProperty("url") val url: String? = null,
-    @JsonProperty("label") val label: String? = null,
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("label") val label: String? = null,
 )
 
 data class WatchsomuchSubResponses(
-    @JsonProperty("subtitles") val subtitles: ArrayList<WatchsomuchSubtitles>? = arrayListOf(),
+        @JsonProperty("subtitles") val subtitles: ArrayList<WatchsomuchSubtitles>? = arrayListOf(),
 )
 
 data class IndexMedia(
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("driveId") val driveId: String? = null,
-    @JsonProperty("mimeType") val mimeType: String? = null,
-    @JsonProperty("size") val size: String? = null,
-    @JsonProperty("name") val name: String? = null,
-    @JsonProperty("modifiedTime") val modifiedTime: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("driveId") val driveId: String? = null,
+        @JsonProperty("mimeType") val mimeType: String? = null,
+        @JsonProperty("size") val size: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("modifiedTime") val modifiedTime: String? = null,
 )
 
 data class IndexData(
-    @JsonProperty("files") val files: ArrayList<IndexMedia>? = arrayListOf(),
+        @JsonProperty("files") val files: ArrayList<IndexMedia>? = arrayListOf(),
 )
 
 data class IndexSearch(
-    @JsonProperty("data") val data: IndexData? = null,
+        @JsonProperty("data") val data: IndexData? = null,
 )
 
 data class JikanExternal(
-    @JsonProperty("name") val name: String? = null,
-    @JsonProperty("url") val url: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("url") val url: String? = null,
 )
 
 data class JikanData(
-    @JsonProperty("title") val title: String? = null,
-    @JsonProperty("external") val external: ArrayList<JikanExternal>? = arrayListOf(),
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("external") val external: ArrayList<JikanExternal>? = arrayListOf(),
 )
 
 data class JikanResponse(
-    @JsonProperty("data") val data: JikanData? = null,
+        @JsonProperty("data") val data: JikanData? = null,
 )
 
 data class CinemaTvSubtitles(
-    @JsonProperty("language") val language: String? = null,
-    @JsonProperty("file") val file: Any? = null,
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("file") val file: Any? = null,
 )
 
 data class CinemaTvResponse(
-    @JsonProperty("streams") val streams: HashMap<String, String>? = null,
-    @JsonProperty("subtitles") val subtitles: ArrayList<CinemaTvSubtitles>? = arrayListOf(),
+        @JsonProperty("streams") val streams: HashMap<String, String>? = null,
+        @JsonProperty("subtitles") val subtitles: ArrayList<CinemaTvSubtitles>? = arrayListOf(),
 )
 
 data class VidsrctoResult(
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("title") val title: String? = null,
-    @JsonProperty("url") val url: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("url") val url: String? = null,
 )
 
 data class VidsrctoResponse(
-    @JsonProperty("result") val result: VidsrctoResult? = null,
+        @JsonProperty("result") val result: VidsrctoResult? = null,
 )
 
 data class VidsrctoSources(
-    @JsonProperty("result") val result: ArrayList<VidsrctoResult>? = arrayListOf(),
+        @JsonProperty("result") val result: ArrayList<VidsrctoResult>? = arrayListOf(),
 )
 
 data class VidsrctoSubtitles(
-    @JsonProperty("label") val label: String? = null,
-    @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("file") val file: String? = null,
 )
 
 data class AnilistExternalLinks(
-    @JsonProperty("id") var id: Int? = null,
-    @JsonProperty("site") var site: String? = null,
-    @JsonProperty("url") var url: String? = null,
-    @JsonProperty("type") var type: String? = null,
+        @JsonProperty("id") var id: Int? = null,
+        @JsonProperty("site") var site: String? = null,
+        @JsonProperty("url") var url: String? = null,
+        @JsonProperty("type") var type: String? = null,
 )
 
-data class AnilistMedia(
-    @JsonProperty("externalLinks") var externalLinks: ArrayList<AnilistExternalLinks> = arrayListOf()
-)
+data class AnilistMedia(@JsonProperty("externalLinks") var externalLinks: ArrayList<AnilistExternalLinks> = arrayListOf())
 
-data class AnilistData(
-    @JsonProperty("Media") var Media: AnilistMedia? = AnilistMedia()
-)
+data class AnilistData(@JsonProperty("Media") var Media: AnilistMedia? = AnilistMedia())
 
-data class AnilistResponses(
-    @JsonProperty("data") var data: AnilistData? = AnilistData()
-)
+data class AnilistResponses(@JsonProperty("data") var data: AnilistData? = AnilistData())
 
 data class CrunchyrollToken(
         @JsonProperty("access_token") val accessToken: String? = null,
@@ -229,22 +205,22 @@ data class CrunchyrollToken(
 }
 
 data class CrunchyrollVersions(
-    @JsonProperty("audio_locale") val audio_locale: String? = null,
-    @JsonProperty("guid") val guid: String? = null,
+        @JsonProperty("audio_locale") val audio_locale: String? = null,
+        @JsonProperty("guid") val guid: String? = null,
 )
 
 data class CrunchyrollData(
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("title") val title: String? = null,
-    @JsonProperty("slug_title") val slug_title: String? = null,
-    @JsonProperty("season_number") val season_number: Int? = null,
-    @JsonProperty("episode_number") val episode_number: Int? = null,
-    @JsonProperty("versions") val versions: ArrayList<CrunchyrollVersions>? = null,
-    @JsonProperty("streams_link") val streams_link: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("slug_title") val slug_title: String? = null,
+        @JsonProperty("season_number") val season_number: Int? = null,
+        @JsonProperty("episode_number") val episode_number: Int? = null,
+        @JsonProperty("versions") val versions: ArrayList<CrunchyrollVersions>? = null,
+        @JsonProperty("streams_link") val streams_link: String? = null,
 )
 
 data class CrunchyrollResponses(
-    @JsonProperty("data") val data: ArrayList<CrunchyrollData>? = arrayListOf(),
+        @JsonProperty("data") val data: ArrayList<CrunchyrollData>? = arrayListOf(),
 )
 
 data class CrunchyrollSourcesResponses(
@@ -258,34 +234,34 @@ data class CrunchyrollSourcesResponses(
 }
 
 data class MALSyncSites(
-    @JsonProperty("Zoro") val zoro: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
+        @JsonProperty("Zoro") val zoro: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
 )
 
 data class MALSyncResponses(
-    @JsonProperty("Sites") val sites: MALSyncSites? = null,
+        @JsonProperty("Sites") val sites: MALSyncSites? = null,
 )
 
 data class AniwatchResponses(
-    @JsonProperty("html") val html: String? = null,
-    @JsonProperty("link") val link: String? = null,
+        @JsonProperty("html") val html: String? = null,
+        @JsonProperty("link") val link: String? = null,
 )
 
 data class MalSyncRes(
-    @JsonProperty("Sites") val Sites: Map<String, Map<String, Map<String, String>>>? = null,
+        @JsonProperty("Sites") val Sites: Map<String, Map<String, Map<String, String>>>? = null,
 )
 
 data class GokuData(
-    @JsonProperty("link") val link: String? = null,
+        @JsonProperty("link") val link: String? = null,
 )
 
 data class GokuServer(
-    @JsonProperty("data") val data: GokuData? = GokuData(),
+        @JsonProperty("data") val data: GokuData? = GokuData(),
 )
 
 data class AllMovielandEpisodeFolder(
-    @JsonProperty("title") val title: String? = null,
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("file") val file: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("file") val file: String? = null,
 )
 
 data class AllMovielandSeasonFolder(
@@ -302,177 +278,159 @@ data class AllMovielandServer(
 )
 
 data class AllMovielandPlaylist(
-    @JsonProperty("file") val file: String? = null,
-    @JsonProperty("key") val key: String? = null,
-    @JsonProperty("href") val href: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("key") val key: String? = null,
+        @JsonProperty("href") val href: String? = null,
 )
 
 data class DumpMedia(
-    @JsonProperty("id") val id: String? = null,
-    @JsonProperty("domainType") val domainType: Int? = null,
-    @JsonProperty("name") val name: String? = null,
-    @JsonProperty("releaseTime") val releaseTime: String? = null,
+        @JsonProperty("id") val id: String? = null,
+        @JsonProperty("domainType") val domainType: Int? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("releaseTime") val releaseTime: String? = null,
 )
 
 data class DumpQuickSearchData(
-    @JsonProperty("searchResults") val searchResults: ArrayList<DumpMedia>? = arrayListOf(),
+        @JsonProperty("searchResults") val searchResults: ArrayList<DumpMedia>? = arrayListOf(),
 )
 
 data class SubtitlingList(
-    @JsonProperty("languageAbbr") val languageAbbr: String? = null,
-    @JsonProperty("language") val language: String? = null,
-    @JsonProperty("subtitlingUrl") val subtitlingUrl: String? = null,
+        @JsonProperty("languageAbbr") val languageAbbr: String? = null,
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("subtitlingUrl") val subtitlingUrl: String? = null,
 )
 
 data class DefinitionList(
-    @JsonProperty("code") val code: String? = null,
-    @JsonProperty("description") val description: String? = null,
+        @JsonProperty("code") val code: String? = null,
+        @JsonProperty("description") val description: String? = null,
 )
 
 data class EpisodeVo(
-    @JsonProperty("id") val id: Int? = null,
-    @JsonProperty("seriesNo") val seriesNo: Int? = null,
-    @JsonProperty("definitionList") val definitionList: ArrayList<DefinitionList>? = arrayListOf(),
-    @JsonProperty("subtitlingList") val subtitlingList: ArrayList<SubtitlingList>? = arrayListOf(),
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("seriesNo") val seriesNo: Int? = null,
+        @JsonProperty("definitionList") val definitionList: ArrayList<DefinitionList>? = arrayListOf(),
+        @JsonProperty("subtitlingList") val subtitlingList: ArrayList<SubtitlingList>? = arrayListOf(),
 )
 
 data class DumpMediaDetail(
-    @JsonProperty("episodeVo") val episodeVo: ArrayList<EpisodeVo>? = arrayListOf(),
+        @JsonProperty("episodeVo") val episodeVo: ArrayList<EpisodeVo>? = arrayListOf(),
 )
 
 data class EMovieServer(
-    @JsonProperty("value") val value: String? = null,
+        @JsonProperty("value") val value: String? = null,
 )
 
 data class EMovieSources(
-    @JsonProperty("file") val file: String? = null,
+        @JsonProperty("file") val file: String? = null,
 )
 
 data class EMovieTraks(
-    @JsonProperty("file") val file: String? = null,
-    @JsonProperty("label") val label: String? = null,
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
 )
 
 data class ShowflixResultsMovies(
-    @JsonProperty("movieName") val movieName: String? = null,
-    @JsonProperty("streamwish") val streamwish: String? = null,
-    @JsonProperty("filelions") val filelions: String? = null,
-    @JsonProperty("streamruby") val streamruby: String? = null,
+        @JsonProperty("movieName") val movieName: String? = null,
+        @JsonProperty("streamwish") val streamwish: String? = null,
+        @JsonProperty("filelions") val filelions: String? = null,
+        @JsonProperty("streamruby") val streamruby: String? = null,
 )
 
 data class ShowflixResultsSeries(
-    @JsonProperty("seriesName") val seriesName: String? = null,
-    @JsonProperty("streamwish") val streamwish: HashMap<String, List<String>>? = hashMapOf(),
-    @JsonProperty("filelions") val filelions: HashMap<String, List<String>>? = hashMapOf(),
-    @JsonProperty("streamruby") val streamruby: HashMap<String, List<String>>? = hashMapOf(),
+        @JsonProperty("seriesName") val seriesName: String? = null,
+        @JsonProperty("streamwish") val streamwish: HashMap<String, List<String>>? = hashMapOf(),
+        @JsonProperty("filelions") val filelions: HashMap<String, List<String>>? = hashMapOf(),
+        @JsonProperty("streamruby") val streamruby: HashMap<String, List<String>>? = hashMapOf(),
 )
 
 data class ShowflixSearchMovies(
-    @JsonProperty("results") val resultsMovies: ArrayList<ShowflixResultsMovies>? = arrayListOf(),
+        @JsonProperty("results") val resultsMovies: ArrayList<ShowflixResultsMovies>? = arrayListOf(),
 )
 
 data class ShowflixSearchSeries(
-    @JsonProperty("results") val resultsSeries: ArrayList<ShowflixResultsSeries>? = arrayListOf(),
+        @JsonProperty("results") val resultsSeries: ArrayList<ShowflixResultsSeries>? = arrayListOf(),
 )
 
 data class SFMoviesSeriess(
-    @JsonProperty("title") var title: String? = null,
-    @JsonProperty("svideos") var svideos: String? = null,
+        @JsonProperty("title") var title: String? = null,
+        @JsonProperty("svideos") var svideos: String? = null,
 )
 
 data class SFMoviesAttributes(
-    @JsonProperty("title") var title: String? = null,
-    @JsonProperty("video") var video: String? = null,
-    @JsonProperty("releaseDate") var releaseDate: String? = null,
-    @JsonProperty("seriess") var seriess: ArrayList<ArrayList<SFMoviesSeriess>>? = arrayListOf(),
-    @JsonProperty("contentId") var contentId: String? = null,
+        @JsonProperty("title") var title: String? = null,
+        @JsonProperty("video") var video: String? = null,
+        @JsonProperty("releaseDate") var releaseDate: String? = null,
+        @JsonProperty("seriess") var seriess: ArrayList<ArrayList<SFMoviesSeriess>>? = arrayListOf(),
+        @JsonProperty("contentId") var contentId: String? = null,
 )
 
-data class SFMoviesData(
-    @JsonProperty("id") var id: Int? = null,
-    @JsonProperty("attributes") var attributes: SFMoviesAttributes? = SFMoviesAttributes()
-)
+data class SFMoviesData(@JsonProperty("id") var id: Int? = null, @JsonProperty("attributes") var attributes: SFMoviesAttributes? = SFMoviesAttributes())
 
 data class SFMoviesSearch(
-    @JsonProperty("data") var data: ArrayList<SFMoviesData>? = arrayListOf(),
+        @JsonProperty("data") var data: ArrayList<SFMoviesData>? = arrayListOf(),
 )
 
 data class RidoContentable(
-    @JsonProperty("imdbId") var imdbId: String? = null,
-    @JsonProperty("tmdbId") var tmdbId: Int? = null,
+        @JsonProperty("imdbId") var imdbId: String? = null,
+        @JsonProperty("tmdbId") var tmdbId: Int? = null,
 )
 
 data class RidoItems(
-    @JsonProperty("slug") var slug: String? = null,
-    @JsonProperty("contentable") var contentable: RidoContentable? = null,
+        @JsonProperty("slug") var slug: String? = null,
+        @JsonProperty("contentable") var contentable: RidoContentable? = null,
 )
 
 data class RidoData(
-    @JsonProperty("url") var url: String? = null,
-    @JsonProperty("items") var items: ArrayList<RidoItems>? = arrayListOf(),
+        @JsonProperty("url") var url: String? = null,
+        @JsonProperty("items") var items: ArrayList<RidoItems>? = arrayListOf(),
 )
 
 data class RidoResponses(
-    @JsonProperty("data") var data: ArrayList<RidoData>? = arrayListOf(),
+        @JsonProperty("data") var data: ArrayList<RidoData>? = arrayListOf(),
 )
 
 data class RidoSearch(
-    @JsonProperty("data") var data: RidoData? = null,
+        @JsonProperty("data") var data: RidoData? = null,
 )
 
 data class SmashySources(
-    @JsonProperty("sourceUrls") var sourceUrls: ArrayList<String>? = arrayListOf(),
-    @JsonProperty("subtitleUrls") var subtitleUrls: String? = null,
+        @JsonProperty("sourceUrls") var sourceUrls: ArrayList<String>? = arrayListOf(),
+        @JsonProperty("subtitleUrls") var subtitleUrls: String? = null,
 )
 
 data class SmashyDSources(
-    @JsonProperty("sourceUrls") var sourceUrls: ArrayList<SmashyDSourcesUrls>? = arrayListOf(),
+        @JsonProperty("sourceUrls") var sourceUrls: ArrayList<SmashyDSourcesUrls>? = arrayListOf(),
 )
 
 data class SmashyDSourcesUrls(
-    @JsonProperty("file") var file: String? = null,
-    @JsonProperty("title") var title: String? = null,
+        @JsonProperty("file") var file: String? = null,
+        @JsonProperty("title") var title: String? = null,
 )
 
 data class AoneroomResponse(
-    @JsonProperty("data") val data: Data? = null,
+        @JsonProperty("data") val data: Data? = null,
 ) {
     data class Data(
-        @JsonProperty("items") val items: ArrayList<Items>? = arrayListOf(),
-        @JsonProperty("list") val list: ArrayList<List>? = arrayListOf(),
+            @JsonProperty("items") val items: ArrayList<Items>? = arrayListOf(),
+            @JsonProperty("list") val list: ArrayList<List>? = arrayListOf(),
     ) {
         data class Items(
-            @JsonProperty("subjectId") val subjectId: String? = null,
-            @JsonProperty("title") val title: String? = null,
-            @JsonProperty("releaseDate") val releaseDate: String? = null,
+                @JsonProperty("subjectId") val subjectId: String? = null,
+                @JsonProperty("title") val title: String? = null,
+                @JsonProperty("releaseDate") val releaseDate: String? = null,
         )
 
         data class List(
-            @JsonProperty("resourceLink") val resourceLink: String? = null,
-            @JsonProperty("extCaptions") val extCaptions: ArrayList<ExtCaptions>? = arrayListOf(),
-            @JsonProperty("se") val se: Int? = null,
-            @JsonProperty("ep") val ep: Int? = null,
-            @JsonProperty("resolution") val resolution: Int? = null,
+                @JsonProperty("resourceLink") val resourceLink: String? = null,
+                @JsonProperty("extCaptions") val extCaptions: ArrayList<ExtCaptions>? = arrayListOf(),
+                @JsonProperty("se") val se: Int? = null,
+                @JsonProperty("ep") val ep: Int? = null,
+                @JsonProperty("resolution") val resolution: Int? = null,
         ) {
             data class ExtCaptions(
-                @JsonProperty("lanName") val lanName: String? = null,
-                @JsonProperty("url") val url: String? = null,
+                    @JsonProperty("lanName") val lanName: String? = null,
+                    @JsonProperty("url") val url: String? = null,
             )
         }
     }
-}
-
-data class FebboxResponse(
-    @JsonProperty("data") val data: Data? = null,
-) {
-    data class Data(
-        @JsonProperty("link") val link: String? = null,
-        @JsonProperty("file_list") val file_list: ArrayList<FileList>? = arrayListOf(),
-    ) {
-        data class FileList(
-            @JsonProperty("fid") val fid: Long? = null,
-            @JsonProperty("file_name") val file_name: String? = null,
-            @JsonProperty("oss_fid") val oss_fid: Long? = null,
-        )
-    }
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 141c5839..8c6aa0ea 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -43,7 +43,7 @@ import com.hexated.SoraExtractor.invokeUhdmovies
 import com.hexated.SoraExtractor.invokeVegamovies
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
-import com.hexated.SoraExtractor.invokeFebbox
+import com.hexated.SoraExtractor.invokeMMovies
 import com.hexated.SoraExtractor.invokeOmovies
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
@@ -63,13 +63,13 @@ open class SoraStream : TmdbProvider() {
     override val useMetaLoadResponse = true
     override val hasQuickSearch = true
     override val supportedTypes = setOf(
-        TvType.Movie,
-        TvType.TvSeries,
-        TvType.Anime,
+            TvType.Movie,
+            TvType.TvSeries,
+            TvType.Anime,
     )
 
-    val showboxInterceptor by lazy { CloudflareKiller() }
     val wpredisInterceptor by lazy { CloudflareKiller() }
+    val multiInterceptor by lazy { CloudflareKiller() }
 
     /** AUTHOR : Hexated & Sora */
     companion object {
@@ -114,10 +114,9 @@ open class SoraStream : TmdbProvider() {
         const val vidsrctoAPI = "https://vidsrc.to"
         const val dramadayAPI = "https://dramaday.me"
         const val animetoshoAPI = "https://animetosho.org"
-        const val watchflxAPI = "https://watchflx.tv"
         const val showflixAPI = "https://showflix.space"
         const val aoneroomAPI = "https://api3.aoneroom.com"
-        const val febboxAPI = "https://www.febbox.com"
+        const val mMoviesAPI = "https://multimovies.uno"
         const val watchCartoonAPI = "https://www1.watchcartoononline.bz"
 
         const val fdMoviesAPI = "https://freedrivemovie.com"
@@ -148,26 +147,26 @@ open class SoraStream : TmdbProvider() {
     }
 
     override val mainPage = mainPageOf(
-        "$tmdbAPI/trending/all/day?api_key=$apiKey&region=US" to "Trending",
-        "$tmdbAPI/movie/popular?api_key=$apiKey&region=US" to "Popular Movies",
-        "$tmdbAPI/tv/popular?api_key=$apiKey&region=US&with_original_language=en" to "Popular TV Shows",
-        "$tmdbAPI/tv/airing_today?api_key=$apiKey&region=US&with_original_language=en" to "Airing Today TV Shows",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=213" to "Netflix",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=1024" to "Amazon",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2739" to "Disney+",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=453" to "Hulu",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2552" to "Apple TV+",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=49" to "HBO",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=4330" to "Paramount+",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=3353" to "Peacock",
-        "$tmdbAPI/movie/top_rated?api_key=$apiKey&region=US" to "Top Rated Movies",
-        "$tmdbAPI/tv/top_rated?api_key=$apiKey&region=US" to "Top Rated TV Shows",
-        "$tmdbAPI/movie/upcoming?api_key=$apiKey&region=US" to "Upcoming Movies",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_original_language=ko" to "Korean Shows",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().today}&air_date.gte=${getDate().today}" to "Airing Today Anime",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().nextWeek}&air_date.gte=${getDate().today}" to "On The Air Anime",
-        "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243" to "Anime",
-        "$tmdbAPI/discover/movie?api_key=$apiKey&with_keywords=210024|222243" to "Anime Movies",
+            "$tmdbAPI/trending/all/day?api_key=$apiKey&region=US" to "Trending",
+            "$tmdbAPI/movie/popular?api_key=$apiKey&region=US" to "Popular Movies",
+            "$tmdbAPI/tv/popular?api_key=$apiKey&region=US&with_original_language=en" to "Popular TV Shows",
+            "$tmdbAPI/tv/airing_today?api_key=$apiKey&region=US&with_original_language=en" to "Airing Today TV Shows",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=213" to "Netflix",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=1024" to "Amazon",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2739" to "Disney+",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=453" to "Hulu",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2552" to "Apple TV+",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=49" to "HBO",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=4330" to "Paramount+",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=3353" to "Peacock",
+            "$tmdbAPI/movie/top_rated?api_key=$apiKey&region=US" to "Top Rated Movies",
+            "$tmdbAPI/tv/top_rated?api_key=$apiKey&region=US" to "Top Rated TV Shows",
+            "$tmdbAPI/movie/upcoming?api_key=$apiKey&region=US" to "Upcoming Movies",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_original_language=ko" to "Korean Shows",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().today}&air_date.gte=${getDate().today}" to "Airing Today Anime",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().nextWeek}&air_date.gte=${getDate().today}" to "On The Air Anime",
+            "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243" to "Anime",
+            "$tmdbAPI/discover/movie?api_key=$apiKey&with_keywords=210024|222243" to "Anime Movies",
     )
 
     private fun getImageUrl(link: String?): String? {
@@ -180,26 +179,20 @@ open class SoraStream : TmdbProvider() {
         return if (link.startsWith("/")) "https://image.tmdb.org/t/p/original/$link" else link
     }
 
-    override suspend fun getMainPage(
-        page: Int,
-        request: MainPageRequest
-    ): HomePageResponse {
-        val adultQuery =
-            if (settingsForProvider.enableAdult) "" else "&without_keywords=190370|13059|226161|195669"
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+        val adultQuery = if (settingsForProvider.enableAdult) "" else "&without_keywords=190370|13059|226161|195669"
         val type = if (request.data.contains("/movie")) "movie" else "tv"
-        val home = app.get("${request.data}$adultQuery&page=$page")
-            .parsedSafe<Results>()?.results
-            ?.mapNotNull { media ->
-                media.toSearchResponse(type)
-            } ?: throw ErrorLoadingException("Invalid Json reponse")
+        val home = app.get("${request.data}$adultQuery&page=$page").parsedSafe<Results>()?.results?.mapNotNull { media ->
+            media.toSearchResponse(type)
+        } ?: throw ErrorLoadingException("Invalid Json reponse")
         return newHomePageResponse(request.name, home)
     }
 
     private fun Media.toSearchResponse(type: String? = null): SearchResponse? {
         return newMovieSearchResponse(
-            title ?: name ?: originalTitle ?: return null,
-            Data(id = id, type = mediaType ?: type).toJson(),
-            TvType.Movie,
+                title ?: name ?: originalTitle ?: return null,
+                Data(id = id, type = mediaType ?: type).toJson(),
+                TvType.Movie,
         ) {
             this.posterUrl = getImageUrl(posterPath)
         }
@@ -208,9 +201,7 @@ open class SoraStream : TmdbProvider() {
     override suspend fun quickSearch(query: String): List<SearchResponse>? = search(query)
 
     override suspend fun search(query: String): List<SearchResponse>? {
-        return app.get(
-            "$tmdbAPI/search/multi?api_key=$apiKey&language=en-US&query=$query&page=1&include_adult=${settingsForProvider.enableAdult}"
-        ).parsedSafe<Results>()?.results?.mapNotNull { media ->
+        return app.get("$tmdbAPI/search/multi?api_key=$apiKey&language=en-US&query=$query&page=1&include_adult=${settingsForProvider.enableAdult}").parsedSafe<Results>()?.results?.mapNotNull { media ->
             media.toSearchResponse()
         }
     }
@@ -225,7 +216,7 @@ open class SoraStream : TmdbProvider() {
             "$tmdbAPI/tv/${data.id}?api_key=$apiKey&append_to_response=$append"
         }
         val res = app.get(resUrl).parsedSafe<MediaDetail>()
-            ?: throw ErrorLoadingException("Invalid Json Response")
+                ?: throw ErrorLoadingException("Invalid Json Response")
 
         val title = res.title ?: res.name ?: return null
         val poster = getOriImageUrl(res.posterPath)
@@ -241,68 +232,27 @@ open class SoraStream : TmdbProvider() {
         val isAsian = !isAnime && (res.original_language == "zh" || res.original_language == "ko")
         val isBollywood = res.production_countries?.any { it.name == "India" } ?: false
 
-        val keywords = res.keywords?.results?.mapNotNull { it.name }.orEmpty()
-            .ifEmpty { res.keywords?.keywords?.mapNotNull { it.name } }
+        val keywords = res.keywords?.results?.mapNotNull { it.name }.orEmpty().ifEmpty { res.keywords?.keywords?.mapNotNull { it.name } }
 
         val actors = res.credits?.cast?.mapNotNull { cast ->
-            ActorData(
-                Actor(
-                    cast.name ?: cast.originalName ?: return@mapNotNull null,
-                    getImageUrl(cast.profilePath)
-                ),
-                roleString = cast.character
-            )
+            ActorData(Actor(cast.name ?: cast.originalName
+            ?: return@mapNotNull null, getImageUrl(cast.profilePath)), roleString = cast.character)
         } ?: return null
-        val recommendations =
-            res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() }
+        val recommendations = res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() }
 
-        val trailer = res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" }
-            ?.randomOrNull()
+        val trailer = res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" }?.randomOrNull()
 
         return if (type == TvType.TvSeries) {
             val lastSeason = res.last_episode_to_air?.season_number
             val episodes = res.seasons?.mapNotNull { season ->
-                app.get("$tmdbAPI/${data.type}/${data.id}/season/${season.seasonNumber}?api_key=$apiKey")
-                    .parsedSafe<MediaDetailEpisodes>()?.episodes?.map { eps ->
-                        Episode(
-                            LinkData(
-                                data.id,
-                                res.external_ids?.imdb_id,
-                                res.external_ids?.tvdb_id,
-                                data.type,
-                                eps.seasonNumber,
-                                eps.episodeNumber,
-                                title = title,
-                                year = season.airDate?.split("-")?.first()?.toIntOrNull(),
-                                orgTitle = orgTitle,
-                                isAnime = isAnime,
-                                airedYear = year,
-                                lastSeason = lastSeason,
-                                epsTitle = eps.name,
-                                jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title,
-                                date = season.airDate,
-                                airedDate = res.releaseDate ?: res.firstAirDate,
-                                isAsian = isAsian,
-                                isBollywood = isBollywood,
-                                isCartoon = isCartoon
-                            ).toJson(),
-                            name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "",
-                            season = eps.seasonNumber,
-                            episode = eps.episodeNumber,
-                            posterUrl = getImageUrl(eps.stillPath),
-                            rating = eps.voteAverage?.times(10)?.roundToInt(),
-                            description = eps.overview
-                        ).apply {
-                            this.addDate(eps.airDate)
-                        }
+                app.get("$tmdbAPI/${data.type}/${data.id}/season/${season.seasonNumber}?api_key=$apiKey").parsedSafe<MediaDetailEpisodes>()?.episodes?.map { eps ->
+                    Episode(LinkData(data.id, res.external_ids?.imdb_id, res.external_ids?.tvdb_id, data.type, eps.seasonNumber, eps.episodeNumber, title = title, year = season.airDate?.split("-")?.first()?.toIntOrNull(), orgTitle = orgTitle, isAnime = isAnime, airedYear = year, lastSeason = lastSeason, epsTitle = eps.name, jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title, date = season.airDate, airedDate = res.releaseDate
+                            ?: res.firstAirDate, isAsian = isAsian, isBollywood = isBollywood, isCartoon = isCartoon).toJson(), name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "", season = eps.seasonNumber, episode = eps.episodeNumber, posterUrl = getImageUrl(eps.stillPath), rating = eps.voteAverage?.times(10)?.roundToInt(), description = eps.overview).apply {
+                        this.addDate(eps.airDate)
                     }
+                }
             }?.flatten() ?: listOf()
-            newTvSeriesLoadResponse(
-                title,
-                url,
-                if (isAnime) TvType.Anime else TvType.TvSeries,
-                episodes
-            ) {
+            newTvSeriesLoadResponse(title, url, if (isAnime) TvType.Anime else TvType.TvSeries, episodes) {
                 this.posterUrl = poster
                 this.backgroundPosterUrl = bgPoster
                 this.year = year
@@ -319,23 +269,11 @@ open class SoraStream : TmdbProvider() {
             }
         } else {
             newMovieLoadResponse(
-                title,
-                url,
-                TvType.Movie,
-                LinkData(
-                    data.id,
-                    res.external_ids?.imdb_id,
-                    res.external_ids?.tvdb_id,
-                    data.type,
-                    title = title,
-                    year = year,
-                    orgTitle = orgTitle,
-                    isAnime = isAnime,
-                    jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title,
-                    airedDate = res.releaseDate ?: res.firstAirDate,
-                    isAsian = isAsian,
-                    isBollywood = isBollywood
-                ).toJson(),
+                    title,
+                    url,
+                    TvType.Movie,
+                    LinkData(data.id, res.external_ids?.imdb_id, res.external_ids?.tvdb_id, data.type, title = title, year = year, orgTitle = orgTitle, isAnime = isAnime, jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title, airedDate = res.releaseDate
+                            ?: res.firstAirDate, isAsian = isAsian, isBollywood = isBollywood).toJson(),
             ) {
                 this.posterUrl = poster
                 this.backgroundPosterUrl = bgPoster
@@ -355,556 +293,315 @@ open class SoraStream : TmdbProvider() {
         }
     }
 
-    override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ): Boolean {
+    override suspend fun loadLinks(data: String, isCasting: Boolean, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit): Boolean {
 
         val res = parseJson<LinkData>(data)
 
         argamap(
-//            {
-//                invokeFebbox(
-//                    res.title,
-//                    res.year,
-//                    res.season,
-//                    res.lastSeason,
-//                    res.episode,
-//                    callback
-//                )
-//            },
-            {
-                invokeDumpStream(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeGoku(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.lastSeason,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeVidSrc(res.id, res.season, res.episode, callback)
-            },
-            {
-                invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                if (!res.isAnime) invokeAoneroom(
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (res.isAnime) invokeAnimes(
-                    res.title,
-                    res.epsTitle,
-                    res.date,
-                    res.airedDate,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeDreamfilm(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
+                {
+                    invokeDumpStream(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeGoku(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeVidSrc(res.id, res.season, res.episode, callback)
+                },
+                {
+                    invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeAoneroom(res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isAnime) invokeAnimes(res.title, res.epsTitle, res.date, res.airedDate, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeDreamfilm(res.title, res.season, res.episode, subtitleCallback, callback)
+                },
 //            {
 //                invokeNoverse(res.title, res.season, res.episode, callback)
 //            },
-            {
-                if (!res.isAnime) invokeFilmxy(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.isCartoon) invokeKimcartoon(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeVidsrcto(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (res.isAsian || res.isAnime) invokeKisskh(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    res.isAnime,
-                    res.lastSeason,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeOmovies (
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeLing(
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeUhdmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeGMovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeFDMovies(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeM4uhd(
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeTvMovies(res.title, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime) invokeMoviezAdd(
-                    moviezAddAPI,
-                    "MoviezAdd",
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.isBollywood) invokeBollyMaza(
-                    bollyMazaAPI,
-                    "BollyMaza",
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime) invokeFlixon(
-                    res.id,
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeSmashyStream(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeWatchsomuch(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback
-                )
-            },
-            {
-                if (!res.isAnime) invokeNinetv(
-                    res.id,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeDahmerMovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                invokeCinemaTv(
-                    res.imdbId,
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime && res.season == null) invokeRidomovies(
-                    res.id,
-                    res.imdbId,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime) invokeEmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeVegamovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.lastSeason,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.isBollywood) invokeDotmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.lastSeason,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if(res.isBollywood) invokeMultimovies(multimoviesAPI, res.title, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                if(res.isBollywood) invokeMultimovies(multimovies2API, res.title, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                invokeNetmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.season == null) invokeDoomovies(
-                    res.title,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (res.isAsian) invokeDramaday(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invoke2embed(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                if (!res.isAnime) invokeHdmovies4u(
-                    res.title,
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeZshow(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeShowflix(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeSFMovies(
-                    res.id,
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            }
+                {
+                    if (!res.isAnime) invokeFilmxy(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime && res.isCartoon) invokeKimcartoon(res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime && res.isCartoon) invokeWatchCartoon(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeVidsrcto(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isAsian || res.isAnime) invokeKisskh(res.title, res.season, res.episode, res.isAnime, res.lastSeason, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeOmovies(res.title, res.year, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeLing(res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeUhdmovies(res.title, res.year, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeGMovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeFDMovies(res.title, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeM4uhd(res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeTvMovies(res.title, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeMoviezAdd(moviezAddAPI, "MoviezAdd", res.title, res.year, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime && res.isBollywood) invokeBollyMaza(bollyMazaAPI, "BollyMaza", res.title, res.year, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeFlixon(res.id, res.imdbId, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeSmashyStream(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeWatchsomuch(res.imdbId, res.season, res.episode, subtitleCallback)
+                },
+                {
+                    if (!res.isAnime) invokeNinetv(res.id, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeDahmerMovies(res.title, res.year, res.season, res.episode, callback)
+                },
+                {
+                    invokeCinemaTv(res.imdbId, res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, callback)
+                },
+                {
+                    if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeEmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeVegamovies(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime && res.isBollywood) invokeDotmovies(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isBollywood) invokeMultimovies(multimoviesAPI, res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isBollywood) invokeMultimovies(multimovies2API, res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeNetmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime && res.season == null) invokeDoomovies(res.title, subtitleCallback, callback)
+                },
+                {
+                    if (res.isAsian) invokeDramaday(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invoke2embed(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeHdmovies4u(res.title, res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeZshow(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeShowflix(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeSFMovies(res.id, res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, callback)
+                },
+                {
+                    invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+                },
         )
 
         return true
     }
 
     data class LinkData(
-        val id: Int? = null,
-        val imdbId: String? = null,
-        val tvdbId: Int? = null,
-        val type: String? = null,
-        val season: Int? = null,
-        val episode: Int? = null,
-        val aniId: String? = null,
-        val animeId: String? = null,
-        val title: String? = null,
-        val year: Int? = null,
-        val orgTitle: String? = null,
-        val isAnime: Boolean = false,
-        val airedYear: Int? = null,
-        val lastSeason: Int? = null,
-        val epsTitle: String? = null,
-        val jpTitle: String? = null,
-        val date: String? = null,
-        val airedDate: String? = null,
-        val isAsian: Boolean = false,
-        val isBollywood: Boolean = false,
-        val isCartoon: Boolean = false,
+            val id: Int? = null,
+            val imdbId: String? = null,
+            val tvdbId: Int? = null,
+            val type: String? = null,
+            val season: Int? = null,
+            val episode: Int? = null,
+            val aniId: String? = null,
+            val animeId: String? = null,
+            val title: String? = null,
+            val year: Int? = null,
+            val orgTitle: String? = null,
+            val isAnime: Boolean = false,
+            val airedYear: Int? = null,
+            val lastSeason: Int? = null,
+            val epsTitle: String? = null,
+            val jpTitle: String? = null,
+            val date: String? = null,
+            val airedDate: String? = null,
+            val isAsian: Boolean = false,
+            val isBollywood: Boolean = false,
+            val isCartoon: Boolean = false,
     )
 
     data class Data(
-        val id: Int? = null,
-        val type: String? = null,
-        val aniId: String? = null,
-        val malId: Int? = null,
+            val id: Int? = null,
+            val type: String? = null,
+            val aniId: String? = null,
+            val malId: Int? = null,
     )
 
     data class Results(
-        @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
+            @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
     )
 
     data class Media(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("original_title") val originalTitle: String? = null,
-        @JsonProperty("media_type") val mediaType: String? = null,
-        @JsonProperty("poster_path") val posterPath: String? = null,
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("title") val title: String? = null,
+            @JsonProperty("original_title") val originalTitle: String? = null,
+            @JsonProperty("media_type") val mediaType: String? = null,
+            @JsonProperty("poster_path") val posterPath: String? = null,
     )
 
     data class Genres(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") val name: String? = null,
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
     )
 
     data class Keywords(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") val name: String? = null,
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
     )
 
     data class KeywordResults(
-        @JsonProperty("results") val results: ArrayList<Keywords>? = arrayListOf(),
-        @JsonProperty("keywords") val keywords: ArrayList<Keywords>? = arrayListOf(),
+            @JsonProperty("results") val results: ArrayList<Keywords>? = arrayListOf(),
+            @JsonProperty("keywords") val keywords: ArrayList<Keywords>? = arrayListOf(),
     )
 
     data class Seasons(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("season_number") val seasonNumber: Int? = null,
-        @JsonProperty("air_date") val airDate: String? = null,
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("season_number") val seasonNumber: Int? = null,
+            @JsonProperty("air_date") val airDate: String? = null,
     )
 
     data class Cast(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("original_name") val originalName: String? = null,
-        @JsonProperty("character") val character: String? = null,
-        @JsonProperty("known_for_department") val knownForDepartment: String? = null,
-        @JsonProperty("profile_path") val profilePath: String? = null,
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("original_name") val originalName: String? = null,
+            @JsonProperty("character") val character: String? = null,
+            @JsonProperty("known_for_department") val knownForDepartment: String? = null,
+            @JsonProperty("profile_path") val profilePath: String? = null,
     )
 
     data class Episodes(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("overview") val overview: String? = null,
-        @JsonProperty("air_date") val airDate: String? = null,
-        @JsonProperty("still_path") val stillPath: String? = null,
-        @JsonProperty("vote_average") val voteAverage: Double? = null,
-        @JsonProperty("episode_number") val episodeNumber: Int? = null,
-        @JsonProperty("season_number") val seasonNumber: Int? = null,
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("overview") val overview: String? = null,
+            @JsonProperty("air_date") val airDate: String? = null,
+            @JsonProperty("still_path") val stillPath: String? = null,
+            @JsonProperty("vote_average") val voteAverage: Double? = null,
+            @JsonProperty("episode_number") val episodeNumber: Int? = null,
+            @JsonProperty("season_number") val seasonNumber: Int? = null,
     )
 
     data class MediaDetailEpisodes(
-        @JsonProperty("episodes") val episodes: ArrayList<Episodes>? = arrayListOf(),
+            @JsonProperty("episodes") val episodes: ArrayList<Episodes>? = arrayListOf(),
     )
 
     data class Trailers(
-        @JsonProperty("key") val key: String? = null,
+            @JsonProperty("key") val key: String? = null,
     )
 
     data class ResultsTrailer(
-        @JsonProperty("results") val results: ArrayList<Trailers>? = arrayListOf(),
+            @JsonProperty("results") val results: ArrayList<Trailers>? = arrayListOf(),
     )
 
     data class AltTitles(
-        @JsonProperty("iso_3166_1") val iso_3166_1: String? = null,
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("type") val type: String? = null,
+            @JsonProperty("iso_3166_1") val iso_3166_1: String? = null,
+            @JsonProperty("title") val title: String? = null,
+            @JsonProperty("type") val type: String? = null,
     )
 
     data class ResultsAltTitles(
-        @JsonProperty("results") val results: ArrayList<AltTitles>? = arrayListOf(),
+            @JsonProperty("results") val results: ArrayList<AltTitles>? = arrayListOf(),
     )
 
     data class ExternalIds(
-        @JsonProperty("imdb_id") val imdb_id: String? = null,
-        @JsonProperty("tvdb_id") val tvdb_id: Int? = null,
+            @JsonProperty("imdb_id") val imdb_id: String? = null,
+            @JsonProperty("tvdb_id") val tvdb_id: Int? = null,
     )
 
     data class Credits(
-        @JsonProperty("cast") val cast: ArrayList<Cast>? = arrayListOf(),
+            @JsonProperty("cast") val cast: ArrayList<Cast>? = arrayListOf(),
     )
 
     data class ResultsRecommendations(
-        @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
+            @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
     )
 
     data class LastEpisodeToAir(
-        @JsonProperty("episode_number") val episode_number: Int? = null,
-        @JsonProperty("season_number") val season_number: Int? = null,
+            @JsonProperty("episode_number") val episode_number: Int? = null,
+            @JsonProperty("season_number") val season_number: Int? = null,
     )
 
     data class ProductionCountries(
-        @JsonProperty("name") val name: String? = null,
+            @JsonProperty("name") val name: String? = null,
     )
 
     data class MediaDetail(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("imdb_id") val imdbId: String? = null,
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("original_title") val originalTitle: String? = null,
-        @JsonProperty("original_name") val originalName: String? = null,
-        @JsonProperty("poster_path") val posterPath: String? = null,
-        @JsonProperty("backdrop_path") val backdropPath: String? = null,
-        @JsonProperty("release_date") val releaseDate: String? = null,
-        @JsonProperty("first_air_date") val firstAirDate: String? = null,
-        @JsonProperty("overview") val overview: String? = null,
-        @JsonProperty("runtime") val runtime: Int? = null,
-        @JsonProperty("vote_average") val vote_average: Any? = null,
-        @JsonProperty("original_language") val original_language: String? = null,
-        @JsonProperty("status") val status: String? = null,
-        @JsonProperty("genres") val genres: ArrayList<Genres>? = arrayListOf(),
-        @JsonProperty("keywords") val keywords: KeywordResults? = null,
-        @JsonProperty("last_episode_to_air") val last_episode_to_air: LastEpisodeToAir? = null,
-        @JsonProperty("seasons") val seasons: ArrayList<Seasons>? = arrayListOf(),
-        @JsonProperty("videos") val videos: ResultsTrailer? = null,
-        @JsonProperty("external_ids") val external_ids: ExternalIds? = null,
-        @JsonProperty("credits") val credits: Credits? = null,
-        @JsonProperty("recommendations") val recommendations: ResultsRecommendations? = null,
-        @JsonProperty("alternative_titles") val alternative_titles: ResultsAltTitles? = null,
-        @JsonProperty("production_countries") val production_countries: ArrayList<ProductionCountries>? = arrayListOf(),
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("imdb_id") val imdbId: String? = null,
+            @JsonProperty("title") val title: String? = null,
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("original_title") val originalTitle: String? = null,
+            @JsonProperty("original_name") val originalName: String? = null,
+            @JsonProperty("poster_path") val posterPath: String? = null,
+            @JsonProperty("backdrop_path") val backdropPath: String? = null,
+            @JsonProperty("release_date") val releaseDate: String? = null,
+            @JsonProperty("first_air_date") val firstAirDate: String? = null,
+            @JsonProperty("overview") val overview: String? = null,
+            @JsonProperty("runtime") val runtime: Int? = null,
+            @JsonProperty("vote_average") val vote_average: Any? = null,
+            @JsonProperty("original_language") val original_language: String? = null,
+            @JsonProperty("status") val status: String? = null,
+            @JsonProperty("genres") val genres: ArrayList<Genres>? = arrayListOf(),
+            @JsonProperty("keywords") val keywords: KeywordResults? = null,
+            @JsonProperty("last_episode_to_air") val last_episode_to_air: LastEpisodeToAir? = null,
+            @JsonProperty("seasons") val seasons: ArrayList<Seasons>? = arrayListOf(),
+            @JsonProperty("videos") val videos: ResultsTrailer? = null,
+            @JsonProperty("external_ids") val external_ids: ExternalIds? = null,
+            @JsonProperty("credits") val credits: Credits? = null,
+            @JsonProperty("recommendations") val recommendations: ResultsRecommendations? = null,
+            @JsonProperty("alternative_titles") val alternative_titles: ResultsAltTitles? = null,
+            @JsonProperty("production_countries") val production_countries: ArrayList<ProductionCountries>? = arrayListOf(),
     )
 
 }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 3b9e975f..2ea87243 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -29,7 +29,7 @@ import com.hexated.SoraExtractor.invokeShowflix
 import com.hexated.SoraExtractor.invokeVidSrc
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
-import com.hexated.SoraExtractor.invokeFebbox
+import com.hexated.SoraExtractor.invokeMMovies
 import com.hexated.SoraExtractor.invokeOmovies
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
@@ -42,299 +42,121 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 class SoraStreamLite : SoraStream() {
     override var name = "SoraStream-Lite"
 
-    override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ): Boolean {
+    override suspend fun loadLinks(data: String, isCasting: Boolean, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit): Boolean {
 
         val res = AppUtils.parseJson<LinkData>(data)
 
         argamap(
-//            {
-//                invokeFebbox(
-//                    res.title,
-//                    res.year,
-//                    res.season,
-//                    res.lastSeason,
-//                    res.episode,
-//                    callback
-//                )
-//            },
-            {
-                if (!res.isAnime) invokeWatchsomuch(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback
-                )
-            },
-            {
-                invokeDumpStream(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeNinetv(
-                    res.id,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeGoku(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.lastSeason,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeVidSrc(res.id, res.season, res.episode, callback)
-            },
-            {
-                invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (res.isAnime) invokeAnimes(
-                    res.title,
-                    res.epsTitle,
-                    res.date,
-                    res.airedDate,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeDreamfilm(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeFilmxy(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeOmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.isCartoon) invokeKimcartoon(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeSmashyStream(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeVidsrcto(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (res.isAsian || res.isAnime) invokeKisskh(
-                    res.title,
-                    res.season,
-                    res.episode,
-                    res.isAnime,
-                    res.lastSeason,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeLing(
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if(!res.isAnime) invokeM4uhd(
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime) invokeFlixon(res.id, res.imdbId, res.season, res.episode, callback)
-            },
-            {
-                invokeCinemaTv(
-                    res.imdbId,
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime) invokeAoneroom(
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.season == null) invokeRidomovies(
-                    res.id,
-                    res.imdbId,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeEmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if(res.isBollywood) invokeMultimovies(multimoviesAPI, res.title, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                if(res.isBollywood) invokeMultimovies(multimovies2API, res.title, res.season, res.episode, subtitleCallback, callback)
-            },
-            {
-                invokeNetmovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
-            },
-            {
-                if (!res.isAnime && res.season == null) invokeDoomovies(
-                    res.title,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if(res.isAsian) invokeDramaday(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if(!res.isAnime) invoke2embed(
-                    res.imdbId,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeZshow(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime) invokeShowflix(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                if(!res.isAnime) invokeSFMovies(
-                    res.id,
-                    res.title,
-                    res.airedYear ?: res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            }
+                {
+                    if (!res.isAnime) invokeWatchsomuch(res.imdbId, res.season, res.episode, subtitleCallback)
+                },
+                {
+                    invokeDumpStream(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeNinetv(res.id, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeGoku(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeVidSrc(res.id, res.season, res.episode, callback)
+                },
+                {
+                    invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime && res.isCartoon) invokeWatchCartoon(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isAnime) invokeAnimes(res.title, res.epsTitle, res.date, res.airedDate, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeDreamfilm(res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeFilmxy(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeOmovies(res.title, res.year, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime && res.isCartoon) invokeKimcartoon(res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeSmashyStream(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeVidsrcto(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isAsian || res.isAnime) invokeKisskh(res.title, res.season, res.episode, res.isAnime, res.lastSeason, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeLing(res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeM4uhd(res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeFlixon(res.id, res.imdbId, res.season, res.episode, callback)
+                },
+                {
+                    invokeCinemaTv(res.imdbId, res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime) invokeAoneroom(res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, callback)
+                },
+                {
+                    if (!res.isAnime) invokeEmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isBollywood) invokeMultimovies(multimoviesAPI, res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (res.isBollywood) invokeMultimovies(multimovies2API, res.title, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeNetmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
+                },
+                {
+                    if (!res.isAnime && res.season == null) invokeDoomovies(res.title, subtitleCallback, callback)
+                },
+                {
+                    if (res.isAsian) invokeDramaday(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invoke2embed(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    invokeZshow(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeShowflix(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
+                },
+                {
+                    if (!res.isAnime) invokeSFMovies(res.id, res.title, res.airedYear
+                            ?: res.year, res.season, res.episode, callback)
+                },
+                {
+                    invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+                },
         )
 
         return true

From 76c58dbfc386d3abd52b06404f3a113634552b34 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 3 Jan 2024 07:04:36 +0700
Subject: [PATCH 032/125] fix

---
 .../src/main/kotlin/com/hexated/SoraUtils.kt  | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 22c68cac..dbbd51de 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -9,7 +9,6 @@ import com.hexated.SoraStream.Companion.gdbot
 import com.hexated.SoraStream.Companion.hdmovies4uAPI
 import com.hexated.SoraStream.Companion.malsyncAPI
 import com.hexated.SoraStream.Companion.tvMoviesAPI
-import com.hexated.SoraStream.Companion.watchflxAPI
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.APIHolder.getCaptchaToken
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
@@ -46,7 +45,6 @@ import javax.crypto.spec.SecretKeySpec
 import kotlin.collections.ArrayList
 import kotlin.math.min
 
-var watchflxCookies: Map<String, String>? = null
 var filmxyCookies: Map<String, String>? = null
 var sfServer: String? = null
 
@@ -711,23 +709,6 @@ suspend fun fetchFilmxyCookies(url: String): Map<String, String> {
     return cookieJar.plus(defaultCookies)
 }
 
-suspend fun getWatchflxCookies() =
-    watchflxCookies ?: fetchWatchflxCookies().also { watchflxCookies = it }
-
-suspend fun fetchWatchflxCookies(): Map<String, String> {
-    session.get(watchflxAPI)
-    val cookies = session.baseClient.cookieJar.loadForRequest(watchflxAPI.toHttpUrl())
-        .associate { it.name to it.value }
-    val loginUrl = "$watchflxAPI/cookie-based-login"
-    session.post(
-        loginUrl, data = mapOf(
-            "continue_as_temp" to "true"
-        ), cookies = cookies, headers = mapOf("X-Requested-With" to "XMLHttpRequest")
-    )
-    return session.baseClient.cookieJar.loadForRequest(loginUrl.toHttpUrl())
-        .associate { it.name to it.value }
-}
-
 fun Document.findTvMoviesIframe(): String? {
     return this.selectFirst("script:containsData(var seconds)")?.data()?.substringAfter("href='")
         ?.substringBefore("'>")

From 7a343737e7a616d40a62160c5ad066e301a7edbc Mon Sep 17 00:00:00 2001
From: dontseehereStopMotion
 <149931560+dontseehereStopMotion@users.noreply.github.com>
Date: Wed, 3 Jan 2024 05:47:43 +0530
Subject: [PATCH 033/125] Add Animedekho (#488)

---
 AnimeDekhoProvider/build.gradle.kts           |  27 +++
 .../src/main/AndroidManifest.xml              |   2 +
 .../main/kotlin/com/anon/AnimeDekhoPlugin.kt  |  21 ++
 .../kotlin/com/anon/AnimeDekhoProvider.kt     | 198 ++++++++++++++++++
 4 files changed, 248 insertions(+)
 create mode 100644 AnimeDekhoProvider/build.gradle.kts
 create mode 100644 AnimeDekhoProvider/src/main/AndroidManifest.xml
 create mode 100644 AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt
 create mode 100644 AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt

diff --git a/AnimeDekhoProvider/build.gradle.kts b/AnimeDekhoProvider/build.gradle.kts
new file mode 100644
index 00000000..d50f2b6d
--- /dev/null
+++ b/AnimeDekhoProvider/build.gradle.kts
@@ -0,0 +1,27 @@
+version = 1
+
+
+cloudstream {
+    language = "hi"
+    // All of these properties are optional, you can safely remove them
+
+    description = "YOU HAVE SKIP ADS on the SITE each 24 hours, Hindi dubbed cartoons"
+    authors = listOf("anon")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "TvSeries",
+        "Movie",
+        "Anime",
+        "Cartoon"
+    )
+
+    iconUrl = "https://animedekho.com/wp-content/uploads/2023/07/AnimeDekho-Logo-300x-1.pngg"
+}
diff --git a/AnimeDekhoProvider/src/main/AndroidManifest.xml b/AnimeDekhoProvider/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..01dbafa1
--- /dev/null
+++ b/AnimeDekhoProvider/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.anon"/>
diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt
new file mode 100644
index 00000000..4e71f19a
--- /dev/null
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt
@@ -0,0 +1,21 @@
+package com.anon
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+// import com.lagradost.cloudstream3.utils.ExtractorApi
+// import com.lagradost.cloudstream3.utils.extractorApis
+
+@CloudstreamPlugin
+class AnimeDekhoPlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(AnimeDekhoProvider())
+        //addExtractor(MultiQualityXYZ())
+    }
+
+    // private fun addExtractor(element: ExtractorApi) {
+    //     element.sourcePlugin = __filename
+    //     extractorApis.add(0, element)
+    // }
+}
diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
new file mode 100644
index 00000000..cecd5719
--- /dev/null
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
@@ -0,0 +1,198 @@
+package com.anon
+
+import android.util.Log
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.extractors.DoodLaExtractor
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.nicehttp.Requests
+import com.lagradost.nicehttp.Session
+import kotlinx.coroutines.delay
+import org.jsoup.nodes.Element
+
+import com.lagradost.cloudstream3.network.WebViewResolver
+import com.lagradost.nicehttp.requestCreator
+
+import org.jsoup.Jsoup
+import java.util.regex.Pattern
+import okhttp3.Interceptor
+import okhttp3.Response
+
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.nicehttp.RequestBodyTypes
+import okhttp3.RequestBody.Companion.toRequestBody
+
+import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
+
+
+class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of MainAPI
+    override var mainUrl = "https://animedekho.com/"
+    override var name = "Anime Dekho"
+
+    override val hasMainPage = true
+
+    override var lang = "hi"
+    override val hasDownloadSupport = true
+
+    override val supportedTypes = setOf(
+        TvType.TvSeries,
+        TvType.Movie
+    )
+
+    override val mainPage = mainPageOf(
+        "/series/" to "Series",
+        "/movie/" to "Movies",
+        "/category/anime/" to "Anime",
+        "/category/cartoon/" to "Cartoon",
+        )
+
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+        val link = "$mainUrl${request.data}"
+        val document = app.get(link).document
+        //Log.d("TAGNAME", "$document")
+        val home = document.select("article").mapNotNull {
+            it.toSearchResult()
+        }
+        return newHomePageResponse(request.name, home)
+    }
+
+
+
+    private fun Element.toSearchResult(): AnimeSearchResponse? {
+        //val href = fixUrl(this.selectFirst("a")?.attr("href") ?: return null)
+        val href = this.selectFirst("a.lnk-blk")?.attr("href") ?: "null"
+        var title = this.selectFirst("header h2")?.text() ?: "null"
+        val posterUrl = this.selectFirst("div figure img")?.attr("src") ?: "null"
+
+        return newAnimeSearchResponse(title, href, TvType.Anime) {
+            this.posterUrl = posterUrl
+        }
+    }
+
+    override suspend fun search(query: String): List<AnimeSearchResponse> {
+        val document = app.get("$mainUrl/?s=$query").document
+        //return document.select("div.post-filter-image").mapNotNull {
+        return document.select("ul[data-results] li article").mapNotNull {
+            it.toSearchResult()
+        }
+    }
+
+    override suspend fun load(url: String): LoadResponse? {
+        
+        val document = app.get(url).document
+
+        var title = document?.selectFirst("h1.entry-title")?.text()?.trim()  ?: (document?.selectFirst("h3")?.text()?.trim() ?: "Null title")
+        val poster  = document?.selectFirst("div.post-thumbnail figure img")?.attr("src") ?: "null"
+        val plot  = document?.selectFirst("div.entry-content p")?.text()?.trim() ?: "null"
+        val year  = document?.selectFirst("span.year")?.text()?.trim()?.toInt() ?: 1990
+
+        var episodes = mutableListOf<Episode>()
+
+        val items = document.select("ul.seasons-lst li").mapNotNull {   
+            val name = it?.selectFirst("h3.title")?.text() ?: "null"
+            
+            val tempstring = it?.selectFirst("a")?.attr("href") ?: "null"
+
+            episodes.add( Episode(tempstring, name) )
+            }
+        
+        if(items.size==0){
+            val vidtoonoid = document?.selectFirst("iframe")?.attr("src") ?: "NULL"
+            val vidlink = app.get(vidtoonoid)?.document?.selectFirst("div iframe")?.attr("src") ?: "null"
+            return newMovieLoadResponse(title, vidlink, TvType.Movie, vidlink) {
+                this.posterUrl = poster.toString()
+                this.plot = plot
+                this.year = year
+                //this.recommendations = recommendations
+            }
+        }
+        else{
+            return newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
+                this.posterUrl = poster.toString()
+                this.plot = plot
+                this.year = year
+                //this.recommendations = recommendations
+            }
+        }   
+        
+    }
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+
+
+        var vidlink = ""
+
+        if(data.contains("https://vidxstream.xyz")){
+            vidlink = data
+        }
+        else{
+
+            val page1 = app.get(data).document
+
+            val name = page1?.selectFirst("body")?.attr("class") ?: "null"
+
+            var term = Regex("""\bterm-(\d+)\b""").find(name)?.value!!?.replace("term-","")
+
+
+            vidlink = app.get("https://animedekho.com/?trembed=0&trid="+term)
+                                .document?.selectFirst("iframe")?.attr("src") ?: "null"
+        }
+
+        //Log.d("TAGNAME", "vidlink $vidlink") //https://vidxstream.xyz/v/H0Rh3ixVLJKk/
+
+        val body = app.get(vidlink).text
+
+
+        val master = Regex("""JScript[\w+]?\s*=\s*'([^']+)""").find(body)!!.groupValues?.get(1)
+
+        val decrypt = cryptoAESHandler(master ?: return false, "4MmH9EsZrq0WEekn".toByteArray(), false)?.replace("\\", "") ?: "ERROR"
+
+        val vidfinal = Regex("""file:\s*\"(https:[^\"]+)\"""").find(decrypt)!!.groupValues?.get(1)
+        
+
+        val headers = mapOf(
+            "accept" to "*/*",
+            "accept-language" to "en-US,en;q=0.5",
+            "Origin" to "https://vidxstream.xyz",
+            "Accept-Encoding" to "gzip, deflate, br",
+            "Connection" to "keep-alive",
+            //"Referer" to "https://vidxstream.xyz/",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "cross-site",
+            "user-agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/116.0",
+                )
+        
+        callback.invoke(
+                            ExtractorLink(
+                                source = "Toon",
+                                name = "Toon",
+                                url = vidfinal!!,
+                                referer = "https://vidxstream.xyz/",
+                                quality = Qualities.Unknown.value,
+                                isM3u8 = true,
+                                headers = headers,
+                                
+                            )
+                        )
+        
+        
+                             
+
+        return true
+
+        
+    }
+
+    
+}
+

From 53d3519b8fff2e636e14aafc4453358453bb7eae Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 4 Jan 2024 15:29:33 +0700
Subject: [PATCH 034/125] fix #491

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |  5 ----
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 29 ++++++++++++-------
 .../kotlin/com/hexated/SoraStreamPlugin.kt    |  1 -
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index f157e229..2bc22cc2 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 212
+version = 213
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 1674ebc2..880238b5 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -396,11 +396,6 @@ class Embedwish : Filesim() {
     override val name = "Embedwish"
     override var mainUrl = "https://embedwish.com"
 }
-
-class Vidplay2 : Vidplay() {
-    override val mainUrl = "https://vidplay.online"
-}
-
 class Flaswish : Filesim() {
     override val name = "Flaswish"
     override var mainUrl = "https://flaswish.com"
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 5e556735..8745e4e7 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -715,7 +715,7 @@ object SoraExtractor : SoraStream() {
                     child.select("span").text().equals("Episode $episode", true)
                 }?.attr("href")
             }
-        }.filter { it.first.contains(Regex("(2160p)|(1080p)")) }
+        }.filter { it.first.contains(Regex("(2160p)|(1080p)")) }.reversed().takeLast(3)
 
         iframeList.apmap { (quality, link) ->
             val driveLink = bypassHrefli(link ?: return@apmap)
@@ -768,16 +768,25 @@ object SoraExtractor : SoraStream() {
         val hTag = if (season == null) "h5" else "h3"
         val aTag = if (season == null) "Download Now" else "V-Cloud"
         val sTag = if (season == null) "" else "(Season $season|S$seasonSlug)"
-        val entry = res.select("div.entry-content > $hTag:matches((?i)$sTag.*(1080p|2160p))").findLast { element -> !element.text().contains("Download", true) }
-                ?: return
-        val tags = """(?:1080p|2160p)(.*)""".toRegex().find(entry.text())?.groupValues?.get(1)?.trim()
-        val href = entry.nextElementSibling()?.select("a:contains($aTag)")?.attr("href")
-        val selector = if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
-        val server = app.get(href
-                ?: return, interceptor = wpredisInterceptor).document.selectFirst("div.entry-content > $selector")?.attr("href")
-                ?: return
+        val entries = res.select("div.entry-content > $hTag:matches((?i)$sTag.*(1080p|2160p))").filter { element -> !element.text().contains("Download", true) }.takeLast(2)
+        entries.apmap {
+            val tags = """(?:1080p|2160p)(.*)""".toRegex().find(it.text())?.groupValues?.get(1)?.trim()
+            val href = it.nextElementSibling()?.select("a:contains($aTag)")?.attr("href")
+            val selector = if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
+            val server = app.get(
+                    href ?: return@apmap, interceptor = wpredisInterceptor
+            ).document.selectFirst("div.entry-content > $selector")
+                    ?.attr("href") ?: return@apmap
 
-        loadCustomTagExtractor(tags, server, "$api/", subtitleCallback, callback, getIndexQuality(entry.text()))
+            loadCustomTagExtractor(
+                    tags,
+                    server,
+                    "$api/",
+                    subtitleCallback,
+                    callback,
+                    getIndexQuality(it.text())
+            )
+        }
     }
 
     suspend fun invokeHdmovies4u(title: String? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
index c6cd296e..d2456f6e 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
@@ -28,7 +28,6 @@ class SoraStreamPlugin: Plugin() {
         registerExtractorAPI(Wishfast())
         registerExtractorAPI(Uploadever())
         registerExtractorAPI(Netembed())
-        registerExtractorAPI(Vidplay2())
         registerExtractorAPI(Flaswish())
         registerExtractorAPI(Comedyshow())
     }

From caca55f9ec65c2937720afcff0c04488cfcc8484 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 4 Jan 2024 17:47:26 +0700
Subject: [PATCH 035/125] Gomov: update domain

---
 Gomov/build.gradle.kts                          | 2 +-
 Gomov/src/main/kotlin/com/hexated/DutaMovie.kt  | 2 +-
 Gomov/src/main/kotlin/com/hexated/Ngefilm.kt    | 2 +-
 Gomov/src/main/kotlin/com/hexated/Nodrakorid.kt | 2 +-
 Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gomov/build.gradle.kts b/Gomov/build.gradle.kts
index dd797cdd..d4cc776c 100644
--- a/Gomov/build.gradle.kts
+++ b/Gomov/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 29
+version = 30
 
 android {
     defaultConfig {
diff --git a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt
index 0643ffe2..64ebf253 100644
--- a/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt
+++ b/Gomov/src/main/kotlin/com/hexated/DutaMovie.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.httpsify
 import com.lagradost.cloudstream3.utils.loadExtractor
 
 class DutaMovie : Gomov() {
-    override var mainUrl = "https://drama.dutamovie21.tech/"
+    override var mainUrl = "https://yandex.dutamovie21.tech"
     override var name = "DutaMovie"
     override val mainPage = mainPageOf(
         "category/box-office/page/%d/" to "Box Office",
diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
index 5061d790..a54a5003 100644
--- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Ngefilm : Gomov() {
-    override var mainUrl = "https://tv2.ngefilm21.homes"
+    override var mainUrl = "https://tv3.ngefilm21.homes"
     override var name = "Ngefilm"
     override val mainPage = mainPageOf(
         "/page/%d/?s&search=advanced&post_type=movie&index&orderby&genre&movieyear&country&quality=" to "Movies Terbaru",
diff --git a/Gomov/src/main/kotlin/com/hexated/Nodrakorid.kt b/Gomov/src/main/kotlin/com/hexated/Nodrakorid.kt
index c697f403..90de7c15 100644
--- a/Gomov/src/main/kotlin/com/hexated/Nodrakorid.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Nodrakorid.kt
@@ -9,7 +9,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 class Nodrakorid : Gomov() {
-    override var mainUrl = "https://no-dra-kor-id.shop"
+    override var mainUrl = "https://no1.nodrakor.store"
     override var name = "Nodrakorid"
 
     override val mainPage = mainPageOf(
diff --git a/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt b/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
index aabb0ecd..e6053bf6 100644
--- a/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.*
 
 class Pusatfilm : Gomov() {
-    override var mainUrl = "https://tv2.pusatfilm21.art"
+    override var mainUrl = "https://pusatfilm21.vip"
     override var name = "Pusatfilm"
     override val mainPage = mainPageOf(
         "film-terbaru/page/%d/" to "Film Terbaru",

From 0740da3b1aec660dc96d342d74b430b89d64b391 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 09:15:23 +0700
Subject: [PATCH 036/125] fix #497

---
 SoraStream/build.gradle.kts                             | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 2bc22cc2..7ee3b812 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 213
+version = 214
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 8745e4e7..07b6c2cf 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1467,7 +1467,7 @@ object SoraExtractor : SoraStream() {
             "_ApplicationId": "SHOWFLIXAPPID",
             "_JavaScriptKey": "SHOWFLIXMASTERKEY",
             "_ClientVersion": "js3.4.1",
-            "_InstallationId": "6d19fd87-a0e8-47b2-a3c0-48c16add928b"
+            "_InstallationId": "d92d98d3-fa49-4103-8dcf-6347c86942a7"
         }
     """.trimIndent().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
 

From fd5d4afc228cf15617bc80e12a0507789dc249c6 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 09:28:31 +0700
Subject: [PATCH 037/125] fix Samehadaku

---
 Samehadaku/build.gradle.kts                   |   2 +-
 .../src/main/kotlin/com/hexated/Samehadaku.kt | 128 +++++++++---------
 2 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/Samehadaku/build.gradle.kts b/Samehadaku/build.gradle.kts
index 0ef8f5ed..e816d7c9 100644
--- a/Samehadaku/build.gradle.kts
+++ b/Samehadaku/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 19
+version = 20
 
 
 cloudstream {
diff --git a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
index b31f4c7e..666202be 100644
--- a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
+++ b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
@@ -4,6 +4,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -16,11 +17,11 @@ class Samehadaku : MainAPI() {
     override var lang = "id"
     override val hasDownloadSupport = true
     override val supportedTypes = setOf(
-        TvType.Anime,
-        TvType.AnimeMovie,
-        TvType.OVA
+            TvType.Anime,
+            TvType.AnimeMovie,
+            TvType.OVA
     )
-
+    private val interceptor = CloudflareKiller()
     companion object {
         const val acefile = "https://acefile.co"
 
@@ -40,18 +41,18 @@ class Samehadaku : MainAPI() {
     }
 
     override val mainPage = mainPageOf(
-        "$mainUrl/page/" to "Episode Terbaru",
-        "$mainUrl/" to "HomePage",
+            "$mainUrl/page/" to "Episode Terbaru",
+            "$mainUrl/" to "HomePage",
     )
 
     override suspend fun getMainPage(
-        page: Int,
-        request: MainPageRequest
+            page: Int,
+            request: MainPageRequest
     ): HomePageResponse {
         val items = mutableListOf<HomePageList>()
 
         if (request.name != "Episode Terbaru" && page <= 1) {
-            val doc = app.get(request.data).document
+            val doc = app.get(request.data, interceptor = interceptor).document
             doc.select("div.widget_senction:not(:contains(Baca Komik))").forEach { block ->
                 val header = block.selectFirst("div.widget-title h3")?.ownText() ?: return@forEach
                 val home = block.select("div.animepost").mapNotNull {
@@ -62,7 +63,7 @@ class Samehadaku : MainAPI() {
         }
 
         if (request.name == "Episode Terbaru") {
-            val home = app.get(request.data + page).document.selectFirst("div.post-show")?.select("ul li")
+            val home = app.get(request.data + page, interceptor = interceptor).document.selectFirst("div.post-show")?.select("ul li")
                     ?.mapNotNull {
                         it.toSearchResult()
                     } ?: throw ErrorLoadingException("No Media Found")
@@ -75,19 +76,20 @@ class Samehadaku : MainAPI() {
 
     private fun Element.toSearchResult(): AnimeSearchResponse? {
         val title = this.selectFirst("div.title, h2.entry-title a, div.lftinfo h2")?.text()?.trim()
-            ?: return null
+                ?: return null
         val href = fixUrlNull(this.selectFirst("a")?.attr("href") ?: return null)
         val posterUrl = fixUrlNull(this.select("img").attr("src"))
         val epNum = this.selectFirst("div.dtla author")?.text()?.toIntOrNull()
         return newAnimeSearchResponse(title, href ?: return null, TvType.Anime) {
             this.posterUrl = posterUrl
             addSub(epNum)
+            posterHeaders = interceptor.getCookieHeaders(mainUrl).toMap()
         }
 
     }
 
     override suspend fun search(query: String): List<SearchResponse> {
-        val document = app.get("$mainUrl/?s=$query").document
+        val document = app.get("$mainUrl/?s=$query", interceptor = interceptor).document
         return document.select("main#main div.animepost").mapNotNull {
             it.toSearchResult()
         }
@@ -97,10 +99,10 @@ class Samehadaku : MainAPI() {
         val fixUrl = if (url.contains("/anime/")) {
             url
         } else {
-            app.get(url).document.selectFirst("div.nvs.nvsc a")?.attr("href")
+            app.get(url, interceptor = interceptor).document.selectFirst("div.nvs.nvsc a")?.attr("href")
         }
 
-        val document = app.get(fixUrl ?: return null).document
+        val document = app.get(fixUrl ?: return null, interceptor = interceptor).document
         val title = document.selectFirst("h1.entry-title")?.text()?.removeBloat() ?: return null
         val poster = document.selectFirst("div.thumb > img")?.attr("src")
         val tags = document.select("div.genre-info > a").map { it.text() }
@@ -108,11 +110,11 @@ class Samehadaku : MainAPI() {
             Regex("\\d,\\s(\\d*)").find(it)?.groupValues?.getOrNull(1)?.toIntOrNull()
         }
         val status = getStatus(
-            document.selectFirst("div.spe > span:contains(Status)")?.ownText() ?: return null
+                document.selectFirst("div.spe > span:contains(Status)")?.ownText() ?: return null
         )
         val type =
-            getType(document.selectFirst("div.spe > span:contains(Type)")?.ownText()?.trim()?.lowercase()
-                ?: "tv")
+                getType(document.selectFirst("div.spe > span:contains(Type)")?.ownText()?.trim()?.lowercase()
+                        ?: "tv")
         val rating = document.selectFirst("span.ratingValue")?.text()?.trim()?.toRatingInt()
         val description = document.select("div.desc p").text().trim()
         val trailer = document.selectFirst("div.trailer-anime iframe")?.attr("src")
@@ -120,7 +122,7 @@ class Samehadaku : MainAPI() {
         val episodes = document.select("div.lstepsiode.listeps ul li").mapNotNull {
             val header = it.selectFirst("span.lchx > a") ?: return@mapNotNull null
             val episode = Regex("Episode\\s?(\\d+)").find(header.text())?.groupValues?.getOrNull(1)
-                ?.toIntOrNull()
+                    ?.toIntOrNull()
             val link = fixUrl(header.attr("href"))
             Episode(link, episode = episode)
         }.reversed()
@@ -145,73 +147,75 @@ class Samehadaku : MainAPI() {
             this.recommendations = recommendations
             addMalId(tracker?.malId)
             addAniListId(tracker?.aniId?.toIntOrNull())
+            posterHeaders = interceptor.getCookieHeaders(mainUrl).toMap()
         }
 
     }
 
     override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            data: String,
+            isCasting: Boolean,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ): Boolean {
 
-        val document = app.get(data).document
+        val document = app.get(data, interceptor = interceptor).document
 
         argamap(
-            {
-                document.select("div#server ul li div").apmap {
-                    val dataPost = it.attr("data-post")
-                    val dataNume = it.attr("data-nume")
-                    val dataType = it.attr("data-type")
+                {
+                    document.select("div#server ul li div").apmap {
+                        val dataPost = it.attr("data-post")
+                        val dataNume = it.attr("data-nume")
+                        val dataType = it.attr("data-type")
 
-                    val iframe = app.post(
-                        url = "$mainUrl/wp-admin/admin-ajax.php",
-                        data = mapOf(
-                            "action" to "player_ajax",
-                            "post" to dataPost,
-                            "nume" to dataNume,
-                            "type" to dataType
-                        ),
-                        referer = data,
-                        headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-                    ).document.select("iframe").attr("src")
+                        val iframe = app.post(
+                                url = "$mainUrl/wp-admin/admin-ajax.php",
+                                data = mapOf(
+                                        "action" to "player_ajax",
+                                        "post" to dataPost,
+                                        "nume" to dataNume,
+                                        "type" to dataType
+                                ),
+                                referer = data,
+                                headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
+                                interceptor = interceptor
+                        ).document.select("iframe").attr("src")
 
-                    loadFixedExtractor(fixedIframe(iframe), it.text(), "$mainUrl/", subtitleCallback, callback)
+                        loadFixedExtractor(fixedIframe(iframe), it.text(), "$mainUrl/", subtitleCallback, callback)
 
-                }
-            },
-            {
-                document.select("div#downloadb li").map { el ->
-                    el.select("a").apmap {
-                        loadFixedExtractor(fixedIframe(it.attr("href")), el.select("strong").text(), "$mainUrl/", subtitleCallback, callback)
+                    }
+                },
+                {
+                    document.select("div#downloadb li").map { el ->
+                        el.select("a").apmap {
+                            loadFixedExtractor(fixedIframe(it.attr("href")), el.select("strong").text(), "$mainUrl/", subtitleCallback, callback)
+                        }
                     }
                 }
-            }
         )
 
         return true
     }
 
     private suspend fun loadFixedExtractor(
-        url: String,
-        name: String,
-        referer: String? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            url: String,
+            name: String,
+            referer: String? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ) {
         loadExtractor(url, referer, subtitleCallback) { link ->
             callback.invoke(
-                ExtractorLink(
-                    link.name,
-                    link.name,
-                    link.url,
-                    link.referer,
-                    name.fixQuality(),
-                    link.type,
-                    link.headers,
-                    link.extractorData
-                )
+                    ExtractorLink(
+                            link.name,
+                            link.name,
+                            link.url,
+                            link.referer,
+                            name.fixQuality(),
+                            link.type,
+                            link.headers,
+                            link.extractorData
+                    )
             )
         }
     }

From 1f461af2a116ded2b4f372df85ebacab7d0c3a98 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 13:00:38 +0700
Subject: [PATCH 038/125] fix #494

---
 .../src/main/kotlin/com/hexated/Samehadaku.kt |   2 +-
 TimefourTv/build.gradle.kts                   |   2 +-
 .../src/main/kotlin/com/hexated/TimefourTv.kt | 304 ++++++++----------
 .../kotlin/com/hexated/TimefourTvExtractor.kt | 136 --------
 4 files changed, 135 insertions(+), 309 deletions(-)
 delete mode 100644 TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt

diff --git a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
index 666202be..144f8fd6 100644
--- a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
+++ b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
@@ -21,7 +21,7 @@ class Samehadaku : MainAPI() {
             TvType.AnimeMovie,
             TvType.OVA
     )
-    private val interceptor = CloudflareKiller()
+    private val interceptor by lazy { CloudflareKiller() }
     companion object {
         const val acefile = "https://acefile.co"
 
diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index 7a9bafec..a5a44fd9 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 20
+version = 21
 
 
 cloudstream {
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
index e301ae02..17256e0a 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
@@ -1,220 +1,182 @@
 package com.hexated
 
-import com.hexated.TimefourTvExtractor.getBaseUrl
-import com.hexated.TimefourTvExtractor.getLink
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
-import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
+import java.net.URI
 
-open class TimefourTv : MainAPI() {
-    final override var mainUrl = "https://time4tv.stream"
-    var daddyUrl = "https://daddylivehd.com"
+class TimefourTv : MainAPI() {
+    override var mainUrl = "https://dlhd.sx"
     override var name = "Time4tv"
     override val hasDownloadSupport = false
     override val hasMainPage = true
-    private val time4tvPoster = "$mainUrl/images/logo.png"
     override val supportedTypes = setOf(
-        TvType.Live
+            TvType.Live
     )
 
+    private val homePoster =
+            "https://cdn.discordapp.com/attachments/1109266606292488297/1193060449193840681/Screenshot_2024-01-06_at_12-14-16_Logo_Maker_Used_By_2.3_Million_Startups.png"
+    private val detailPoster =
+            "https://cdn.discordapp.com/attachments/1109266606292488297/1193060448929595454/Screenshot_2024-01-06_at_12-13-02_Logo_Maker_Used_By_2.3_Million_Startups.png"
+
     override val mainPage = mainPageOf(
-//        "$mainUrl/tv-channels" to "All Channels",
-//        "$mainUrl/usa-channels" to "USA Channels",
-//        "$mainUrl/uk-channels" to "UK Channels",
-//        "$mainUrl/sports-channels" to "Sport Channels",
-//        "$mainUrl/live-sports-streams" to "Live Sport Channels",
-//        "$mainUrl/news-channels" to "News Channels",
-//        "$mainUrl/schedule.php" to "Schedule",
-        "$daddyUrl/24-7-channels.php" to "DaddyHD Channels"
+            "$mainUrl/24-7-channels.php" to "24/7 Channels",
+            "$mainUrl/schedule/schedule-generated.json" to "Schedule Channels"
     )
 
-    private fun fixDetailLink(link: String?): String? {
-        if (link == null) return null
-        return if (link.startsWith("/")) "$daddyUrl$link" else link
-    }
-
     override suspend fun getMainPage(
-        page: Int,
-        request: MainPageRequest
+            page: Int,
+            request: MainPageRequest
     ): HomePageResponse {
         val items = mutableListOf<HomePageList>()
-        val nonPaged = request.name != "All Channels" && page <= 1
-        if (nonPaged) {
-            val res = app.get("${request.data}.php").document
-            val home = res.select("div.tab-content ul li").mapNotNull {
-                it.toSearchResult()
+        if (request.name == "24/7 Channels") {
+            val req = app.get(request.data)
+            mainUrl = getBaseUrl(req.url)
+            val res = req.document
+            val channels = res.select("div.grid-container div.grid-item").mapNotNull {
+                it.toSearchResponse()
             }
-            if (home.isNotEmpty()) items.add(HomePageList(request.name, home, true))
-        }
-        if (request.name == "All Channels") {
-            val res = if (page == 1) {
-                app.get("${request.data}.php").document
-            } else {
-                app.get("${request.data}${page.minus(1)}.php").document
+            if (channels.isNotEmpty()) items.add(HomePageList(request.name, channels, true))
+        } else {
+            val res = app.get(request.data).parsedSafe<Map<String, Map<String, ArrayList<Items>>>>()
+            res?.forEach { tag ->
+                val header = tag.key
+                val channels = tag.value.mapNotNull {
+                    LiveSearchResponse(
+                            it.key,
+                            Item(it.key, items = it.value.toJson()).toJson(),
+                            this@TimefourTv.name,
+                            TvType.Live,
+                            posterUrl = homePoster,
+                    )
+                }
+                if (channels.isNotEmpty()) items.add(HomePageList(header, channels, true))
             }
-            val home = res.select("div.tab-content ul li").mapNotNull {
-                it.toSearchResult()
-            }
-            if (home.isNotEmpty()) items.add(HomePageList(request.name, home, true))
         }
 
-        if (nonPaged && request.name == "DaddyHD Channels") {
-            val res = app.get(request.data).document
-            val channelDaddy = res.select("div.grid-container div.grid-item").mapNotNull {
-                it.toSearchDaddy()
-            }
-            if (channelDaddy.isNotEmpty()) items.add(HomePageList(request.name, channelDaddy, true))
-        }
-
-        if (nonPaged && request.name == "Schedule") {
-            val res = app.get(request.data).document
-            val schedule = res.select("div.search_p h1,div.search_p h2").mapNotNull {
-                it.toSearchSchedule()
-            }
-            if (schedule.isNotEmpty()) items.add(HomePageList(request.name, schedule, true))
-        }
-
-        return newHomePageResponse(items)
+        return newHomePageResponse(items, false)
     }
 
-    private fun Element.toSearchDaddy(): LiveSearchResponse? {
+    private fun Element.toSearchResponse(): LiveSearchResponse {
+        val title = this.select("strong").text()
+        val href = fixUrl(this.select("a").attr("href"))
         return LiveSearchResponse(
-            this.select("strong").text() ?: return null,
-            fixDetailLink(this.select("a").attr("href")) ?: return null,
-            this@TimefourTv.name,
-            TvType.Live,
-            posterUrl = time4tvPoster
+                title,
+                Item(title, href).toJson(),
+                this@TimefourTv.name,
+                TvType.Live,
+                posterUrl = homePoster,
         )
     }
 
-    private fun Element.toSearchSchedule(): LiveSearchResponse? {
-        return LiveSearchResponse(
-            this.text() ?: return null,
-            this.text(),
-            this@TimefourTv.name,
-            TvType.Live,
-            posterUrl = time4tvPoster
-        )
-    }
-
-    private fun Element.toSearchResult(): LiveSearchResponse? {
-        return LiveSearchResponse(
-            this.selectFirst("div.channelName")?.text() ?: return null,
-            fixUrl(this.selectFirst("a")!!.attr("href")),
-            this@TimefourTv.name,
-            TvType.Live,
-            fixUrlNull(this.selectFirst("img")?.attr("src")),
-        )
-
-    }
-
     override suspend fun search(query: String): List<SearchResponse> {
-        val document = app.get("$daddyUrl/24-7-channels.php").document
+        val document = app.get("$mainUrl/24-7-channels.php").document
         return document.select("div.grid-container div.grid-item:contains($query)").mapNotNull {
-            it.toSearchDaddy()
+            it.toSearchResponse()
         }
     }
 
-    private suspend fun loadSchedule(url: String): LoadResponse {
-        val name = url.removePrefix("$mainUrl/")
-        val doc = app.get("$mainUrl/schedule.php").document
-        val episode = mutableListOf<Episode>()
-        doc.selectFirst("div.search_p h2:contains($name)")?.nextElementSiblings()?.toString()
-            ?.substringBefore("<h2")?.split("<br>")?.map {
-                val desc = it.substringBefore("<span").replace(Regex("</?strong>"), "").replace("<p>", "")
-                Jsoup.parse(it).select("span").map { ele ->
-                    val title = ele.select("a").text()
-                    val href = ele.select("a").attr("href")
-                    episode.add(
-                        Episode(
-                            href,
-                            title,
-                            description = desc,
-                            posterUrl = time4tvPoster
-                        )
-                    )
-                }
+
+    override suspend fun load(url: String): LoadResponse {
+        val data = AppUtils.parseJson<Item>(url)
+        val episodes = if (data.items.isNullOrEmpty()) {
+            listOf(Episode(arrayListOf(Channels(data.title, data.url)).toJson()))
+        } else {
+            val items = AppUtils.parseJson<ArrayList<Items>>(data.items)
+            items.mapNotNull {
+                Episode(
+                        data = it.channels?.toJson() ?: return@mapNotNull null,
+                        name = "${it.event} - Live",
+                        description = it.time,
+                        posterUrl = detailPoster,
+                )
             }
-
-        return newTvSeriesLoadResponse(name, url, TvType.TvSeries, episode) {
         }
-    }
-
-    override suspend fun load(url: String): LoadResponse? {
-
-        val res = app.get(url)
-        daddyUrl = getBaseUrl(res.url)
-        if (!res.isSuccessful) return loadSchedule(url)
-
-        val document = res.document
-        val title =
-            document.selectFirst("div.channelHeading h1")?.text() ?: document.selectFirst("title")
-                ?.text()?.substringBefore("HD")?.trim() ?: return null
-        val poster =
-            fixUrlNull(document.selectFirst("meta[property=\"og:image\"]")?.attr("content")) ?: time4tvPoster
-        val description = document.selectFirst("div.tvText")?.text()
-            ?: document.selectFirst("meta[name=description]")?.attr("content") ?: return null
-        val episodes = document.selectFirst("div.playit")?.attr("onclick")?.substringAfter("open('")
-            ?.substringBefore("',")?.let { link ->
-                val doc = app.get(link).document.selectFirst("div.tv_palyer iframe")?.attr("src")
-                    ?.let { iframe ->
-                        app.get(fixUrl(iframe), referer = link).document
-                    }
-                if (doc?.select("div.stream_button").isNullOrEmpty()) {
-                    doc?.select("iframe")?.mapIndexed { eps, ele ->
-                        Episode(
-                            fixUrl(ele.attr("src")),
-                            "Server ${eps.plus(1)}"
-                        )
-                    }
-                } else {
-                    doc?.select("div.stream_button a")?.map {
-                        Episode(
-                            fixUrl(it.attr("href")),
-                            it.text()
-                        )
-                    }
-                }
-            } ?: listOf(
-            newEpisode(
-                document.selectFirst("div#content iframe#thatframe")?.attr("src") ?: return null
-            ) {
-                this.name = title
-            }
-        ) ?: throw ErrorLoadingException("Refresh page")
-        return newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
-            this.posterUrl = poster
-            this.plot = description
+        return newTvSeriesLoadResponse(
+                data.title ?: "",
+                url,
+                TvType.TvSeries,
+                episodes = episodes
+        ) {
+            posterUrl = homePoster
         }
+
     }
 
     override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            data: String,
+            isCasting: Boolean,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ): Boolean {
 
-        val link = when {
-            data.contains("/channel") -> app.get(data).document.selectFirst("div.tv_palyer iframe")
-                ?.attr("src")
-            data.startsWith(mainUrl) -> app.get(
-                data,
-                allowRedirects = false
-            ).document.selectFirst("iframe")?.attr("src")
-            else -> data
-        } ?: throw ErrorLoadingException()
-        getLink(fixUrl(link))?.let { m3uLink ->
-            val url = app.get(m3uLink, referer = "$mainServer/")
+        val json = AppUtils.parseJson<ArrayList<Channels>>(data)
+
+        json.apmap {
+            val iframe = app.get(
+                    fixChannelUrl(
+                            it.channel_id ?: return@apmap
+                    )
+            ).document.selectFirst("iframe#thatframe")?.attr("src")
+                    ?: throw ErrorLoadingException("No Iframe Found")
+            val host = getBaseUrl(iframe)
+            val video = extractVideo(iframe)
+
             M3u8Helper.generateM3u8(
-                this.name,
-                url.url,
-                "$mainServer/",
+                    it.channel_name ?: return@apmap,
+                    video ?: return@apmap,
+                    "$host/",
             ).forEach(callback)
         }
+
         return true
     }
 
+    private suspend fun extractVideo(url: String): String? {
+        val res = app.get(url, referer = mainUrl)
+        return Regex("""source:['"](\S+.m3u8)['"],""").find(res.text)?.groupValues?.getOrNull(
+                1
+        ) ?: run {
+            val scriptData =
+                    res.document.selectFirst("div#player")?.nextElementSibling()?.data()
+                            ?.substringAfterLast("return(")?.substringBefore(".join")
+            scriptData?.removeSurrounding("[", "]")?.replace("\"", "")?.split(",")
+                    ?.joinToString("")
+        }
+    }
+
+    private fun fixChannelUrl(url: String): String {
+        return if (url.startsWith(mainUrl)) {
+            url
+        } else {
+            "$mainUrl/stream/stream-$url.php"
+        }
+    }
+
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+
+    data class Item(
+            val title: String? = null,
+            val url: String? = null,
+            val items: String? = null,
+    )
+
+    data class Items(
+            val time: String? = null,
+            val event: String? = null,
+            val channels: ArrayList<Channels>? = arrayListOf(),
+    )
+
+    data class Channels(
+            val channel_name: String? = null,
+            val channel_id: String? = null,
+    )
+
 }
\ No newline at end of file
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt
deleted file mode 100644
index 60c415cb..00000000
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.hexated
-
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.fixUrl
-import com.lagradost.cloudstream3.utils.getAndUnpack
-import com.lagradost.nicehttp.NiceResponse
-import java.net.URI
-
-var mainServer: String? = null
-
-object TimefourTvExtractor : TimefourTv() {
-
-    fun getBaseUrl(url: String): String {
-        return URI(url).let {
-            "${it.scheme}://${it.host}"
-        }
-    }
-
-    private suspend fun getSportLink(url: String): String? {
-        val iframe = app.get(url, referer = "$mainUrl/").document.select("iframe").attr("src")
-            .let { fixUrl(it) }
-        val ref = getBaseUrl(url)
-        val data = app.get(iframe, referer = ref).document.select("script")
-            .find { it.data().contains("eval(function(p,a,c,k,e,d)") }?.data()
-            .let { getAndUnpack(it.toString()) }
-
-        mainServer = getBaseUrl(iframe)
-
-        return Regex("var\\ssrc=['|\"](.*?.m3u8.*?)['|\"];").find(data)?.groupValues?.get(1)
-
-    }
-
-    private suspend fun getCricfreeLink(url: String, ref: String): String? {
-        val doc = app.get(url, referer = ref).document
-        val iframe = doc.select("iframe").attr("src")
-        val channel = iframe.split("/").last().removeSuffix(".php")
-        val refTwo = getBaseUrl(url)
-
-        val docTwo =
-            app.get(fixUrl(iframe), referer = refTwo).document.selectFirst("script[src*=embed.]")
-                ?.attr("src")
-        val refThree = getBaseUrl(iframe)
-        val linkTwo = fixUrl("${docTwo?.replace(".js", ".php")}?player=desktop&live=$channel")
-
-        val docThree = app.get(
-            linkTwo,
-            referer = "$refThree/",
-        )
-        mainServer = getBaseUrl(linkTwo)
-
-        val scriptData = docThree.document.selectFirst("div#player")?.nextElementSibling()?.data()
-            ?.substringAfterLast("return(")?.substringBefore(".join")
-        val link = scriptData?.removeSurrounding("[", "]")?.replace("\"", "")?.split(",")
-            ?.joinToString("") ?: return null
-        return app.get(link, referer = "$mainUrl/").url
-    }
-
-    private suspend fun getFootyhunter(url: String, ref: String): String? {
-        val doc = app.get(url, referer = ref).document
-        val iframe = doc.selectFirst("iframe")?.attr("src") ?: return null
-        val referer = getBaseUrl(url)
-        val docTwo = app.get(fixUrl(iframe), referer = "$referer/").text
-        mainServer = getBaseUrl(iframe)
-        val link = Regex("""source:['|"](\S+.m3u8)['|"],""").find(docTwo)?.groupValues?.getOrNull(1)
-            ?: return null
-        return app.get(link, referer = "$mainUrl/").url
-    }
-
-    suspend fun getLink(url: String): String? {
-
-        if (url.contains("sportzonline") || url.contains("sportsonline")) {
-            return getSportLink(url)
-        }
-
-        val daddyHost = daddyUrl.getHost()
-
-        if(url.contains(daddyHost, true)) {
-            mainServer = getBaseUrl(url)
-            return getFinalLink(app.get(url, referer = daddyUrl))
-        }
-
-        val (channel, iframe) = if (url.contains("width=") || url.contains("/link")) {
-            val doc = app.get(url, referer = "$mainUrl/").document
-            val tempIframe = doc.selectFirst("iframe")?.attr("src") ?: return null
-
-            if (tempIframe.contains("cricfree")) {
-                return getCricfreeLink(tempIframe, getBaseUrl(url))
-            }
-            if (tempIframe.contains("footyhunter")) {
-                return getFootyhunter(tempIframe, getBaseUrl(url))
-            }
-
-            val doctwo = app.get(fixUrl(tempIframe), referer = url).text
-            listOf(
-                tempIframe.split("?").last().removePrefix("id=").replace(".php", ""),
-                doctwo.substringAfterLast("<iframe  src=\"").substringBefore("'+")
-            )
-        } else {
-            val doc = app.get(url, referer = "$mainUrl/").text
-            listOf(
-                url.split("?").last().removePrefix("id=").replace(".php", ""),
-                doc.substringAfterLast("<iframe  src=\"").substringBefore("'+")
-            )
-        }
-
-        val linkFirst = if(iframe.contains(daddyHost)) "${iframe.substringAfter("?")}$channel.php" else "$iframe$channel.php"
-        val refFirst = getBaseUrl(url)
-
-        val docSecond = app.get(fixUrl(linkFirst), referer = refFirst).document
-        val iframeSecond = docSecond.select("iframe:last-child, iframe#thatframe").attr("src")
-
-        val refSecond = getBaseUrl(linkFirst)
-        val docThird = app.get(fixUrl(iframeSecond), referer = "$refSecond/")
-        mainServer = getBaseUrl(iframeSecond)
-
-        return getFinalLink(docThird)
-
-    }
-
-    private fun getFinalLink(res: NiceResponse): String? {
-        return Regex("""source:['|"](\S+.m3u8)['|"],""").find(res.text)?.groupValues?.getOrNull(
-            1
-        ) ?: run {
-            val scriptData =
-                res.document.selectFirst("div#player")?.nextElementSibling()?.data()
-                    ?.substringAfterLast("return(")?.substringBefore(".join")
-            scriptData?.removeSurrounding("[", "]")?.replace("\"", "")?.split(",")
-                ?.joinToString("")
-        }
-    }
-
-    private fun String.getHost(): String {
-        return URI(this).host.substringBeforeLast(".").substringAfterLast(".")
-    }
-
-}
\ No newline at end of file

From bfb2037b3bd33a42c6b0ba1913b37cc8ef0238fc Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 13:31:51 +0700
Subject: [PATCH 039/125] TimefourTv: update icon

---
 TimefourTv/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index a5a44fd9..2b007764 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -21,5 +21,5 @@ cloudstream {
         "Live",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=time4tv.stream&sz=%size%"
+    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193079167600840734/Untitled.jpg"
 }

From 42ebf564ede769972e06883b69e02dc93da51bbf Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 14:23:36 +0700
Subject: [PATCH 040/125] update icons

---
 FilmPalast/build.gradle.kts                                   | 2 ++
 HDrezkaProvider/build.gradle.kts                              | 2 +-
 KisskhProvider/build.gradle.kts                               | 2 +-
 LayarKacaProvider/build.gradle.kts                            | 2 +-
 PhimmoichillProvider/build.gradle.kts                         | 4 ++--
 .../src/main/kotlin/com/hexated/PhimmoichillProvider.kt       | 2 +-
 TimefourTv/build.gradle.kts                                   | 2 +-
 Xcineio/build.gradle.kts                                      | 4 ++--
 Xcineio/src/main/kotlin/com/hexated/XCine.kt                  | 2 +-
 YugenAnime/build.gradle.kts                                   | 2 +-
 10 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/FilmPalast/build.gradle.kts b/FilmPalast/build.gradle.kts
index 6f3a4bdc..d434c85a 100644
--- a/FilmPalast/build.gradle.kts
+++ b/FilmPalast/build.gradle.kts
@@ -21,4 +21,6 @@ cloudstream {
     // You can find a list of avaliable types here:
     // https://recloudstream.github.io/cloudstream/html/app/com.lagradost.cloudstream3/-tv-type/index.html
     tvTypes = listOf("TvSeries", "Movie")
+
+    iconUrl = "https://www.google.com/s2/favicons?domain=filmpalast.to&sz=%size%"
 }
diff --git a/HDrezkaProvider/build.gradle.kts b/HDrezkaProvider/build.gradle.kts
index 2fc9aa63..2a5e6c60 100644
--- a/HDrezkaProvider/build.gradle.kts
+++ b/HDrezkaProvider/build.gradle.kts
@@ -24,5 +24,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=hdrezka19139.org&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=rezka.ag&sz=%size%"
 }
\ No newline at end of file
diff --git a/KisskhProvider/build.gradle.kts b/KisskhProvider/build.gradle.kts
index d2bcff25..00324bad 100644
--- a/KisskhProvider/build.gradle.kts
+++ b/KisskhProvider/build.gradle.kts
@@ -24,5 +24,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=kisskh.me&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=kisskh.co&sz=%size%"
 }
\ No newline at end of file
diff --git a/LayarKacaProvider/build.gradle.kts b/LayarKacaProvider/build.gradle.kts
index 7003fef2..17b5bf69 100644
--- a/LayarKacaProvider/build.gradle.kts
+++ b/LayarKacaProvider/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=tv6.lk21official.wiki&sz=%size%"
+    iconUrl = "https://s8.lk21static.xyz/wp-content/themes/dunia21/images/favicon-set/ms-icon-144x144.png"
 }
diff --git a/PhimmoichillProvider/build.gradle.kts b/PhimmoichillProvider/build.gradle.kts
index ec3f3dc3..1a6207b8 100644
--- a/PhimmoichillProvider/build.gradle.kts
+++ b/PhimmoichillProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 6
+version = 7
 
 
 cloudstream {
@@ -24,5 +24,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=phimmoichilla.net&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=phimmoichillk.net&sz=%size%"
 }
diff --git a/PhimmoichillProvider/src/main/kotlin/com/hexated/PhimmoichillProvider.kt b/PhimmoichillProvider/src/main/kotlin/com/hexated/PhimmoichillProvider.kt
index 2d0d256f..3c915e03 100644
--- a/PhimmoichillProvider/src/main/kotlin/com/hexated/PhimmoichillProvider.kt
+++ b/PhimmoichillProvider/src/main/kotlin/com/hexated/PhimmoichillProvider.kt
@@ -9,7 +9,7 @@ import java.net.URI
 import java.net.URLDecoder
 
 class PhimmoichillProvider : MainAPI() {
-    override var mainUrl = "https://phimmoichillh.net"
+    override var mainUrl = "https://phimmoichillk.net"
     private var directUrl = mainUrl
     override var name = "Phimmoichill"
     override val hasMainPage = true
diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index 2b007764..ad08920f 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -21,5 +21,5 @@ cloudstream {
         "Live",
     )
 
-    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193079167600840734/Untitled.jpg"
+    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193088870212976640/Untitled.jpg"
 }
diff --git a/Xcineio/build.gradle.kts b/Xcineio/build.gradle.kts
index 2434acfa..5fe9a2e7 100644
--- a/Xcineio/build.gradle.kts
+++ b/Xcineio/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 4
+version = 5
 
 
 cloudstream {
@@ -22,5 +22,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=xcine.io&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=www1.xcine.ru&sz=%size%"
 }
\ No newline at end of file
diff --git a/Xcineio/src/main/kotlin/com/hexated/XCine.kt b/Xcineio/src/main/kotlin/com/hexated/XCine.kt
index 0431f393..ffdc8c7a 100644
--- a/Xcineio/src/main/kotlin/com/hexated/XCine.kt
+++ b/Xcineio/src/main/kotlin/com/hexated/XCine.kt
@@ -11,7 +11,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor
 
 open class XCine : MainAPI() {
     override var name = "XCine"
-    override var mainUrl = "https://xcine.ru"
+    override var mainUrl = "https://www1.xcine.ru"
     override var lang = "de"
     override val hasQuickSearch = true
     override val usesWebView = false
diff --git a/YugenAnime/build.gradle.kts b/YugenAnime/build.gradle.kts
index 754104e3..1b7033b3 100644
--- a/YugenAnime/build.gradle.kts
+++ b/YugenAnime/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=yugen.to&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=yugenanime.sx&sz=%size%"
 }
\ No newline at end of file

From aca1625a12a10b3cec513a8f698f2fc6fdcb1c2f Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 15:14:01 +0700
Subject: [PATCH 041/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 8c6aa0ea..18c93c83 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -257,7 +257,7 @@ open class SoraStream : TmdbProvider() {
                 this.backgroundPosterUrl = bgPoster
                 this.year = year
                 this.plot = res.overview
-                this.tags = if (isAnime) keywords else genres
+                this.tags = keywords
                 this.rating = rating
                 this.showStatus = getStatus(res.status)
                 this.recommendations = recommendations
@@ -281,7 +281,7 @@ open class SoraStream : TmdbProvider() {
                 this.year = year
                 this.plot = res.overview
                 this.duration = res.runtime
-                this.tags = if (isAnime) keywords else genres
+                this.tags = keywords
                 this.rating = rating
                 this.recommendations = recommendations
                 this.actors = actors

From 99aeb29055f3a1f788ff4725592366d3ee5e5def Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 16:22:26 +0700
Subject: [PATCH 042/125] sora: update icon

---
 SoraStream/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 7ee3b812..106eb0ab 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -42,5 +42,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://raw.githubusercontent.com/hexated/cloudstream-extensions-hexated/master/SoraStream/Icon.png"
+    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1193122096159674448/2-modified.png"
 }

From b779e596ae2c45d5fb5657b2137683f14f544c77 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 19:11:33 +0700
Subject: [PATCH 043/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 4 ++--
 TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt | 2 +-
 YugenAnime/build.gradle.kts                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 18c93c83..740cc4de 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -257,7 +257,7 @@ open class SoraStream : TmdbProvider() {
                 this.backgroundPosterUrl = bgPoster
                 this.year = year
                 this.plot = res.overview
-                this.tags = keywords
+                this.tags = keywords ?: genres
                 this.rating = rating
                 this.showStatus = getStatus(res.status)
                 this.recommendations = recommendations
@@ -281,7 +281,7 @@ open class SoraStream : TmdbProvider() {
                 this.year = year
                 this.plot = res.overview
                 this.duration = res.runtime
-                this.tags = keywords
+                this.tags = keywords ?: genres
                 this.rating = rating
                 this.recommendations = recommendations
                 this.actors = actors
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
index 17256e0a..041d8cb6 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
@@ -89,7 +89,7 @@ class TimefourTv : MainAPI() {
             items.mapNotNull {
                 Episode(
                         data = it.channels?.toJson() ?: return@mapNotNull null,
-                        name = "${it.event} - Live",
+                        name = "${it.event} •",
                         description = it.time,
                         posterUrl = detailPoster,
                 )
diff --git a/YugenAnime/build.gradle.kts b/YugenAnime/build.gradle.kts
index 1b7033b3..a4fff087 100644
--- a/YugenAnime/build.gradle.kts
+++ b/YugenAnime/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=yugenanime.sx&sz=%size%"
+    iconUrl = "https://yugenanime.sx/static/img/favicon-32x32.png"
 }
\ No newline at end of file

From cc423aa0986beb4a5e3905703159cd694cb0935c Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 20:56:27 +0700
Subject: [PATCH 044/125] fix NontonAnimeID

---
 NontonAnimeIDProvider/build.gradle.kts        |   4 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |  80 ++++++++++++
 .../com/hexated/NontonAnimeIDProvider.kt      | 118 ++++++++----------
 .../hexated/NontonAnimeIDProviderPlugin.kt    |   5 +-
 4 files changed, 140 insertions(+), 67 deletions(-)
 create mode 100644 NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt

diff --git a/NontonAnimeIDProvider/build.gradle.kts b/NontonAnimeIDProvider/build.gradle.kts
index 10f41f92..03222cbe 100644
--- a/NontonAnimeIDProvider/build.gradle.kts
+++ b/NontonAnimeIDProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 19
+version = 20
 
 
 cloudstream {
@@ -23,5 +23,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=nontonanimeid.site&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=nontonanimeid.mom&sz=%size%"
 }
\ No newline at end of file
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt
new file mode 100644
index 00000000..348fc46c
--- /dev/null
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt
@@ -0,0 +1,80 @@
+package com.hexated
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.Hxfile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.Qualities
+
+open class Gdplayer : ExtractorApi() {
+    override val name = "Gdplayer"
+    override val mainUrl = "https://gdplayer.to"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+            url: String,
+            referer: String?,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url, referer = referer).document
+        val script = res.selectFirst("script:containsData(player = \"\")")?.data()
+        val kaken = script?.substringAfter("kaken = \"")?.substringBefore("\"")
+
+        val json = app.get(
+                "$mainUrl/api/?${kaken ?: return}=&_=${APIHolder.unixTimeMS}",
+                headers = mapOf(
+                        "X-Requested-With" to "XMLHttpRequest"
+                )
+        ).parsedSafe<Response>()
+
+        json?.sources?.map {
+            callback.invoke(
+                    ExtractorLink(
+                            this.name,
+                            this.name,
+                            it.file ?: return@map,
+                            "",
+                            getQuality(json.title)
+                    )
+            )
+        }
+    }
+
+    private fun getQuality(str: String?): Int {
+        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
+                ?: Qualities.Unknown.value
+    }
+
+    data class Response(
+            @JsonProperty("title") val title: String? = null,
+            @JsonProperty("sources") val sources: ArrayList<Sources>? = null,
+    ) {
+        data class Sources(
+                @JsonProperty("file") val file: String? = null,
+                @JsonProperty("type") val type: String? = null,
+        )
+    }
+
+}
+
+class Nontonanimeid : Hxfile() {
+    override val name = "Nontonanimeid"
+    override val mainUrl = "https://nontonanimeid.com"
+    override val requiresReferer = true
+}
+
+class EmbedKotakAnimeid : Hxfile() {
+    override val name = "EmbedKotakAnimeid"
+    override val mainUrl = "https://embed2.kotakanimeid.com"
+    override val requiresReferer = true
+}
+
+class KotakAnimeidCom : Hxfile() {
+    override val name = "KotakAnimeid"
+    override val mainUrl = "https://kotakanimeid.com"
+    override val requiresReferer = true
+}
\ No newline at end of file
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
index 1735efe3..0f5d6418 100644
--- a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
@@ -13,7 +13,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 class NontonAnimeIDProvider : MainAPI() {
-    override var mainUrl = "https://nontonanimeid.top"
+    override var mainUrl = "https://nontonanimeid.mom"
     override var name = "NontonAnimeID"
     override val hasQuickSearch = false
     override val hasMainPage = true
@@ -21,9 +21,9 @@ class NontonAnimeIDProvider : MainAPI() {
     override val hasDownloadSupport = true
 
     override val supportedTypes = setOf(
-        TvType.Anime,
-        TvType.AnimeMovie,
-        TvType.OVA
+            TvType.Anime,
+            TvType.AnimeMovie,
+            TvType.OVA
     )
 
     companion object {
@@ -45,9 +45,9 @@ class NontonAnimeIDProvider : MainAPI() {
     }
 
     override val mainPage = mainPageOf(
-        "" to "Latest Update",
-        "ongoing-list/" to " Ongoing List",
-        "popular-series/" to "Popular Series",
+            "" to "Latest Update",
+            "ongoing-list/" to " Ongoing List",
+            "popular-series/" to "Popular Series",
     )
 
     override suspend fun getMainPage(page: Int, request : MainPageRequest): HomePageResponse {
@@ -61,7 +61,7 @@ class NontonAnimeIDProvider : MainAPI() {
     private fun Element.toSearchResult(): AnimeSearchResponse {
         val href = fixUrl(this.selectFirst("a")!!.attr("href"))
         val title = this.selectFirst(".title")?.text() ?: ""
-        val posterUrl = fixUrlNull(this.selectFirst("img")?.attr("data-src"))
+        val posterUrl = fixUrlNull(this.selectFirst("img")?.getImageAttr())
 
         return newAnimeSearchResponse(title, href, TvType.Anime) {
             this.posterUrl = posterUrl
@@ -76,9 +76,9 @@ class NontonAnimeIDProvider : MainAPI() {
 
         return document.select(".result > ul > li").mapNotNull {
             val title = it.selectFirst("h2")!!.text().trim()
-            val poster = it.selectFirst("img")!!.attr("src")
+            val poster = it.selectFirst("img")?.getImageAttr()
             val tvType = getType(
-                it.selectFirst(".boxinfores > span.typeseries")!!.text().toString()
+                    it.selectFirst(".boxinfores > span.typeseries")!!.text().toString()
             )
             val href = fixUrl(it.selectFirst("a")!!.attr("href"))
 
@@ -101,14 +101,14 @@ class NontonAnimeIDProvider : MainAPI() {
         val document = req.document
 
         val title = document.selectFirst("h1.entry-title.cs")!!.text().removeSurrounding("Nonton Anime", "Sub Indo").trim()
-        val poster = document.selectFirst(".poster > img")?.attr("data-src")
+        val poster = document.selectFirst(".poster > img")?.getImageAttr()
         val tags = document.select(".tagline > a").map { it.text() }
 
         val year = Regex("\\d, (\\d*)").find(
-            document.select(".bottomtitle > span:nth-child(5)").text()
+                document.select(".bottomtitle > span:nth-child(5)").text()
         )?.groupValues?.get(1)?.toIntOrNull()
         val status = getStatus(
-            document.select("span.statusseries").text().trim()
+                document.select("span.statusseries").text().trim()
         )
         val type = getType(document.select("span.typeseries").text().trim().lowercase())
         val rating = document.select("span.nilaiseries").text().trim().toIntOrNull()
@@ -118,21 +118,21 @@ class NontonAnimeIDProvider : MainAPI() {
         val episodes = if (document.select("button.buttfilter").isNotEmpty()) {
             val id = document.select("input[name=series_id]").attr("value")
             val numEp =
-                document.selectFirst(".latestepisode > a")?.text()?.replace(Regex("\\D"), "")
-                    .toString()
+                    document.selectFirst(".latestepisode > a")?.text()?.replace(Regex("\\D"), "")
+                            .toString()
             Jsoup.parse(
-                app.post(
-                    url = "$mainUrl/wp-admin/admin-ajax.php",
-                    data = mapOf(
-                        "misha_number_of_results" to numEp,
-                        "misha_order_by" to "date-DESC",
-                        "action" to "mishafilter",
-                        "series_id" to id
-                    )
-                ).parsed<EpResponse>().content
+                    app.post(
+                            url = "$mainUrl/wp-admin/admin-ajax.php",
+                            data = mapOf(
+                                    "misha_number_of_results" to numEp,
+                                    "misha_order_by" to "date-DESC",
+                                    "action" to "mishafilter",
+                                    "series_id" to id
+                            )
+                    ).parsed<EpResponse>().content
             ).select("li").map {
                 val episode = Regex("Episode\\s?(\\d+)").find(
-                    it.selectFirst("a")?.text().toString()
+                        it.selectFirst("a")?.text().toString()
                 )?.groupValues?.getOrNull(0) ?: it.selectFirst("a")?.text()
                 val link = fixUrl(it.selectFirst("a")!!.attr("href"))
                 Episode(link, episode = episode?.toIntOrNull())
@@ -140,7 +140,7 @@ class NontonAnimeIDProvider : MainAPI() {
         } else {
             document.select("ul.misha_posts_wrap2 > li").map {
                 val episode = Regex("Episode\\s?(\\d+)").find(
-                    it.selectFirst("a")?.text().toString()
+                        it.selectFirst("a")?.text().toString()
                 )?.groupValues?.getOrNull(0) ?: it.selectFirst("a")?.text()
                 val link = it.select("a").attr("href")
                 Episode(link, episode = episode?.toIntOrNull())
@@ -150,7 +150,7 @@ class NontonAnimeIDProvider : MainAPI() {
         val recommendations = document.select(".result > li").mapNotNull {
             val epHref = it.selectFirst("a")!!.attr("href")
             val epTitle = it.selectFirst("h3")!!.text()
-            val epPoster = it.select(".top > img").attr("data-src")
+            val epPoster = it.selectFirst(".top > img")?.getImageAttr()
             newAnimeSearchResponse(epTitle, epHref, TvType.Anime) {
                 this.posterUrl = epPoster
                 addDubStatus(dubExist = false, subExist = true)
@@ -178,10 +178,10 @@ class NontonAnimeIDProvider : MainAPI() {
     }
 
     override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            data: String,
+            isCasting: Boolean,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ): Boolean {
 
         val document = app.get(data).document
@@ -192,16 +192,16 @@ class NontonAnimeIDProvider : MainAPI() {
             val dataType = it.attr("data-type")
 
             val iframe = app.post(
-                url = "$mainUrl/wp-admin/admin-ajax.php",
-                data = mapOf(
-                    "action" to "player_ajax",
-                    "post" to dataPost,
-                    "nume" to dataNume,
-                    "type" to dataType,
-                    "nonce" to "e4dd8e45c2"
-                ),
-                referer = data,
-                headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+                    url = "$mainUrl/wp-admin/admin-ajax.php",
+                    data = mapOf(
+                            "action" to "player_ajax",
+                            "post" to dataPost,
+                            "nume" to dataNume,
+                            "type" to dataType,
+                            "nonce" to "8c5a2e3cb2"
+                    ),
+                    referer = data,
+                    headers = mapOf("X-Requested-With" to "XMLHttpRequest")
             ).document.selectFirst("iframe")?.attr("src")
 
             loadExtractor(iframe ?: return@apmap , "$mainUrl/", subtitleCallback, callback)
@@ -215,29 +215,21 @@ class NontonAnimeIDProvider : MainAPI() {
             "${it.scheme}://${it.host}"
         }
     }
+
+    private fun Element.getImageAttr(): String? {
+        return when {
+            this.hasAttr("data-src") -> this.attr("abs:data-src")
+            this.hasAttr("data-lazy-src") -> this.attr("abs:data-lazy-src")
+            this.hasAttr("srcset") -> this.attr("abs:srcset").substringBefore(" ")
+            else -> this.attr("abs:src")
+        }
+    }
+
     private data class EpResponse(
-        @JsonProperty("posts") val posts: String?,
-        @JsonProperty("max_page") val max_page: Int?,
-        @JsonProperty("found_posts") val found_posts: Int?,
-        @JsonProperty("content") val content: String
+            @JsonProperty("posts") val posts: String?,
+            @JsonProperty("max_page") val max_page: Int?,
+            @JsonProperty("found_posts") val found_posts: Int?,
+            @JsonProperty("content") val content: String
     )
 
 }
-
-class KotakAnimeid2 : Hxfile() {
-    override val name = "KotakAnimeid2"
-    override val mainUrl = "https://embed2.kotakanimeid.com"
-    override val requiresReferer = true
-}
-
-class KotakAnimeidCom : Hxfile() {
-    override val name = "KotakAnimeid"
-    override val mainUrl = "https://nontonanimeid.com"
-    override val requiresReferer = true
-}
-
-class EmbedKotakAnimeid : Hxfile() {
-    override val name = "EmbedKotakAnimeid"
-    override val mainUrl = "https://embed2.kotakanimeid.com"
-    override val requiresReferer = true
-}
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt
index 763e337e..dc5d0385 100644
--- a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt
@@ -10,8 +10,9 @@ class NontonAnimeIDProviderPlugin: Plugin() {
     override fun load(context: Context) {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(NontonAnimeIDProvider())
-        registerExtractorAPI(KotakAnimeid2())
-        registerExtractorAPI(KotakAnimeidCom())
+        registerExtractorAPI(Nontonanimeid())
         registerExtractorAPI(EmbedKotakAnimeid())
+        registerExtractorAPI(KotakAnimeidCom())
+        registerExtractorAPI(Gdplayer())
     }
 }
\ No newline at end of file

From 8fad56766c4d8c9d502da318cb9ccc7fbe1b04c4 Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Sat, 6 Jan 2024 21:03:42 +0700
Subject: [PATCH 045/125] Update build.gradle.kts

---
 AnimeIndoProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnimeIndoProvider/build.gradle.kts b/AnimeIndoProvider/build.gradle.kts
index af852c5c..997d380c 100644
--- a/AnimeIndoProvider/build.gradle.kts
+++ b/AnimeIndoProvider/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "Anime",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=animeindo.fun&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=animeindo.quests&sz=%size%"
 }
\ No newline at end of file

From 61a2dac0de7b5ca71f064a3586478ed78523ff8e Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Sat, 6 Jan 2024 21:04:19 +0700
Subject: [PATCH 046/125] Update build.gradle.kts

---
 AnimeIndoProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnimeIndoProvider/build.gradle.kts b/AnimeIndoProvider/build.gradle.kts
index 997d380c..628a60af 100644
--- a/AnimeIndoProvider/build.gradle.kts
+++ b/AnimeIndoProvider/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "Anime",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=animeindo.quests&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=animeindo.quest&sz=%size%"
 }
\ No newline at end of file

From 4433d0cf5204dc0ddcbbfd5204849aecf6a11e90 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sat, 6 Jan 2024 21:18:14 +0700
Subject: [PATCH 047/125] update

---
 AnimeIndoProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AnimeIndoProvider/build.gradle.kts b/AnimeIndoProvider/build.gradle.kts
index 628a60af..9c838888 100644
--- a/AnimeIndoProvider/build.gradle.kts
+++ b/AnimeIndoProvider/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "Anime",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=animeindo.quest&sz=%size%"
+    iconUrl = "https://animeindo.quest/wp-content/uploads/2023/05/favicon-300x300.png"
 }
\ No newline at end of file

From 4936beaf7d29008b646eafe9b0d84670271a01be Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Sun, 7 Jan 2024 03:04:56 +0700
Subject: [PATCH 048/125] Update OploverzProvider.kt

---
 .../src/main/kotlin/com/hexated/OploverzProvider.kt             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
index 4d5dc26d..fba9c4ba 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class OploverzProvider : MainAPI() {
-    override var mainUrl = "https://oploverz.life"
+    override var mainUrl = "https://oploverz.win"
     override var name = "Oploverz"
     override val hasMainPage = true
     override var lang = "id"

From f3dc7906b3a7b1f35829e998e83b762bc09aa4db Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Sun, 7 Jan 2024 03:05:12 +0700
Subject: [PATCH 049/125] Update build.gradle.kts

---
 OploverzProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts
index a8b4e717..80a9aded 100644
--- a/OploverzProvider/build.gradle.kts
+++ b/OploverzProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 25
+version = 26
 
 
 cloudstream {

From 64dfc40b688566ecb24dcc575c98e2740d239dba Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 7 Jan 2024 12:46:25 +0700
Subject: [PATCH 050/125] update

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f587ae0b..e0c9d02b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 local.properties
 .vscode
 /ExampleProvider/
+KuramanimeProvider/src/main/kotlin/com/hexated/

From 9b02bff07d51aa8c149aa621666e1b210d415085 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 7 Jan 2024 12:52:07 +0700
Subject: [PATCH 051/125] update

---
 .gitignore                          | 3 +--
 KuramanimeProvider/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0c9d02b..d34d3c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,4 @@
 .cxx
 local.properties
 .vscode
-/ExampleProvider/
-KuramanimeProvider/src/main/kotlin/com/hexated/
+/ExampleProvider/
\ No newline at end of file
diff --git a/KuramanimeProvider/build.gradle.kts b/KuramanimeProvider/build.gradle.kts
index fac8e2b3..b24ec21b 100644
--- a/KuramanimeProvider/build.gradle.kts
+++ b/KuramanimeProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 34
+version = 35
 
 
 cloudstream {

From f48fe37baad533b262480351a7729ebfbc54fa67 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 7 Jan 2024 18:09:14 +0700
Subject: [PATCH 052/125] TimefourTv: update detail page

---
 TimefourTv/build.gradle.kts                          | 2 +-
 TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index ad08920f..f160d38c 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 21
+version = 22
 
 
 cloudstream {
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
index 041d8cb6..45f25ec2 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
@@ -86,11 +86,11 @@ class TimefourTv : MainAPI() {
             listOf(Episode(arrayListOf(Channels(data.title, data.url)).toJson()))
         } else {
             val items = AppUtils.parseJson<ArrayList<Items>>(data.items)
-            items.mapNotNull {
+            items.mapNotNull { eps ->
                 Episode(
-                        data = it.channels?.toJson() ?: return@mapNotNull null,
-                        name = "${it.event} •",
-                        description = it.time,
+                        data = eps.channels?.toJson() ?: return@mapNotNull null,
+                        name = "${eps.event} • ${eps.time}",
+                        description = eps.channels.map { it.channel_name }.joinToString(" • "),
                         posterUrl = detailPoster,
                 )
             }

From 97339447c76765b248aa4ff273faaf92d8f1f9a1 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 7 Jan 2024 21:33:12 +0700
Subject: [PATCH 053/125] close #502, close #333

---
 Kinoger/build.gradle.kts                      |  26 +++
 Kinoger/src/main/AndroidManifest.xml          |   2 +
 .../src/main/kotlin/com/hexated/Kinoger.kt    | 155 ++++++++++++++++++
 .../main/kotlin/com/hexated/KinogerPlugin.kt  |  15 ++
 4 files changed, 198 insertions(+)
 create mode 100644 Kinoger/build.gradle.kts
 create mode 100644 Kinoger/src/main/AndroidManifest.xml
 create mode 100644 Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
 create mode 100644 Kinoger/src/main/kotlin/com/hexated/KinogerPlugin.kt

diff --git a/Kinoger/build.gradle.kts b/Kinoger/build.gradle.kts
new file mode 100644
index 00000000..7dfa6898
--- /dev/null
+++ b/Kinoger/build.gradle.kts
@@ -0,0 +1,26 @@
+// use an integer for version numbers
+version = 1
+
+
+cloudstream {
+    language = "de"
+    // All of these properties are optional, you can safely remove them
+
+    // description = "Lorem Ipsum"
+    authors = listOf("Hexated")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "TvSeries",
+        "Movie",
+    )
+
+    iconUrl = "https://www.google.com/s2/favicons?domain=kinoger.com&sz=%size%"
+}
\ No newline at end of file
diff --git a/Kinoger/src/main/AndroidManifest.xml b/Kinoger/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..c98063f8
--- /dev/null
+++ b/Kinoger/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.hexated"/>
\ No newline at end of file
diff --git a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
new file mode 100644
index 00000000..c7b78584
--- /dev/null
+++ b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
@@ -0,0 +1,155 @@
+package com.hexated
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.extractors.Chillx
+import com.lagradost.cloudstream3.utils.AppUtils
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.loadExtractor
+import org.jsoup.nodes.Element
+
+class Kinoger : MainAPI() {
+    override var name = "Kinoger"
+    override var mainUrl = "https://kinoger.com"
+    override var lang = "de"
+    override val hasMainPage = true
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie)
+
+    override val mainPage = mainPageOf(
+            "" to "Alle Filme",
+            "stream/action" to "Action",
+            "stream/fantasy" to "Fantasy",
+            "stream/drama" to "Drama",
+            "stream/mystery" to "Mystery",
+            "stream/romance" to "Romance",
+            "stream/animation" to "Animation",
+            "stream/horror" to "Horror",
+            "stream/familie" to "Familie",
+            "stream/komdie" to "Komdie",
+    )
+
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+        val document = app.get("$mainUrl/${request.data}/page/$page").document
+        val home = document.select("div#dle-content div.short").mapNotNull {
+            it.toSearchResult()
+        }
+        return newHomePageResponse(request.name, home)
+    }
+
+    private fun getProperLink(uri: String): String {
+        return if (uri.contains("-episode-")) {
+            "$mainUrl/series/" + Regex("$mainUrl/(.+)-ep.+").find(uri)?.groupValues?.get(1)
+        } else {
+            uri
+        }
+    }
+
+    private fun Element.toSearchResult(): SearchResponse? {
+        val href = getProperLink(this.selectFirst("a")?.attr("href") ?: return null)
+        val title = this.selectFirst("a")?.text() ?: this.selectFirst("img")?.attr("alt")
+        ?: this.selectFirst("a")?.attr("title") ?: return null
+        val posterUrl = fixUrlNull(
+                (this.nextElementSibling()?.selectFirst("div.content_text img") ?: this.selectFirst("div.content_text img") ?: this.selectFirst("img"))?.getImageAttr()
+        )
+
+        return newTvSeriesSearchResponse(title, href, TvType.AsianDrama) {
+            this.posterUrl = posterUrl
+        }
+    }
+
+    override suspend fun search(query: String): List<SearchResponse> {
+        return app.get("$mainUrl/?do=search&subaction=search&titleonly=3&story=$query&x=0&y=0&submit=submit").document.select(
+                "div#dle-content div.titlecontrol"
+        ).mapNotNull { it.toSearchResult() }
+    }
+
+    override suspend fun load(url: String): LoadResponse {
+        val document = app.get(url).document
+        val title = document.selectFirst("h1#news-title")?.text() ?: ""
+        val poster = fixUrlNull(document.selectFirst("div.images-border img")?.getImageAttr())
+        val description = document.select("div.images-border").text()
+        val year = """\((\d{4})\)""".toRegex().find(title)?.groupValues?.get(1)?.toIntOrNull()
+        val type = if (document.selectFirst("label[title=Stream HD+]")
+                        ?.hasText() == true
+        ) TvType.Movie else TvType.TvSeries
+
+        val recommendations = document.select("ul.ul_related li").mapNotNull {
+            it.toSearchResult()
+        }
+
+        val script = document.selectFirst("script:containsData(pw.show)")?.data()
+                ?.substringAfter("[")?.substringBeforeLast("]")?.replace("\'", "\"")
+        val json = AppUtils.tryParseJson<List<List<String>>>("[$script]")
+
+        val episodes = json?.flatMapIndexed { season: Int, iframes: List<String> ->
+            iframes.mapIndexed { episode, iframe ->
+                Episode(
+                        iframe.trim(),
+                        season = season + 1,
+                        episode = episode + 1
+                )
+            }
+        } ?: emptyList()
+
+        return newTvSeriesLoadResponse(title, url, type, episodes) {
+            this.posterUrl = poster
+            this.year = year
+            this.plot = description
+            this.recommendations = recommendations
+        }
+    }
+
+    override suspend fun loadLinks(
+            data: String,
+            isCasting: Boolean,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
+    ): Boolean {
+        loadCustomExtractor(data, "$mainUrl/", subtitleCallback, callback)
+        return true
+    }
+
+    private suspend fun loadCustomExtractor(
+            url: String,
+            referer: String? = null,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit,
+            quality: Int? = null,
+    ) {
+        loadExtractor(url, referer, subtitleCallback) { link ->
+            if(link.quality == Qualities.Unknown.value) {
+                callback.invoke(
+                        ExtractorLink(
+                                link.source,
+                                link.name,
+                                link.url,
+                                link.referer,
+                                when (link.type) {
+                                    ExtractorLinkType.M3U8 -> link.quality
+                                    else -> quality ?: link.quality
+                                },
+                                link.type,
+                                link.headers,
+                                link.extractorData
+                        )
+                )
+            }
+        }
+    }
+
+    private fun Element.getImageAttr(): String? {
+        return when {
+            this.hasAttr("data-src") -> this.attr("data-src")
+            this.hasAttr("data-lazy-src") -> this.attr("data-lazy-src")
+            this.hasAttr("srcset") -> this.attr("srcset").substringBefore(" ")
+            else -> this.attr("src")
+        }
+    }
+
+}
+
+class Kinogeru : Chillx() {
+    override val name = "Kinoger"
+    override val mainUrl = "https://kinoger.ru"
+}
\ No newline at end of file
diff --git a/Kinoger/src/main/kotlin/com/hexated/KinogerPlugin.kt b/Kinoger/src/main/kotlin/com/hexated/KinogerPlugin.kt
new file mode 100644
index 00000000..2b9fc736
--- /dev/null
+++ b/Kinoger/src/main/kotlin/com/hexated/KinogerPlugin.kt
@@ -0,0 +1,15 @@
+
+package com.hexated
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+
+@CloudstreamPlugin
+class KinogerPlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(Kinoger())
+        registerExtractorAPI(Kinogeru())
+    }
+}
\ No newline at end of file

From e8110fab6272bc238d7ec1669c0e7c3345c72187 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 8 Jan 2024 02:17:40 +0700
Subject: [PATCH 054/125] fix

---
 .../kotlin/com/hexated/KuramanimeProvider.kt  | 234 ++---
 NeonimeProvider/build.gradle.kts              |   2 +-
 .../src/main/kotlin/com/hexated/SoraStream.kt | 839 ++++++++++++------
 .../main/kotlin/com/hexated/SoraStreamLite.kt | 392 +++++---
 4 files changed, 971 insertions(+), 496 deletions(-)

diff --git a/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt b/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt
index 82d488e4..83bdcfb5 100644
--- a/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt
+++ b/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt
@@ -20,13 +20,14 @@ class KuramanimeProvider : MainAPI() {
     override val hasMainPage = true
     override var lang = "id"
     override val hasDownloadSupport = true
-    private var params:  AuthParams? = null
-    private var headers: Map<String,String> = mapOf()
-    private var cookies: Map<String,String> = mapOf()
+    private var miscUrl: String? = null
+    private var headers: Map<String, String> = mapOf()
+    private var cookies: Map<String, String> = mapOf()
+    private var mixPage: Pair<String, String>? = null
     override val supportedTypes = setOf(
-        TvType.Anime,
-        TvType.AnimeMovie,
-        TvType.OVA
+            TvType.Anime,
+            TvType.AnimeMovie,
+            TvType.OVA
     )
 
     companion object {
@@ -46,15 +47,15 @@ class KuramanimeProvider : MainAPI() {
     }
 
     override val mainPage = mainPageOf(
-        "$mainUrl/anime/ongoing?order_by=updated&page=" to "Sedang Tayang",
-        "$mainUrl/anime/finished?order_by=updated&page=" to "Selesai Tayang",
-        "$mainUrl/properties/season/summer-2022?order_by=most_viewed&page=" to "Dilihat Terbanyak Musim Ini",
-        "$mainUrl/anime/movie?order_by=updated&page=" to "Film Layar Lebar",
+            "$mainUrl/anime/ongoing?order_by=updated&page=" to "Sedang Tayang",
+            "$mainUrl/anime/finished?order_by=updated&page=" to "Selesai Tayang",
+            "$mainUrl/properties/season/summer-2022?order_by=most_viewed&page=" to "Dilihat Terbanyak Musim Ini",
+            "$mainUrl/anime/movie?order_by=updated&page=" to "Film Layar Lebar",
     )
 
     override suspend fun getMainPage(
-        page: Int,
-        request: MainPageRequest
+            page: Int,
+            request: MainPageRequest
     ): HomePageResponse {
         val document = app.get(request.data + page).document
 
@@ -102,35 +103,40 @@ class KuramanimeProvider : MainAPI() {
 
         val title = document.selectFirst(".anime__details__title > h3")!!.text().trim()
         val poster = document.selectFirst(".anime__details__pic")?.attr("data-setbg")
-        val tags = document.select("div.anime__details__widget > div > div:nth-child(2) > ul > li:nth-child(1)")
-            .text().trim().replace("Genre: ", "").split(", ")
+        val tags =
+                document.select("div.anime__details__widget > div > div:nth-child(2) > ul > li:nth-child(1)")
+                        .text().trim().replace("Genre: ", "").split(", ")
 
         val year = Regex("\\D").replace(
-            document.select("div.anime__details__widget > div > div:nth-child(1) > ul > li:nth-child(5)")
-                .text().trim().replace("Musim: ", ""), ""
+                document.select("div.anime__details__widget > div > div:nth-child(1) > ul > li:nth-child(5)")
+                        .text().trim().replace("Musim: ", ""), ""
         ).toIntOrNull()
         val status = getStatus(
-            document.select("div.anime__details__widget > div > div:nth-child(1) > ul > li:nth-child(3)")
-                .text().trim().replace("Status: ", "")
+                document.select("div.anime__details__widget > div > div:nth-child(1) > ul > li:nth-child(3)")
+                        .text().trim().replace("Status: ", "")
         )
         val description = document.select(".anime__details__text > p").text().trim()
 
         val episodes = mutableListOf<Episode>()
 
-        for (i in 1..6) {
+        for (i in 1..10) {
             val doc = app.get("$url?page=$i").document
-            val eps = Jsoup.parse(doc.select("#episodeLists").attr("data-content")).select("a.btn.btn-sm.btn-danger")
-                .mapNotNull {
-                    val name = it.text().trim()
-                    val episode = Regex("(\\d+[.,]?\\d*)").find(name)?.groupValues?.getOrNull(0)
-                        ?.toIntOrNull()
-                    val link = it.attr("href")
-                    Episode(link, episode = episode)
-                }
-            if(eps.isEmpty()) break else episodes.addAll(eps)
+            val eps = Jsoup.parse(doc.select("#episodeLists").attr("data-content"))
+                    .select("a.btn.btn-sm.btn-danger")
+                    .mapNotNull {
+                        val name = it.text().trim()
+                        val episode = Regex("(\\d+[.,]?\\d*)").find(name)?.groupValues?.getOrNull(0)
+                                ?.toIntOrNull()
+                        val link = it.attr("href")
+                        Episode(link, episode = episode)
+                    }
+            if (eps.isEmpty()) break else episodes.addAll(eps)
         }
 
-        val type = getType(document.selectFirst("div.col-lg-6.col-md-6 ul li:contains(Tipe:) a")?.text()?.lowercase() ?: "tv", episodes.size)
+        val type = getType(
+                document.selectFirst("div.col-lg-6.col-md-6 ul li:contains(Tipe:) a")?.text()
+                        ?.lowercase() ?: "tv", episodes.size
+        )
         val recommendations = document.select("div#randomList > a").mapNotNull {
             val epHref = it.attr("href")
             val epTitle = it.select("h5.sidebar-title-h5.px-2.py-2").text()
@@ -141,7 +147,7 @@ class KuramanimeProvider : MainAPI() {
             }
         }
 
-        val tracker = APIHolder.getTracker(listOf(title),TrackerType.getTypes(type),year,true)
+        val tracker = APIHolder.getTracker(listOf(title), TrackerType.getTypes(type), year, true)
 
         return newAnimeLoadResponse(title, url, type) {
             engName = title
@@ -160,111 +166,131 @@ class KuramanimeProvider : MainAPI() {
     }
 
     private suspend fun invokeLocalSource(
-        url: String,
-        server: String,
-        ref: String,
-        callback: (ExtractorLink) -> Unit
+            url: String,
+            server: String,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ) {
         val document = app.get(
-            url,
-            referer = ref,
-            headers = headers,
-            cookies = cookies
+                url,
+                headers = headers,
+                cookies = cookies
         ).document
         document.select("video#player > source").map {
             val link = fixUrl(it.attr("src"))
             val quality = it.attr("size").toIntOrNull()
             callback.invoke(
-                ExtractorLink(
-                    fixTitle(server),
-                    fixTitle(server),
-                    link,
-                    referer = "",
-                    quality = quality ?: Qualities.Unknown.value,
-                    headers = mapOf(
-                        "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
-                        "Range" to "bytes=0-",
-                        "Sec-Fetch-Dest" to "video",
-                        "Sec-Fetch-Mode" to "no-cors",
-                    ),
-                )
+                    ExtractorLink(
+                            fixTitle(server),
+                            fixTitle(server),
+                            link,
+                            referer = "",
+                            quality = quality ?: Qualities.Unknown.value,
+                            headers = mapOf(
+                                    "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
+                                    "Range" to "bytes=0-",
+                                    "Sec-Fetch-Dest" to "video",
+                                    "Sec-Fetch-Mode" to "no-cors",
+                            ),
+                    )
             )
         }
+        if(server=="kuramadrive") {
+            document.select("div#animeDownloadLink a").apmap {
+                loadExtractor(it.attr("href"), "$mainUrl/", subtitleCallback, callback)
+            }
+        }
     }
 
     override suspend fun loadLinks(
-        data: String,
-        isCasting: Boolean,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+            data: String,
+            isCasting: Boolean,
+            subtitleCallback: (SubtitleFile) -> Unit,
+            callback: (ExtractorLink) -> Unit
     ): Boolean {
 
         val req = app.get(data)
         val res = req.document
+        cookies = req.cookies
 
-        argamap(
-            {
-                val auth = getAuth(data)
-                headers = auth.authHeader?.associate { it.first to it.second }?.filter { it.key != "Cookie" }!!
-                cookies = req.cookies
-                res.select("select#changeServer option").apmap { source ->
-                    val server = source.attr("value")
-                    val query = auth.serverUrl?.queryParameterNames?.map { it } ?: return@apmap
-                    val link = "$data?${query[0]}=${getMisc(auth.authUrl)}&${query[1]}=$server"
-                    if (server.contains(Regex("(?i)kuramadrive|archive"))) {
-                        invokeLocalSource(link, server, data, callback)
-                    } else {
-                        app.get(
-                            link,
-                            referer = data,
-                            headers = headers,
-                            cookies = cookies
-                        ).document.select("div.iframe-container iframe").attr("src").let { videoUrl ->
-                            loadExtractor(fixUrl(videoUrl), "$mainUrl/", subtitleCallback, callback)
-                        }
-                    }
-                }
-            },
-            {
-                res.select("div#animeDownloadLink a").apmap {
-                    loadExtractor(it.attr("href"), "$mainUrl/", subtitleCallback, callback)
+        val bpjs = res.selectFirst("div.col-lg-12.mt-3")?.attr("data-bpjs") ?: return false
+
+        val auth = getMiscUrl(data)
+        val misc = getMisc(auth)
+        val mixPage = getMixPage(bpjs)
+
+        res.select("select#changeServer option").apmap { source ->
+            val server = source.attr("value")
+            val link = "$data?${mixPage.first}=$misc&${mixPage.second}=$server"
+            if (server.contains(Regex("(?i)kuramadrive|archive"))) {
+                invokeLocalSource(link, server, subtitleCallback, callback)
+            } else {
+                app.get(
+                        link,
+                        referer = data,
+                        headers = headers,
+                        cookies = cookies
+                ).document.select("div.iframe-container iframe").attr("src").let { videoUrl ->
+                    loadExtractor(fixUrl(videoUrl), "$mainUrl/", subtitleCallback, callback)
                 }
             }
-        )
+        }
+
 
         return true
     }
 
-    private suspend fun fetchAuth(url: String) : AuthParams {
-        val regex = Regex("""$mainUrl/\S+""")
+    private suspend fun fetchMiscUrl(url: String): String {
+        val regex = Regex("""$mainUrl/.*""")
         val found = WebViewResolver(
-            Regex("""$url(?!\?page=)\?"""),
-            additionalUrls = listOf(regex)
+                Regex("""$mainUrl/assets/\S+.jpg"""),
+                additionalUrls = listOf(regex),
         ).resolveUsingWebView(
-            requestCreator(
-                "GET", url
-            )
-        )
-        val addition = found.second.findLast { it.headers["X-Requested-With"] == "XMLHttpRequest" }
-        return AuthParams(found.first?.url, addition?.url.toString(), addition?.headers)
+                requestCreator(
+                        "GET", url
+                        , cookies = cookies, referer = "$mainUrl/", headers = mapOf(
+                        "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+                        "Accept-Language" to "en-US,en;q=0.5",
+                )
+                )
+        ).first
+        headers = found?.headers?.associate { it.first to it.second } ?: mapOf()
+        return found?.url.toString()
     }
 
-    private suspend fun getAuth(url: String) = params ?: fetchAuth(url).also { params = it }
+    private suspend fun getMiscUrl(url: String) = miscUrl ?: fetchMiscUrl(url).also { miscUrl = it }
+
+    private suspend fun fetchMixPage(bpjs: String): Pair<String,String> {
+        val env = app.get("$mainUrl/assets/js/$bpjs.js").text
+        val MIX_PAGE_TOKEN_KEY = env.substringAfter("MIX_PAGE_TOKEN_KEY: '").substringBefore("',")
+        val MIX_STREAM_SERVER_KEY = env.substringAfter("MIX_STREAM_SERVER_KEY: '").substringBefore("',")
+        return MIX_PAGE_TOKEN_KEY to MIX_STREAM_SERVER_KEY
+    }
+
+    private suspend fun getMixPage(bpjs: String) = mixPage ?: fetchMixPage(bpjs).also { mixPage = it }
 
     private suspend fun getMisc(url: String?): String {
-        val misc = app.get(
-            "$url",
-            headers = headers,
-            cookies = cookies
-        )
-        cookies = misc.cookies
-        return misc.parsed()
+        val res = app.get("$url", headers = headers)
+        cookies = res.cookies
+        return res.text.removeBloat()
     }
 
-    data class AuthParams (
-        val serverUrl: HttpUrl?,
-        val authUrl: String?,
-        val authHeader: Headers?,
+    private fun getRequestId(length: Int = 6): String {
+        val allowedChars = ('a'..'z') + ('0'..'9')
+        return (1..length)
+                .map { allowedChars.random() }
+                .joinToString("")
+    }
+
+    private fun String.removeBloat() : String {
+        return this.replace("\"", "")
+    }
+
+    data class AuthParams(
+            val header: Map<String, String>?,
+            val params: List<String>?,
+            val misc: String,
+            val miscUrl: String?,
     )
 
 }
\ No newline at end of file
diff --git a/NeonimeProvider/build.gradle.kts b/NeonimeProvider/build.gradle.kts
index bfa7a96c..90714e5d 100644
--- a/NeonimeProvider/build.gradle.kts
+++ b/NeonimeProvider/build.gradle.kts
@@ -24,5 +24,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=neonime.watch&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=neonime.ink&sz=%size%"
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 740cc4de..b9b4b147 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -63,9 +63,9 @@ open class SoraStream : TmdbProvider() {
     override val useMetaLoadResponse = true
     override val hasQuickSearch = true
     override val supportedTypes = setOf(
-            TvType.Movie,
-            TvType.TvSeries,
-            TvType.Anime,
+        TvType.Movie,
+        TvType.TvSeries,
+        TvType.Anime,
     )
 
     val wpredisInterceptor by lazy { CloudflareKiller() }
@@ -147,26 +147,26 @@ open class SoraStream : TmdbProvider() {
     }
 
     override val mainPage = mainPageOf(
-            "$tmdbAPI/trending/all/day?api_key=$apiKey&region=US" to "Trending",
-            "$tmdbAPI/movie/popular?api_key=$apiKey&region=US" to "Popular Movies",
-            "$tmdbAPI/tv/popular?api_key=$apiKey&region=US&with_original_language=en" to "Popular TV Shows",
-            "$tmdbAPI/tv/airing_today?api_key=$apiKey&region=US&with_original_language=en" to "Airing Today TV Shows",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=213" to "Netflix",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=1024" to "Amazon",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2739" to "Disney+",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=453" to "Hulu",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2552" to "Apple TV+",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=49" to "HBO",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=4330" to "Paramount+",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=3353" to "Peacock",
-            "$tmdbAPI/movie/top_rated?api_key=$apiKey&region=US" to "Top Rated Movies",
-            "$tmdbAPI/tv/top_rated?api_key=$apiKey&region=US" to "Top Rated TV Shows",
-            "$tmdbAPI/movie/upcoming?api_key=$apiKey&region=US" to "Upcoming Movies",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_original_language=ko" to "Korean Shows",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().today}&air_date.gte=${getDate().today}" to "Airing Today Anime",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().nextWeek}&air_date.gte=${getDate().today}" to "On The Air Anime",
-            "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243" to "Anime",
-            "$tmdbAPI/discover/movie?api_key=$apiKey&with_keywords=210024|222243" to "Anime Movies",
+        "$tmdbAPI/trending/all/day?api_key=$apiKey&region=US" to "Trending",
+        "$tmdbAPI/movie/popular?api_key=$apiKey&region=US" to "Popular Movies",
+        "$tmdbAPI/tv/popular?api_key=$apiKey&region=US&with_original_language=en" to "Popular TV Shows",
+        "$tmdbAPI/tv/airing_today?api_key=$apiKey&region=US&with_original_language=en" to "Airing Today TV Shows",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=213" to "Netflix",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=1024" to "Amazon",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2739" to "Disney+",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=453" to "Hulu",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=2552" to "Apple TV+",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=49" to "HBO",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=4330" to "Paramount+",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_networks=3353" to "Peacock",
+        "$tmdbAPI/movie/top_rated?api_key=$apiKey&region=US" to "Top Rated Movies",
+        "$tmdbAPI/tv/top_rated?api_key=$apiKey&region=US" to "Top Rated TV Shows",
+        "$tmdbAPI/movie/upcoming?api_key=$apiKey&region=US" to "Upcoming Movies",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_original_language=ko" to "Korean Shows",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().today}&air_date.gte=${getDate().today}" to "Airing Today Anime",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243&sort_by=popularity.desc&air_date.lte=${getDate().nextWeek}&air_date.gte=${getDate().today}" to "On The Air Anime",
+        "$tmdbAPI/discover/tv?api_key=$apiKey&with_keywords=210024|222243" to "Anime",
+        "$tmdbAPI/discover/movie?api_key=$apiKey&with_keywords=210024|222243" to "Anime Movies",
     )
 
     private fun getImageUrl(link: String?): String? {
@@ -180,9 +180,11 @@ open class SoraStream : TmdbProvider() {
     }
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
-        val adultQuery = if (settingsForProvider.enableAdult) "" else "&without_keywords=190370|13059|226161|195669"
+        val adultQuery =
+            if (settingsForProvider.enableAdult) "" else "&without_keywords=190370|13059|226161|195669"
         val type = if (request.data.contains("/movie")) "movie" else "tv"
-        val home = app.get("${request.data}$adultQuery&page=$page").parsedSafe<Results>()?.results?.mapNotNull { media ->
+        val home = app.get("${request.data}$adultQuery&page=$page")
+            .parsedSafe<Results>()?.results?.mapNotNull { media ->
             media.toSearchResponse(type)
         } ?: throw ErrorLoadingException("Invalid Json reponse")
         return newHomePageResponse(request.name, home)
@@ -190,9 +192,9 @@ open class SoraStream : TmdbProvider() {
 
     private fun Media.toSearchResponse(type: String? = null): SearchResponse? {
         return newMovieSearchResponse(
-                title ?: name ?: originalTitle ?: return null,
-                Data(id = id, type = mediaType ?: type).toJson(),
-                TvType.Movie,
+            title ?: name ?: originalTitle ?: return null,
+            Data(id = id, type = mediaType ?: type).toJson(),
+            TvType.Movie,
         ) {
             this.posterUrl = getImageUrl(posterPath)
         }
@@ -201,7 +203,8 @@ open class SoraStream : TmdbProvider() {
     override suspend fun quickSearch(query: String): List<SearchResponse>? = search(query)
 
     override suspend fun search(query: String): List<SearchResponse>? {
-        return app.get("$tmdbAPI/search/multi?api_key=$apiKey&language=en-US&query=$query&page=1&include_adult=${settingsForProvider.enableAdult}").parsedSafe<Results>()?.results?.mapNotNull { media ->
+        return app.get("$tmdbAPI/search/multi?api_key=$apiKey&language=en-US&query=$query&page=1&include_adult=${settingsForProvider.enableAdult}")
+            .parsedSafe<Results>()?.results?.mapNotNull { media ->
             media.toSearchResponse()
         }
     }
@@ -216,7 +219,7 @@ open class SoraStream : TmdbProvider() {
             "$tmdbAPI/tv/${data.id}?api_key=$apiKey&append_to_response=$append"
         }
         val res = app.get(resUrl).parsedSafe<MediaDetail>()
-                ?: throw ErrorLoadingException("Invalid Json Response")
+            ?: throw ErrorLoadingException("Invalid Json Response")
 
         val title = res.title ?: res.name ?: return null
         val poster = getOriImageUrl(res.posterPath)
@@ -232,27 +235,68 @@ open class SoraStream : TmdbProvider() {
         val isAsian = !isAnime && (res.original_language == "zh" || res.original_language == "ko")
         val isBollywood = res.production_countries?.any { it.name == "India" } ?: false
 
-        val keywords = res.keywords?.results?.mapNotNull { it.name }.orEmpty().ifEmpty { res.keywords?.keywords?.mapNotNull { it.name } }
+        val keywords = res.keywords?.results?.mapNotNull { it.name }.orEmpty()
+            .ifEmpty { res.keywords?.keywords?.mapNotNull { it.name } }
 
         val actors = res.credits?.cast?.mapNotNull { cast ->
-            ActorData(Actor(cast.name ?: cast.originalName
-            ?: return@mapNotNull null, getImageUrl(cast.profilePath)), roleString = cast.character)
+            ActorData(
+                Actor(
+                    cast.name ?: cast.originalName
+                    ?: return@mapNotNull null, getImageUrl(cast.profilePath)
+                ), roleString = cast.character
+            )
         } ?: return null
-        val recommendations = res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() }
+        val recommendations =
+            res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() }
 
-        val trailer = res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" }?.randomOrNull()
+        val trailer =
+            res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" }?.randomOrNull()
 
         return if (type == TvType.TvSeries) {
             val lastSeason = res.last_episode_to_air?.season_number
             val episodes = res.seasons?.mapNotNull { season ->
-                app.get("$tmdbAPI/${data.type}/${data.id}/season/${season.seasonNumber}?api_key=$apiKey").parsedSafe<MediaDetailEpisodes>()?.episodes?.map { eps ->
-                    Episode(LinkData(data.id, res.external_ids?.imdb_id, res.external_ids?.tvdb_id, data.type, eps.seasonNumber, eps.episodeNumber, title = title, year = season.airDate?.split("-")?.first()?.toIntOrNull(), orgTitle = orgTitle, isAnime = isAnime, airedYear = year, lastSeason = lastSeason, epsTitle = eps.name, jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title, date = season.airDate, airedDate = res.releaseDate
-                            ?: res.firstAirDate, isAsian = isAsian, isBollywood = isBollywood, isCartoon = isCartoon).toJson(), name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "", season = eps.seasonNumber, episode = eps.episodeNumber, posterUrl = getImageUrl(eps.stillPath), rating = eps.voteAverage?.times(10)?.roundToInt(), description = eps.overview).apply {
+                app.get("$tmdbAPI/${data.type}/${data.id}/season/${season.seasonNumber}?api_key=$apiKey")
+                    .parsedSafe<MediaDetailEpisodes>()?.episodes?.map { eps ->
+                    Episode(
+                        LinkData(
+                            data.id,
+                            res.external_ids?.imdb_id,
+                            res.external_ids?.tvdb_id,
+                            data.type,
+                            eps.seasonNumber,
+                            eps.episodeNumber,
+                            title = title,
+                            year = season.airDate?.split("-")?.first()?.toIntOrNull(),
+                            orgTitle = orgTitle,
+                            isAnime = isAnime,
+                            airedYear = year,
+                            lastSeason = lastSeason,
+                            epsTitle = eps.name,
+                            jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title,
+                            date = season.airDate,
+                            airedDate = res.releaseDate
+                                ?: res.firstAirDate,
+                            isAsian = isAsian,
+                            isBollywood = isBollywood,
+                            isCartoon = isCartoon
+                        ).toJson(),
+                        name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "",
+                        season = eps.seasonNumber,
+                        episode = eps.episodeNumber,
+                        posterUrl = getImageUrl(eps.stillPath),
+                        rating = eps.voteAverage?.times(10)?.roundToInt(),
+                        description = eps.overview
+                    ).apply {
                         this.addDate(eps.airDate)
                     }
                 }
             }?.flatten() ?: listOf()
-            newTvSeriesLoadResponse(title, url, if (isAnime) TvType.Anime else TvType.TvSeries, episodes) {
+            newTvSeriesLoadResponse(
+                title,
+                url,
+                if (isAnime) TvType.Anime else TvType.TvSeries,
+                episodes
+            ) {
                 this.posterUrl = poster
                 this.backgroundPosterUrl = bgPoster
                 this.year = year
@@ -269,11 +313,24 @@ open class SoraStream : TmdbProvider() {
             }
         } else {
             newMovieLoadResponse(
-                    title,
-                    url,
-                    TvType.Movie,
-                    LinkData(data.id, res.external_ids?.imdb_id, res.external_ids?.tvdb_id, data.type, title = title, year = year, orgTitle = orgTitle, isAnime = isAnime, jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title, airedDate = res.releaseDate
-                            ?: res.firstAirDate, isAsian = isAsian, isBollywood = isBollywood).toJson(),
+                title,
+                url,
+                TvType.Movie,
+                LinkData(
+                    data.id,
+                    res.external_ids?.imdb_id,
+                    res.external_ids?.tvdb_id,
+                    data.type,
+                    title = title,
+                    year = year,
+                    orgTitle = orgTitle,
+                    isAnime = isAnime,
+                    jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title,
+                    airedDate = res.releaseDate
+                        ?: res.firstAirDate,
+                    isAsian = isAsian,
+                    isBollywood = isBollywood
+                ).toJson(),
             ) {
                 this.posterUrl = poster
                 this.backgroundPosterUrl = bgPoster
@@ -293,315 +350,537 @@ open class SoraStream : TmdbProvider() {
         }
     }
 
-    override suspend fun loadLinks(data: String, isCasting: Boolean, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit): Boolean {
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
 
         val res = parseJson<LinkData>(data)
 
         argamap(
-                {
-                    invokeDumpStream(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeGoku(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeVidSrc(res.id, res.season, res.episode, callback)
-                },
-                {
-                    invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeAoneroom(res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isAnime) invokeAnimes(res.title, res.epsTitle, res.date, res.airedDate, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeDreamfilm(res.title, res.season, res.episode, subtitleCallback, callback)
-                },
+            {
+                invokeDumpStream(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeGoku(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.lastSeason,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeVidSrc(res.id, res.season, res.episode, callback)
+            },
+            {
+                invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+            },
+            {
+                if (!res.isAnime) invokeAoneroom(
+                    res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (res.isAnime) invokeAnimes(
+                    res.title,
+                    res.epsTitle,
+                    res.date,
+                    res.airedDate,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeDreamfilm(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
 //            {
 //                invokeNoverse(res.title, res.season, res.episode, callback)
 //            },
-                {
-                    if (!res.isAnime) invokeFilmxy(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime && res.isCartoon) invokeKimcartoon(res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime && res.isCartoon) invokeWatchCartoon(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeVidsrcto(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isAsian || res.isAnime) invokeKisskh(res.title, res.season, res.episode, res.isAnime, res.lastSeason, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeOmovies(res.title, res.year, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeLing(res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeUhdmovies(res.title, res.year, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeGMovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeFDMovies(res.title, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeM4uhd(res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeTvMovies(res.title, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeMoviezAdd(moviezAddAPI, "MoviezAdd", res.title, res.year, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime && res.isBollywood) invokeBollyMaza(bollyMazaAPI, "BollyMaza", res.title, res.year, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeFlixon(res.id, res.imdbId, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeSmashyStream(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeWatchsomuch(res.imdbId, res.season, res.episode, subtitleCallback)
-                },
-                {
-                    if (!res.isAnime) invokeNinetv(res.id, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeDahmerMovies(res.title, res.year, res.season, res.episode, callback)
-                },
-                {
-                    invokeCinemaTv(res.imdbId, res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, callback)
-                },
-                {
-                    if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeEmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeVegamovies(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime && res.isBollywood) invokeDotmovies(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isBollywood) invokeMultimovies(multimoviesAPI, res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isBollywood) invokeMultimovies(multimovies2API, res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeNetmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime && res.season == null) invokeDoomovies(res.title, subtitleCallback, callback)
-                },
-                {
-                    if (res.isAsian) invokeDramaday(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invoke2embed(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeHdmovies4u(res.title, res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeZshow(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeShowflix(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeSFMovies(res.id, res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, callback)
-                },
-                {
-                    invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
-                },
+            {
+                if (!res.isAnime) invokeFilmxy(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime && res.isCartoon) invokeKimcartoon(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeVidsrcto(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isAsian || res.isAnime) invokeKisskh(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    res.isAnime,
+                    res.lastSeason,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeOmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeLing(
+                    res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeUhdmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeGMovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeFDMovies(res.title, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime) invokeM4uhd(
+                    res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeTvMovies(res.title, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime) invokeMoviezAdd(
+                    moviezAddAPI,
+                    "MoviezAdd",
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime && res.isBollywood) invokeBollyMaza(
+                    bollyMazaAPI,
+                    "BollyMaza",
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime) invokeFlixon(
+                    res.id,
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeSmashyStream(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeWatchsomuch(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback
+                )
+            },
+            {
+                if (!res.isAnime) invokeNinetv(
+                    res.id,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeDahmerMovies(res.title, res.year, res.season, res.episode, callback)
+            },
+            {
+                invokeCinemaTv(
+                    res.imdbId, res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime && res.season == null) invokeRidomovies(
+                    res.id,
+                    res.imdbId,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime) invokeEmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeVegamovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.lastSeason,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime && res.isBollywood) invokeDotmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.lastSeason,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isBollywood) invokeMultimovies(
+                    multimoviesAPI,
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isBollywood) invokeMultimovies(
+                    multimovies2API,
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeNetmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime && res.season == null) invokeDoomovies(
+                    res.title,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isAsian) invokeDramaday(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invoke2embed(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeHdmovies4u(
+                    res.title,
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeZshow(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeShowflix(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeSFMovies(
+                    res.id, res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, callback
+                )
+            },
+            {
+                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+            },
         )
 
         return true
     }
 
     data class LinkData(
-            val id: Int? = null,
-            val imdbId: String? = null,
-            val tvdbId: Int? = null,
-            val type: String? = null,
-            val season: Int? = null,
-            val episode: Int? = null,
-            val aniId: String? = null,
-            val animeId: String? = null,
-            val title: String? = null,
-            val year: Int? = null,
-            val orgTitle: String? = null,
-            val isAnime: Boolean = false,
-            val airedYear: Int? = null,
-            val lastSeason: Int? = null,
-            val epsTitle: String? = null,
-            val jpTitle: String? = null,
-            val date: String? = null,
-            val airedDate: String? = null,
-            val isAsian: Boolean = false,
-            val isBollywood: Boolean = false,
-            val isCartoon: Boolean = false,
+        val id: Int? = null,
+        val imdbId: String? = null,
+        val tvdbId: Int? = null,
+        val type: String? = null,
+        val season: Int? = null,
+        val episode: Int? = null,
+        val aniId: String? = null,
+        val animeId: String? = null,
+        val title: String? = null,
+        val year: Int? = null,
+        val orgTitle: String? = null,
+        val isAnime: Boolean = false,
+        val airedYear: Int? = null,
+        val lastSeason: Int? = null,
+        val epsTitle: String? = null,
+        val jpTitle: String? = null,
+        val date: String? = null,
+        val airedDate: String? = null,
+        val isAsian: Boolean = false,
+        val isBollywood: Boolean = false,
+        val isCartoon: Boolean = false,
     )
 
     data class Data(
-            val id: Int? = null,
-            val type: String? = null,
-            val aniId: String? = null,
-            val malId: Int? = null,
+        val id: Int? = null,
+        val type: String? = null,
+        val aniId: String? = null,
+        val malId: Int? = null,
     )
 
     data class Results(
-            @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
+        @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
     )
 
     data class Media(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("name") val name: String? = null,
-            @JsonProperty("title") val title: String? = null,
-            @JsonProperty("original_title") val originalTitle: String? = null,
-            @JsonProperty("media_type") val mediaType: String? = null,
-            @JsonProperty("poster_path") val posterPath: String? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("original_title") val originalTitle: String? = null,
+        @JsonProperty("media_type") val mediaType: String? = null,
+        @JsonProperty("poster_path") val posterPath: String? = null,
     )
 
     data class Genres(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("name") val name: String? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
     )
 
     data class Keywords(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("name") val name: String? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
     )
 
     data class KeywordResults(
-            @JsonProperty("results") val results: ArrayList<Keywords>? = arrayListOf(),
-            @JsonProperty("keywords") val keywords: ArrayList<Keywords>? = arrayListOf(),
+        @JsonProperty("results") val results: ArrayList<Keywords>? = arrayListOf(),
+        @JsonProperty("keywords") val keywords: ArrayList<Keywords>? = arrayListOf(),
     )
 
     data class Seasons(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("name") val name: String? = null,
-            @JsonProperty("season_number") val seasonNumber: Int? = null,
-            @JsonProperty("air_date") val airDate: String? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("season_number") val seasonNumber: Int? = null,
+        @JsonProperty("air_date") val airDate: String? = null,
     )
 
     data class Cast(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("name") val name: String? = null,
-            @JsonProperty("original_name") val originalName: String? = null,
-            @JsonProperty("character") val character: String? = null,
-            @JsonProperty("known_for_department") val knownForDepartment: String? = null,
-            @JsonProperty("profile_path") val profilePath: String? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("original_name") val originalName: String? = null,
+        @JsonProperty("character") val character: String? = null,
+        @JsonProperty("known_for_department") val knownForDepartment: String? = null,
+        @JsonProperty("profile_path") val profilePath: String? = null,
     )
 
     data class Episodes(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("name") val name: String? = null,
-            @JsonProperty("overview") val overview: String? = null,
-            @JsonProperty("air_date") val airDate: String? = null,
-            @JsonProperty("still_path") val stillPath: String? = null,
-            @JsonProperty("vote_average") val voteAverage: Double? = null,
-            @JsonProperty("episode_number") val episodeNumber: Int? = null,
-            @JsonProperty("season_number") val seasonNumber: Int? = null,
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("overview") val overview: String? = null,
+        @JsonProperty("air_date") val airDate: String? = null,
+        @JsonProperty("still_path") val stillPath: String? = null,
+        @JsonProperty("vote_average") val voteAverage: Double? = null,
+        @JsonProperty("episode_number") val episodeNumber: Int? = null,
+        @JsonProperty("season_number") val seasonNumber: Int? = null,
     )
 
     data class MediaDetailEpisodes(
-            @JsonProperty("episodes") val episodes: ArrayList<Episodes>? = arrayListOf(),
+        @JsonProperty("episodes") val episodes: ArrayList<Episodes>? = arrayListOf(),
     )
 
     data class Trailers(
-            @JsonProperty("key") val key: String? = null,
+        @JsonProperty("key") val key: String? = null,
     )
 
     data class ResultsTrailer(
-            @JsonProperty("results") val results: ArrayList<Trailers>? = arrayListOf(),
+        @JsonProperty("results") val results: ArrayList<Trailers>? = arrayListOf(),
     )
 
     data class AltTitles(
-            @JsonProperty("iso_3166_1") val iso_3166_1: String? = null,
-            @JsonProperty("title") val title: String? = null,
-            @JsonProperty("type") val type: String? = null,
+        @JsonProperty("iso_3166_1") val iso_3166_1: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("type") val type: String? = null,
     )
 
     data class ResultsAltTitles(
-            @JsonProperty("results") val results: ArrayList<AltTitles>? = arrayListOf(),
+        @JsonProperty("results") val results: ArrayList<AltTitles>? = arrayListOf(),
     )
 
     data class ExternalIds(
-            @JsonProperty("imdb_id") val imdb_id: String? = null,
-            @JsonProperty("tvdb_id") val tvdb_id: Int? = null,
+        @JsonProperty("imdb_id") val imdb_id: String? = null,
+        @JsonProperty("tvdb_id") val tvdb_id: Int? = null,
     )
 
     data class Credits(
-            @JsonProperty("cast") val cast: ArrayList<Cast>? = arrayListOf(),
+        @JsonProperty("cast") val cast: ArrayList<Cast>? = arrayListOf(),
     )
 
     data class ResultsRecommendations(
-            @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
+        @JsonProperty("results") val results: ArrayList<Media>? = arrayListOf(),
     )
 
     data class LastEpisodeToAir(
-            @JsonProperty("episode_number") val episode_number: Int? = null,
-            @JsonProperty("season_number") val season_number: Int? = null,
+        @JsonProperty("episode_number") val episode_number: Int? = null,
+        @JsonProperty("season_number") val season_number: Int? = null,
     )
 
     data class ProductionCountries(
-            @JsonProperty("name") val name: String? = null,
+        @JsonProperty("name") val name: String? = null,
     )
 
     data class MediaDetail(
-            @JsonProperty("id") val id: Int? = null,
-            @JsonProperty("imdb_id") val imdbId: String? = null,
-            @JsonProperty("title") val title: String? = null,
-            @JsonProperty("name") val name: String? = null,
-            @JsonProperty("original_title") val originalTitle: String? = null,
-            @JsonProperty("original_name") val originalName: String? = null,
-            @JsonProperty("poster_path") val posterPath: String? = null,
-            @JsonProperty("backdrop_path") val backdropPath: String? = null,
-            @JsonProperty("release_date") val releaseDate: String? = null,
-            @JsonProperty("first_air_date") val firstAirDate: String? = null,
-            @JsonProperty("overview") val overview: String? = null,
-            @JsonProperty("runtime") val runtime: Int? = null,
-            @JsonProperty("vote_average") val vote_average: Any? = null,
-            @JsonProperty("original_language") val original_language: String? = null,
-            @JsonProperty("status") val status: String? = null,
-            @JsonProperty("genres") val genres: ArrayList<Genres>? = arrayListOf(),
-            @JsonProperty("keywords") val keywords: KeywordResults? = null,
-            @JsonProperty("last_episode_to_air") val last_episode_to_air: LastEpisodeToAir? = null,
-            @JsonProperty("seasons") val seasons: ArrayList<Seasons>? = arrayListOf(),
-            @JsonProperty("videos") val videos: ResultsTrailer? = null,
-            @JsonProperty("external_ids") val external_ids: ExternalIds? = null,
-            @JsonProperty("credits") val credits: Credits? = null,
-            @JsonProperty("recommendations") val recommendations: ResultsRecommendations? = null,
-            @JsonProperty("alternative_titles") val alternative_titles: ResultsAltTitles? = null,
-            @JsonProperty("production_countries") val production_countries: ArrayList<ProductionCountries>? = arrayListOf(),
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("original_title") val originalTitle: String? = null,
+        @JsonProperty("original_name") val originalName: String? = null,
+        @JsonProperty("poster_path") val posterPath: String? = null,
+        @JsonProperty("backdrop_path") val backdropPath: String? = null,
+        @JsonProperty("release_date") val releaseDate: String? = null,
+        @JsonProperty("first_air_date") val firstAirDate: String? = null,
+        @JsonProperty("overview") val overview: String? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
+        @JsonProperty("vote_average") val vote_average: Any? = null,
+        @JsonProperty("original_language") val original_language: String? = null,
+        @JsonProperty("status") val status: String? = null,
+        @JsonProperty("genres") val genres: ArrayList<Genres>? = arrayListOf(),
+        @JsonProperty("keywords") val keywords: KeywordResults? = null,
+        @JsonProperty("last_episode_to_air") val last_episode_to_air: LastEpisodeToAir? = null,
+        @JsonProperty("seasons") val seasons: ArrayList<Seasons>? = arrayListOf(),
+        @JsonProperty("videos") val videos: ResultsTrailer? = null,
+        @JsonProperty("external_ids") val external_ids: ExternalIds? = null,
+        @JsonProperty("credits") val credits: Credits? = null,
+        @JsonProperty("recommendations") val recommendations: ResultsRecommendations? = null,
+        @JsonProperty("alternative_titles") val alternative_titles: ResultsAltTitles? = null,
+        @JsonProperty("production_countries") val production_countries: ArrayList<ProductionCountries>? = arrayListOf(),
     )
 
 }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 2ea87243..03d63963 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -42,121 +42,291 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 class SoraStreamLite : SoraStream() {
     override var name = "SoraStream-Lite"
 
-    override suspend fun loadLinks(data: String, isCasting: Boolean, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit): Boolean {
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
 
         val res = AppUtils.parseJson<LinkData>(data)
 
         argamap(
-                {
-                    if (!res.isAnime) invokeWatchsomuch(res.imdbId, res.season, res.episode, subtitleCallback)
-                },
-                {
-                    invokeDumpStream(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeNinetv(res.id, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeGoku(res.title, res.year, res.season, res.lastSeason, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeVidSrc(res.id, res.season, res.episode, callback)
-                },
-                {
-                    invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime && res.isCartoon) invokeWatchCartoon(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isAnime) invokeAnimes(res.title, res.epsTitle, res.date, res.airedDate, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeDreamfilm(res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeFilmxy(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeOmovies(res.title, res.year, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime && res.isCartoon) invokeKimcartoon(res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeSmashyStream(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeVidsrcto(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isAsian || res.isAnime) invokeKisskh(res.title, res.season, res.episode, res.isAnime, res.lastSeason, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeLing(res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeM4uhd(res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeFlixon(res.id, res.imdbId, res.season, res.episode, callback)
-                },
-                {
-                    invokeCinemaTv(res.imdbId, res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime) invokeAoneroom(res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, callback)
-                },
-                {
-                    if (!res.isAnime) invokeEmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isBollywood) invokeMultimovies(multimoviesAPI, res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (res.isBollywood) invokeMultimovies(multimovies2API, res.title, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeNetmovies(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
-                },
-                {
-                    if (!res.isAnime && res.season == null) invokeDoomovies(res.title, subtitleCallback, callback)
-                },
-                {
-                    if (res.isAsian) invokeDramaday(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invoke2embed(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    invokeZshow(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeShowflix(res.title, res.year, res.season, res.episode, subtitleCallback, callback)
-                },
-                {
-                    if (!res.isAnime) invokeSFMovies(res.id, res.title, res.airedYear
-                            ?: res.year, res.season, res.episode, callback)
-                },
-                {
-                    invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
-                },
+            {
+                if (!res.isAnime) invokeWatchsomuch(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback
+                )
+            },
+            {
+                invokeDumpStream(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeNinetv(
+                    res.id,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeGoku(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.lastSeason,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeVidSrc(res.id, res.season, res.episode, callback)
+            },
+            {
+                invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
+            },
+            {
+                if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isAnime) invokeAnimes(
+                    res.title,
+                    res.epsTitle,
+                    res.date,
+                    res.airedDate,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeDreamfilm(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeFilmxy(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeOmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime && res.isCartoon) invokeKimcartoon(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeSmashyStream(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeVidsrcto(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isAsian || res.isAnime) invokeKisskh(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    res.isAnime,
+                    res.lastSeason,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeLing(
+                    res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeM4uhd(
+                    res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime) invokeFlixon(
+                    res.id,
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            },
+            {
+                invokeCinemaTv(
+                    res.imdbId, res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime) invokeAoneroom(
+                    res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, subtitleCallback, callback
+                )
+            },
+            {
+                if (!res.isAnime && res.season == null) invokeRidomovies(
+                    res.id,
+                    res.imdbId,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeEmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isBollywood) invokeMultimovies(
+                    multimoviesAPI,
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isBollywood) invokeMultimovies(
+                    multimovies2API,
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeNetmovies(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
+            },
+            {
+                if (!res.isAnime && res.season == null) invokeDoomovies(
+                    res.title,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (res.isAsian) invokeDramaday(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invoke2embed(
+                    res.imdbId,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeZshow(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeShowflix(
+                    res.title,
+                    res.year,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                if (!res.isAnime) invokeSFMovies(
+                    res.id, res.title, res.airedYear
+                        ?: res.year, res.season, res.episode, callback
+                )
+            },
+            {
+                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+            },
         )
 
         return true

From f160b618354b25affa412bdb477a4056541a5248 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 8 Jan 2024 02:40:51 +0700
Subject: [PATCH 055/125] fix

---
 .../kotlin/com/hexated/KuramanimeProvider.kt  | 128 ------------------
 1 file changed, 128 deletions(-)

diff --git a/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt b/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt
index 83bdcfb5..b911d57a 100644
--- a/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt
+++ b/KuramanimeProvider/src/main/kotlin/com/hexated/KuramanimeProvider.kt
@@ -3,13 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addMalId
-import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.nicehttp.requestCreator
-import okhttp3.Headers
-import okhttp3.HttpUrl
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 
@@ -20,10 +14,6 @@ class KuramanimeProvider : MainAPI() {
     override val hasMainPage = true
     override var lang = "id"
     override val hasDownloadSupport = true
-    private var miscUrl: String? = null
-    private var headers: Map<String, String> = mapOf()
-    private var cookies: Map<String, String> = mapOf()
-    private var mixPage: Pair<String, String>? = null
     override val supportedTypes = setOf(
             TvType.Anime,
             TvType.AnimeMovie,
@@ -165,43 +155,6 @@ class KuramanimeProvider : MainAPI() {
 
     }
 
-    private suspend fun invokeLocalSource(
-            url: String,
-            server: String,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
-    ) {
-        val document = app.get(
-                url,
-                headers = headers,
-                cookies = cookies
-        ).document
-        document.select("video#player > source").map {
-            val link = fixUrl(it.attr("src"))
-            val quality = it.attr("size").toIntOrNull()
-            callback.invoke(
-                    ExtractorLink(
-                            fixTitle(server),
-                            fixTitle(server),
-                            link,
-                            referer = "",
-                            quality = quality ?: Qualities.Unknown.value,
-                            headers = mapOf(
-                                    "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
-                                    "Range" to "bytes=0-",
-                                    "Sec-Fetch-Dest" to "video",
-                                    "Sec-Fetch-Mode" to "no-cors",
-                            ),
-                    )
-            )
-        }
-        if(server=="kuramadrive") {
-            document.select("div#animeDownloadLink a").apmap {
-                loadExtractor(it.attr("href"), "$mainUrl/", subtitleCallback, callback)
-            }
-        }
-    }
-
     override suspend fun loadLinks(
             data: String,
             isCasting: Boolean,
@@ -209,88 +162,7 @@ class KuramanimeProvider : MainAPI() {
             callback: (ExtractorLink) -> Unit
     ): Boolean {
 
-        val req = app.get(data)
-        val res = req.document
-        cookies = req.cookies
-
-        val bpjs = res.selectFirst("div.col-lg-12.mt-3")?.attr("data-bpjs") ?: return false
-
-        val auth = getMiscUrl(data)
-        val misc = getMisc(auth)
-        val mixPage = getMixPage(bpjs)
-
-        res.select("select#changeServer option").apmap { source ->
-            val server = source.attr("value")
-            val link = "$data?${mixPage.first}=$misc&${mixPage.second}=$server"
-            if (server.contains(Regex("(?i)kuramadrive|archive"))) {
-                invokeLocalSource(link, server, subtitleCallback, callback)
-            } else {
-                app.get(
-                        link,
-                        referer = data,
-                        headers = headers,
-                        cookies = cookies
-                ).document.select("div.iframe-container iframe").attr("src").let { videoUrl ->
-                    loadExtractor(fixUrl(videoUrl), "$mainUrl/", subtitleCallback, callback)
-                }
-            }
-        }
-
-
         return true
     }
 
-    private suspend fun fetchMiscUrl(url: String): String {
-        val regex = Regex("""$mainUrl/.*""")
-        val found = WebViewResolver(
-                Regex("""$mainUrl/assets/\S+.jpg"""),
-                additionalUrls = listOf(regex),
-        ).resolveUsingWebView(
-                requestCreator(
-                        "GET", url
-                        , cookies = cookies, referer = "$mainUrl/", headers = mapOf(
-                        "Accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
-                        "Accept-Language" to "en-US,en;q=0.5",
-                )
-                )
-        ).first
-        headers = found?.headers?.associate { it.first to it.second } ?: mapOf()
-        return found?.url.toString()
-    }
-
-    private suspend fun getMiscUrl(url: String) = miscUrl ?: fetchMiscUrl(url).also { miscUrl = it }
-
-    private suspend fun fetchMixPage(bpjs: String): Pair<String,String> {
-        val env = app.get("$mainUrl/assets/js/$bpjs.js").text
-        val MIX_PAGE_TOKEN_KEY = env.substringAfter("MIX_PAGE_TOKEN_KEY: '").substringBefore("',")
-        val MIX_STREAM_SERVER_KEY = env.substringAfter("MIX_STREAM_SERVER_KEY: '").substringBefore("',")
-        return MIX_PAGE_TOKEN_KEY to MIX_STREAM_SERVER_KEY
-    }
-
-    private suspend fun getMixPage(bpjs: String) = mixPage ?: fetchMixPage(bpjs).also { mixPage = it }
-
-    private suspend fun getMisc(url: String?): String {
-        val res = app.get("$url", headers = headers)
-        cookies = res.cookies
-        return res.text.removeBloat()
-    }
-
-    private fun getRequestId(length: Int = 6): String {
-        val allowedChars = ('a'..'z') + ('0'..'9')
-        return (1..length)
-                .map { allowedChars.random() }
-                .joinToString("")
-    }
-
-    private fun String.removeBloat() : String {
-        return this.replace("\"", "")
-    }
-
-    data class AuthParams(
-            val header: Map<String, String>?,
-            val params: List<String>?,
-            val misc: String,
-            val miscUrl: String?,
-    )
-
 }
\ No newline at end of file

From 09b5b762602efb385a64a5decec763e2ef382591 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 8 Jan 2024 02:46:42 +0700
Subject: [PATCH 056/125] update

---
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 1673 ++++++++++++-----
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |   15 +-
 2 files changed, 1244 insertions(+), 444 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 07b6c2cf..4d913dfe 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -21,100 +21,170 @@ val session = Session(Requests().baseClient)
 
 object SoraExtractor : SoraStream() {
 
-    suspend fun invokeGoku(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeGoku(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        lastSeason: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
 
         fun Document.getServers(): List<Pair<String, String>> {
             return this.select("a").map { it.attr("data-id") to it.text() }
         }
 
-        val media = app.get("$gokuAPI/ajax/movie/search?keyword=$title", headers = headers).document.select("div.item").find { ele ->
-            val url = ele.selectFirst("a.movie-link")?.attr("href")
-            val titleMedia = ele.select("h3.movie-name").text()
-            val titleSlug = title.createSlug()
-            val yearMedia = ele.select("div.info-split > div:first-child").text().toIntOrNull()
-            val lastSeasonMedia = ele.select("div.info-split > div:nth-child(2)").text().substringAfter("SS").substringBefore("/").trim().toIntOrNull()
-            (titleMedia.equals(title, true) || titleMedia.createSlug().equals(titleSlug) || url?.contains("$titleSlug-") == true) && (if (season == null) {
-                yearMedia == year && url?.contains("/movie/") == true
-            } else {
-                lastSeasonMedia == lastSeason && url?.contains("/series/") == true
-            })
-        } ?: return
+        val media =
+            app.get("$gokuAPI/ajax/movie/search?keyword=$title", headers = headers).document.select(
+                "div.item"
+            ).find { ele ->
+                val url = ele.selectFirst("a.movie-link")?.attr("href")
+                val titleMedia = ele.select("h3.movie-name").text()
+                val titleSlug = title.createSlug()
+                val yearMedia = ele.select("div.info-split > div:first-child").text().toIntOrNull()
+                val lastSeasonMedia =
+                    ele.select("div.info-split > div:nth-child(2)").text().substringAfter("SS")
+                        .substringBefore("/").trim().toIntOrNull()
+                (titleMedia.equals(title, true) || titleMedia.createSlug()
+                    .equals(titleSlug) || url?.contains("$titleSlug-") == true) && (if (season == null) {
+                    yearMedia == year && url?.contains("/movie/") == true
+                } else {
+                    lastSeasonMedia == lastSeason && url?.contains("/series/") == true
+                })
+            } ?: return
 
         val serversId = if (season == null) {
-            val movieId = app.get(fixUrl(media.selectFirst("a")?.attr("href")
-                    ?: return, gokuAPI)).url.substringAfterLast("/")
-            app.get("$gokuAPI/ajax/movie/episode/servers/$movieId", headers = headers).document.getServers()
+            val movieId = app.get(
+                fixUrl(
+                    media.selectFirst("a")?.attr("href")
+                        ?: return, gokuAPI
+                )
+            ).url.substringAfterLast("/")
+            app.get(
+                "$gokuAPI/ajax/movie/episode/servers/$movieId",
+                headers = headers
+            ).document.getServers()
         } else {
-            val seasonId = app.get("$gokuAPI/ajax/movie/seasons/${
-                media.selectFirst("a.btn-wl")?.attr("data-id") ?: return
-            }", headers = headers).document.select("a.ss-item").find { it.ownText().equals("Season $season", true) }?.attr("data-id")
-            val episodeId = app.get("$gokuAPI/ajax/movie/season/episodes/${seasonId ?: return}", headers = headers).document.select("div.item").find {
+            val seasonId = app.get(
+                "$gokuAPI/ajax/movie/seasons/${
+                    media.selectFirst("a.btn-wl")?.attr("data-id") ?: return
+                }", headers = headers
+            ).document.select("a.ss-item").find { it.ownText().equals("Season $season", true) }
+                ?.attr("data-id")
+            val episodeId = app.get(
+                "$gokuAPI/ajax/movie/season/episodes/${seasonId ?: return}",
+                headers = headers
+            ).document.select("div.item").find {
                 it.selectFirst("strong")?.text().equals("Eps $episode:", true)
             }?.selectFirst("a")?.attr("data-id")
 
-            app.get("$gokuAPI/ajax/movie/episode/servers/${episodeId ?: return}", headers = headers).document.getServers()
+            app.get(
+                "$gokuAPI/ajax/movie/episode/servers/${episodeId ?: return}",
+                headers = headers
+            ).document.getServers()
         }
 
         serversId.apmap { (id, name) ->
-            val iframe = app.get("$gokuAPI/ajax/movie/episode/server/sources/$id", headers = headers).parsedSafe<GokuServer>()?.data?.link
+            val iframe =
+                app.get("$gokuAPI/ajax/movie/episode/server/sources/$id", headers = headers)
+                    .parsedSafe<GokuServer>()?.data?.link
                     ?: return@apmap
             loadCustomExtractor(
-                    name,
-                    iframe,
-                    "$gokuAPI/",
-                    subtitleCallback,
-                    callback,
+                name,
+                iframe,
+                "$gokuAPI/",
+                subtitleCallback,
+                callback,
             )
         }
     }
 
-    suspend fun invokeVidSrc(id: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeVidSrc(
+        id: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val url = if (season == null) {
             "$vidSrcAPI/embed/movie?tmdb=$id"
         } else {
             "$vidSrcAPI/embed/tv?tmdb=$id&season=$season&episode=$episode"
         }
 
-        val iframedoc = app.get(url).document.select("iframe#player_iframe").attr("src").let { httpsify(it) }
+        val iframedoc =
+            app.get(url).document.select("iframe#player_iframe").attr("src").let { httpsify(it) }
         val doc = app.get(iframedoc, referer = url).document
 
         val index = doc.select("body").attr("data-i")
         val hash = doc.select("div#hidden").attr("data-h")
         val srcrcp = deobfstr(hash, index)
 
-        val script = app.get(httpsify(srcrcp), referer = iframedoc).document.selectFirst("script:containsData(Playerjs)")?.data()
-        val video = script?.substringAfter("file:\"#2")?.substringBefore("\"")?.replace(Regex("(//\\S+?=)"), "")?.let { base64Decode(it) }
+        val script = app.get(
+            httpsify(srcrcp),
+            referer = iframedoc
+        ).document.selectFirst("script:containsData(Playerjs)")?.data()
+        val video = script?.substringAfter("file:\"#2")?.substringBefore("\"")
+            ?.replace(Regex("(//\\S+?=)"), "")?.let { base64Decode(it) }
 
-        callback.invoke(ExtractorLink("Vidsrc", "Vidsrc", video
-                ?: return, "https://vidsrc.stream/", Qualities.P1080.value, INFER_TYPE))
+        callback.invoke(
+            ExtractorLink(
+                "Vidsrc", "Vidsrc", video
+                    ?: return, "https://vidsrc.stream/", Qualities.P1080.value, INFER_TYPE
+            )
+        )
     }
 
-    suspend fun invokeDbgo(id: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeDbgo(
+        id: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
 
         val iframeDbgo: String?
         val script = if (season == null) {
             val doc = app.get("$dbgoAPI/imdb.php?id=$id").document
             iframeDbgo = doc.select("div.myvideo iframe").attr("src")
-            app.get(iframeDbgo, referer = "$dbgoAPI/").document.select("script").find { it.data().contains("CDNplayerConfig =") }?.data()
+            app.get(iframeDbgo, referer = "$dbgoAPI/").document.select("script")
+                .find { it.data().contains("CDNplayerConfig =") }?.data()
         } else {
             val doc = app.get("$dbgoAPI/tv-imdb.php?id=$id&s=$season").document
             iframeDbgo = doc.select("div.myvideo iframe").attr("src")
-            val token = app.get(iframeDbgo, referer = "$dbgoAPI/").document.selectFirst("select#translator-name option")?.attr("data-token")
-            app.get("https://voidboost.net/serial/$token/iframe?s=$season&e=$episode&h=dbgo.fun").document.select("script").find { it.data().contains("CDNplayerConfig =") }?.data()
+            val token = app.get(
+                iframeDbgo,
+                referer = "$dbgoAPI/"
+            ).document.selectFirst("select#translator-name option")?.attr("data-token")
+            app.get("https://voidboost.net/serial/$token/iframe?s=$season&e=$episode&h=dbgo.fun").document.select(
+                "script"
+            ).find { it.data().contains("CDNplayerConfig =") }?.data()
         } ?: return
 
-        val source = Regex("['|\"]file['|\"]:\\s['|\"](#\\S+?)['|\"]").find(script)?.groupValues?.get(1)
+        val source =
+            Regex("['|\"]file['|\"]:\\s['|\"](#\\S+?)['|\"]").find(script)?.groupValues?.get(1)
                 ?: return
-        val subtitle = Regex("['|\"]subtitle['|\"]:\\s['|\"](\\S+?)['|\"]").find(script)?.groupValues?.get(1)
+        val subtitle =
+            Regex("['|\"]subtitle['|\"]:\\s['|\"](\\S+?)['|\"]").find(script)?.groupValues?.get(1)
 
         val ref = getBaseUrl(iframeDbgo)
         decryptStreamUrl(source).split(",").map { links ->
             val quality = Regex("\\[(\\d*p.*?)]").find(links)?.groupValues?.getOrNull(1)?.trim()
-                    ?: return@map null
+                ?: return@map null
             links.replace("[$quality]", "").split(" or ").map { it.trim() }.map { link ->
                 val name = if (link.contains(".m3u8")) "Dbgo (Main)" else "Dbgo (Backup)"
-                callback.invoke(ExtractorLink(name, name, link, "$ref/", getQuality(quality), isM3u8 = link.contains(".m3u8"), headers = mapOf("Origin" to ref)))
+                callback.invoke(
+                    ExtractorLink(
+                        name,
+                        name,
+                        link,
+                        "$ref/",
+                        getQuality(quality),
+                        isM3u8 = link.contains(".m3u8"),
+                        headers = mapOf("Origin" to ref)
+                    )
+                )
             }
         }
 
@@ -126,7 +196,13 @@ object SoraExtractor : SoraStream() {
 
     }
 
-    suspend fun invokeDreamfilm(title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeDreamfilm(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$dreamfilmAPI/$fixTitle"
@@ -136,13 +212,28 @@ object SoraExtractor : SoraStream() {
 
         val doc = app.get(url).document
         doc.select("div#videosen a").apmap {
-            val iframe = app.get(it.attr("href")).document.selectFirst("div.card-video iframe")?.attr("data-src")
-            loadCustomExtractor(null, iframe
-                    ?: return@apmap, "$dreamfilmAPI/", subtitleCallback, callback, Qualities.P1080.value)
+            val iframe = app.get(it.attr("href")).document.selectFirst("div.card-video iframe")
+                ?.attr("data-src")
+            loadCustomExtractor(
+                null,
+                iframe
+                    ?: return@apmap,
+                "$dreamfilmAPI/",
+                subtitleCallback,
+                callback,
+                Qualities.P1080.value
+            )
         }
     }
 
-    suspend fun invokeMultimovies(apiUrl: String, title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeMultimovies(
+        apiUrl: String,
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$apiUrl/movies/$fixTitle"
@@ -155,47 +246,77 @@ object SoraExtractor : SoraStream() {
         if (!iframe.contains("youtube")) {
             loadExtractor(iframe, "$directUrl/", subtitleCallback) { link ->
                 if (link.quality == Qualities.Unknown.value) {
-                    callback.invoke(ExtractorLink(link.source, link.name, link.url, link.referer, Qualities.P1080.value, link.type, link.headers, link.extractorData))
+                    callback.invoke(
+                        ExtractorLink(
+                            link.source,
+                            link.name,
+                            link.url,
+                            link.referer,
+                            Qualities.P1080.value,
+                            link.type,
+                            link.headers,
+                            link.extractorData
+                        )
+                    )
                 }
             }
         }
     }
 
     suspend fun invokeAoneroom(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
     ) {
-        val headers = mapOf("Authorization" to "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOjcyODc3MjQ5OTg4MzA0NzM5NzYsInV0cCI6MSwiZXhwIjoxNzEwMzg4NzczLCJpYXQiOjE3MDI2MTI3NzN9.Myt-gVHfPfQFbFyRX3WXtiiwvRzDwBrXTEKy1l-GDRU")
-        val subjectId = app.post("$aoneroomAPI/wefeed-mobile-bff/subject-api/search", data = mapOf(
+        val headers =
+            mapOf("Authorization" to "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOjcyODc3MjQ5OTg4MzA0NzM5NzYsInV0cCI6MSwiZXhwIjoxNzEwMzg4NzczLCJpYXQiOjE3MDI2MTI3NzN9.Myt-gVHfPfQFbFyRX3WXtiiwvRzDwBrXTEKy1l-GDRU")
+        val subjectId = app.post(
+            "$aoneroomAPI/wefeed-mobile-bff/subject-api/search", data = mapOf(
                 "page" to "1",
                 "perPage" to "10",
                 "keyword" to "$title",
                 "subjectType" to if (season == null) "1" else "2",
-        ), headers = headers).parsedSafe<AoneroomResponse>()?.data?.items?.find {
+            ), headers = headers
+        ).parsedSafe<AoneroomResponse>()?.data?.items?.find {
             it.title.equals(title, true) && it.releaseDate?.substringBefore("-") == "$year"
         }?.subjectId
 
-        val data = app.get("$aoneroomAPI/wefeed-mobile-bff/subject-api/resource?subjectId=${subjectId ?: return}&page=1&perPage=20&all=0&startPosition=1&endPosition=1&pagerMode=0&resolution=480", headers = headers).parsedSafe<AoneroomResponse>()?.data?.list?.findLast {
+        val data = app.get(
+            "$aoneroomAPI/wefeed-mobile-bff/subject-api/resource?subjectId=${subjectId ?: return}&page=1&perPage=20&all=0&startPosition=1&endPosition=1&pagerMode=0&resolution=480",
+            headers = headers
+        ).parsedSafe<AoneroomResponse>()?.data?.list?.findLast {
             it.se == (season ?: 0) && it.ep == (episode ?: 0)
         }
 
-        callback.invoke(ExtractorLink("Aoneroom", "Aoneroom", data?.resourceLink
-                ?: return, "", data.resolution ?: Qualities.Unknown.value, INFER_TYPE))
+        callback.invoke(
+            ExtractorLink(
+                "Aoneroom", "Aoneroom", data?.resourceLink
+                    ?: return, "", data.resolution ?: Qualities.Unknown.value, INFER_TYPE
+            )
+        )
 
         data.extCaptions?.map { sub ->
-            subtitleCallback.invoke(SubtitleFile(
+            subtitleCallback.invoke(
+                SubtitleFile(
                     sub.lanName ?: return@map,
                     sub.url ?: return@map,
-            ))
+                )
+            )
         }
 
     }
 
-    suspend fun invokeWatchCartoon(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeWatchCartoon(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$watchCartoonAPI/movies/$fixTitle-$year"
@@ -209,16 +330,37 @@ object SoraExtractor : SoraStream() {
 
         val id = doc.select("link[rel=shortlink]").attr("href").substringAfterLast("=")
         doc.select("div.form-group.list-server option").apmap {
-            val server = app.get("$host/ajax-get-link-stream/?server=${it.attr("value")}&filmId=$id", headers = mapOf("X-Requested-With" to "XMLHttpRequest")).text
+            val server = app.get(
+                "$host/ajax-get-link-stream/?server=${it.attr("value")}&filmId=$id",
+                headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+            ).text
             loadExtractor(server, "$host/", subtitleCallback) { link ->
                 if (link.quality == Qualities.Unknown.value) {
-                    callback.invoke(ExtractorLink("WatchCartoon", "WatchCartoon", link.url, link.referer, Qualities.P720.value, link.type, link.headers, link.extractorData))
+                    callback.invoke(
+                        ExtractorLink(
+                            "WatchCartoon",
+                            "WatchCartoon",
+                            link.url,
+                            link.referer,
+                            Qualities.P720.value,
+                            link.type,
+                            link.headers,
+                            link.extractorData
+                        )
+                    )
                 }
             }
         }
     }
 
-    suspend fun invokeNetmovies(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeNetmovies(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$netmoviesAPI/movies/$fixTitle-$year"
@@ -228,7 +370,14 @@ object SoraExtractor : SoraStream() {
         invokeWpmovies(null, url, subtitleCallback, callback)
     }
 
-    suspend fun invokeZshow(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeZshow(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$zshowAPI/movie/$fixTitle-$year"
@@ -238,7 +387,13 @@ object SoraExtractor : SoraStream() {
         invokeWpmovies("ZShow", url, subtitleCallback, callback, encrypt = true)
     }
 
-    suspend fun invokeMMovies(title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeMMovies(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$mMoviesAPI/movies/$fixTitle"
@@ -246,18 +401,26 @@ object SoraExtractor : SoraStream() {
             "$mMoviesAPI/episodes/$fixTitle-${season}x${episode}"
         }
 
-        invokeWpmovies(null, url, subtitleCallback, callback, true, hasCloudflare = true, interceptor = multiInterceptor)
+        invokeWpmovies(
+            null,
+            url,
+            subtitleCallback,
+            callback,
+            true,
+            hasCloudflare = true,
+            interceptor = multiInterceptor
+        )
     }
 
     private suspend fun invokeWpmovies(
-            name: String? = null,
-            url: String? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
-            fixIframe: Boolean = false,
-            encrypt: Boolean = false,
-            hasCloudflare: Boolean = false,
-            interceptor: Interceptor? = null,
+        name: String? = null,
+        url: String? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+        fixIframe: Boolean = false,
+        encrypt: Boolean = false,
+        hasCloudflare: Boolean = false,
+        interceptor: Interceptor? = null,
     ) {
         fun String.fixBloat(): String {
             return this.replace("\"", "").replace("\\", "")
@@ -270,7 +433,18 @@ object SoraExtractor : SoraStream() {
             Triple(it.attr("data-post"), it.attr("data-nume"), it.attr("data-type"))
         }.apmap { (id, nume, type) ->
             delay(1000)
-            val json = app.post(url = "$referer/wp-admin/admin-ajax.php", data = mapOf("action" to "doo_player_ajax", "post" to id, "nume" to nume, "type" to type), headers = mapOf("Accept" to "*/*", "X-Requested-With" to "XMLHttpRequest"), referer = url, interceptor = if (hasCloudflare) interceptor else null)
+            val json = app.post(
+                url = "$referer/wp-admin/admin-ajax.php",
+                data = mapOf(
+                    "action" to "doo_player_ajax",
+                    "post" to id,
+                    "nume" to nume,
+                    "type" to type
+                ),
+                headers = mapOf("Accept" to "*/*", "X-Requested-With" to "XMLHttpRequest"),
+                referer = url,
+                interceptor = if (hasCloudflare) interceptor else null
+            )
             val source = tryParseJson<ResponseHash>(json.text)?.let {
                 when {
                     encrypt -> {
@@ -291,21 +465,36 @@ object SoraExtractor : SoraStream() {
         }
     }
 
-    suspend fun invokeDoomovies(title: String? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeDoomovies(
+        title: String? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val res = app.get("$doomoviesAPI/movies/${title.createSlug()}/")
         val host = getBaseUrl(res.url)
         val document = res.document
-        document.select("ul#playeroptionsul > li").filter { element -> element.select("span.flag img").attr("src").contains("/en.") }.map {
-            Triple(it.attr("data-post"), it.attr("data-nume"), it.attr("data-type"))
-        }.apmap { (id, nume, type) ->
-            val source = app.get("$host/wp-json/dooplayer/v2/${id}/${type}/${nume}", headers = mapOf("X-Requested-With" to "XMLHttpRequest"), referer = "$host/").parsed<ResponseHash>().embed_url
+        document.select("ul#playeroptionsul > li")
+            .filter { element -> element.select("span.flag img").attr("src").contains("/en.") }
+            .map {
+                Triple(it.attr("data-post"), it.attr("data-nume"), it.attr("data-type"))
+            }.apmap { (id, nume, type) ->
+            val source = app.get(
+                "$host/wp-json/dooplayer/v2/${id}/${type}/${nume}",
+                headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
+                referer = "$host/"
+            ).parsed<ResponseHash>().embed_url
             if (!source.contains("youtube")) {
                 loadExtractor(source, "$host/", subtitleCallback, callback)
             }
         }
     }
 
-    suspend fun invokeNoverse(title: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeNoverse(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$noverseAPI/movie/$fixTitle/download/"
@@ -320,7 +509,8 @@ object SoraExtractor : SoraStream() {
                 it.select("a").attr("href") to it.selectFirst("td")?.text()
             }
         } else {
-            doc.select("table.table-striped tbody tr").find { it.text().contains("Episode $episode") }?.select("td")?.map {
+            doc.select("table.table-striped tbody tr")
+                .find { it.text().contains("Episode $episode") }?.select("td")?.map {
                 it.select("a").attr("href") to it.select("a").text()
             }
         } ?: return
@@ -328,19 +518,27 @@ object SoraExtractor : SoraStream() {
         delay(4000)
         links.map { (link, quality) ->
             val name = quality?.replace(Regex("\\d{3,4}p"), "Noverse")?.replace(".", " ")
-                    ?: "Noverse"
-            callback.invoke(ExtractorLink(
+                ?: "Noverse"
+            callback.invoke(
+                ExtractorLink(
                     "Noverse",
                     name,
                     link,
                     "",
                     getQualityFromName("${quality?.substringBefore("p")?.trim()}p"),
-            ))
+                )
+            )
         }
 
     }
 
-    suspend fun invokeFilmxy(imdbId: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeFilmxy(
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val url = if (season == null) {
             "${filmxyAPI}/movie/$imdbId"
         } else {
@@ -350,15 +548,18 @@ object SoraExtractor : SoraStream() {
         val doc = app.get(url, cookies = filmxyCookies).document
         val script = doc.selectFirst("script:containsData(var isSingle)")?.data() ?: return
 
-        val sourcesData = Regex("listSE\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
-            tryParseJson<HashMap<String, HashMap<String, List<String>>>>(it)
-        }
-        val sourcesDetail = Regex("linkDetails\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
-            tryParseJson<HashMap<String, HashMap<String, String>>>(it)
-        }
-        val subSourcesData = Regex("dSubtitles\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
-            tryParseJson<HashMap<String, HashMap<String, HashMap<String, String>>>>(it)
-        }
+        val sourcesData =
+            Regex("listSE\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
+                tryParseJson<HashMap<String, HashMap<String, List<String>>>>(it)
+            }
+        val sourcesDetail =
+            Regex("linkDetails\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
+                tryParseJson<HashMap<String, HashMap<String, String>>>(it)
+            }
+        val subSourcesData =
+            Regex("dSubtitles\\s*=\\s?(.*?),[\\n|\\s]").find(script)?.groupValues?.get(1).let {
+                tryParseJson<HashMap<String, HashMap<String, HashMap<String, String>>>>(it)
+            }
 
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
 
@@ -374,23 +575,32 @@ object SoraExtractor : SoraStream() {
         }
 
         val scriptUser = doc.select("script").find { it.data().contains("var userNonce") }?.data()
-                ?: return
-        val userNonce = Regex("var\\suserNonce.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
-        val userId = Regex("var\\suser_id.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
+            ?: return
+        val userNonce =
+            Regex("var\\suserNonce.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
+        val userId =
+            Regex("var\\suser_id.*?[\"|'](\\S+?)[\"|'];").find(scriptUser)?.groupValues?.get(1)
 
-        val listSources = sources.withIndex().groupBy { it.index / 2 }.map { entry -> entry.value.map { it.value } }
+        val listSources = sources.withIndex().groupBy { it.index / 2 }
+            .map { entry -> entry.value.map { it.value } }
 
         listSources.apmap { src ->
             val linkIDs = src.joinToString("") {
                 "&linkIDs%5B%5D=$it"
             }.replace("\"", "")
-            val json = app.post("$filmxyAPI/wp-admin/admin-ajax.php", requestBody = "action=get_vid_links$linkIDs&user_id=$userId&nonce=$userNonce".toRequestBody(), referer = url, headers = mapOf(
+            val json = app.post(
+                "$filmxyAPI/wp-admin/admin-ajax.php",
+                requestBody = "action=get_vid_links$linkIDs&user_id=$userId&nonce=$userNonce".toRequestBody(),
+                referer = url,
+                headers = mapOf(
                     "Accept" to "*/*",
                     "DNT" to "1",
                     "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8",
                     "Origin" to filmxyAPI,
                     "X-Requested-With" to "XMLHttpRequest",
-            ), cookies = filmxyCookies).text.let { tryParseJson<HashMap<String, String>>(it) }
+                ),
+                cookies = filmxyCookies
+            ).text.let { tryParseJson<HashMap<String, String>>(it) }
 
             src.map { source ->
                 val link = json?.get(source)
@@ -398,22 +608,39 @@ object SoraExtractor : SoraStream() {
                 val server = sourcesDetail?.get(source)?.get("server")
                 val size = sourcesDetail?.get(source)?.get("size")
 
-                callback.invoke(ExtractorLink("Filmxy", "Filmxy $server [$size]", link
-                        ?: return@map, "$filmxyAPI/", getQualityFromName(quality)))
+                callback.invoke(
+                    ExtractorLink(
+                        "Filmxy", "Filmxy $server [$size]", link
+                            ?: return@map, "$filmxyAPI/", getQualityFromName(quality)
+                    )
+                )
             }
         }
 
         subSources?.mapKeys { sub ->
-            subtitleCallback.invoke(SubtitleFile(SubtitleHelper.fromTwoLettersToLanguage(sub.key)
-                    ?: return@mapKeys, "https://www.mysubs.org/get-subtitle/${sub.value}"))
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    SubtitleHelper.fromTwoLettersToLanguage(sub.key)
+                        ?: return@mapKeys, "https://www.mysubs.org/get-subtitle/${sub.value}"
+                )
+            )
         }
 
     }
 
-    suspend fun invokeDramaday(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        fun String.getQuality(): String? = Regex("""\d{3,4}[pP]""").find(this)?.groupValues?.getOrNull(0)
+    suspend fun invokeDramaday(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        fun String.getQuality(): String? =
+            Regex("""\d{3,4}[pP]""").find(this)?.groupValues?.getOrNull(0)
 
-        fun String.getTag(): String? = Regex("""\d{3,4}[pP]\s*(.*)""").find(this)?.groupValues?.getOrNull(1)
+        fun String.getTag(): String? =
+            Regex("""\d{3,4}[pP]\s*(.*)""").find(this)?.groupValues?.getOrNull(1)
 
         val slug = title.createSlug()
         val epsSlug = getEpisodeSlug(season, episode)
@@ -427,8 +654,10 @@ object SoraExtractor : SoraStream() {
         val servers = if (season == null) {
             val player = res.select("div.tabs__pane p a[href*=https://ouo]").attr("href")
             val ouo = bypassOuo(player)
-            app.get(ouo
-                    ?: return).document.select("article p:matches(\\d{3,4}[pP]) + p:has(a)").flatMap { ele ->
+            app.get(
+                ouo
+                    ?: return
+            ).document.select("article p:matches(\\d{3,4}[pP]) + p:has(a)").flatMap { ele ->
                 val entry = ele.previousElementSibling()?.text() ?: ""
                 ele.select("a").map {
                     Triple(entry.getQuality(), entry.getTag(), it.attr("href"))
@@ -438,7 +667,8 @@ object SoraExtractor : SoraStream() {
             }
         } else {
             val data = res.select("tbody tr:has(td[data-order=${epsSlug.second}])")
-            val qualities = data.select("td:nth-child(2)").attr("data-order").split("<br>").map { it }
+            val qualities =
+                data.select("td:nth-child(2)").attr("data-order").split("<br>").map { it }
             val iframe = data.select("a[href*=https://ouo]").map { it.attr("href") }
             qualities.zip(iframe).map {
                 Triple(it.first.getQuality(), it.first.getTag(), it.second)
@@ -447,13 +677,26 @@ object SoraExtractor : SoraStream() {
 
         servers.filter { it.first == "720p" || it.first == "1080p" }.apmap {
             val server = if (it.third.startsWith("https://ouo")) bypassOuo(it.third) else it.third
-            loadCustomTagExtractor(it.second, server
-                    ?: return@apmap, "$dramadayAPI/", subtitleCallback, callback, getQualityFromName(it.first))
+            loadCustomTagExtractor(
+                it.second,
+                server
+                    ?: return@apmap,
+                "$dramadayAPI/",
+                subtitleCallback,
+                callback,
+                getQualityFromName(it.first)
+            )
         }
 
     }
 
-    suspend fun invokeKimcartoon(title: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeKimcartoon(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val doc = if (season == null || season == 1) {
             app.get("$kimcartoonAPI/Cartoon/$fixTitle").document
@@ -469,7 +712,9 @@ object SoraExtractor : SoraStream() {
                 it.attr("href").contains(Regex("(?i)Episode-0*$episode"))
             }?.attr("href")
         } ?: return
-        val servers = app.get(fixUrl(iframe, kimcartoonAPI)).document.select("#selectServer > option").map { fixUrl(it.attr("value"), kimcartoonAPI) }
+        val servers =
+            app.get(fixUrl(iframe, kimcartoonAPI)).document.select("#selectServer > option")
+                .map { fixUrl(it.attr("value"), kimcartoonAPI) }
 
         servers.apmap {
             app.get(it).document.select("#my_video_1").attr("src").let { iframe ->
@@ -481,23 +726,35 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeDumpStream(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val (id, type) = getDumpIdAndType(title, year, season)
         val json = fetchDumpEpisodes("$id", "$type", episode) ?: return
 
         json.subtitlingList?.map { sub ->
-            subtitleCallback.invoke(SubtitleFile(getVipLanguage(sub.languageAbbr
-                    ?: return@map), sub.subtitlingUrl ?: return@map))
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    getVipLanguage(
+                        sub.languageAbbr
+                            ?: return@map
+                    ), sub.subtitlingUrl ?: return@map
+                )
+            )
         }
     }
 
-    suspend fun invokeVidsrcto(imdbId: String?, season: Int?, episode: Int?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeVidsrcto(
+        imdbId: String?,
+        season: Int?,
+        episode: Int?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val url = if (season == null) {
             "$vidsrctoAPI/embed/movie/$imdbId"
         } else {
@@ -505,12 +762,18 @@ object SoraExtractor : SoraStream() {
         }
 
         val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id")
-                ?: return
+            ?: return
 
-        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources").parsedSafe<VidsrctoSources>()?.result?.apmap {
-            val encUrl = app.get("$vidsrctoAPI/ajax/embed/source/${it.id}").parsedSafe<VidsrctoResponse>()?.result?.url
-            loadExtractor(vidsrctoDecrypt(encUrl
-                    ?: return@apmap), "$vidsrctoAPI/", subtitleCallback, callback)
+        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources")
+            .parsedSafe<VidsrctoSources>()?.result?.apmap {
+            val encUrl = app.get("$vidsrctoAPI/ajax/embed/source/${it.id}")
+                .parsedSafe<VidsrctoResponse>()?.result?.url
+            loadExtractor(
+                vidsrctoDecrypt(
+                    encUrl
+                        ?: return@apmap
+                ), "$vidsrctoAPI/", subtitleCallback, callback
+            )
         }
 
         val subtitles = app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/subtitles").text
@@ -520,14 +783,25 @@ object SoraExtractor : SoraStream() {
 
     }
 
-    suspend fun invokeKisskh(title: String? = null, season: Int? = null, episode: Int? = null, isAnime: Boolean = false, lastSeason: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeKisskh(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        isAnime: Boolean = false,
+        lastSeason: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val slug = title.createSlug() ?: return
         val type = when {
             isAnime -> "3"
             season == null -> "2"
             else -> "1"
         }
-        val res = app.get("$kissKhAPI/api/DramaList/Search?q=$title&type=$type", referer = "$kissKhAPI/").text.let {
+        val res = app.get(
+            "$kissKhAPI/api/DramaList/Search?q=$title&type=$type",
+            referer = "$kissKhAPI/"
+        ).text.let {
             tryParseJson<ArrayList<KisskhResults>>(it)
         } ?: return
 
@@ -539,15 +813,20 @@ object SoraExtractor : SoraStream() {
                 when {
                     season == null -> slugTitle == slug
                     lastSeason == 1 -> slugTitle.contains(slug)
-                    else -> (slugTitle.contains(slug) && it.title?.contains("Season $season", true) == true)
+                    else -> (slugTitle.contains(slug) && it.title?.contains(
+                        "Season $season",
+                        true
+                    ) == true)
                 }
             } ?: res.find { it.title.equals(title) }
             data?.id to data?.title
         }
 
-        val resDetail = app.get("$kissKhAPI/api/DramaList/Drama/$id?isq=false", referer = "$kissKhAPI/Drama/${
-            getKisskhTitle(contentTitle)
-        }?id=$id").parsedSafe<KisskhDetail>() ?: return
+        val resDetail = app.get(
+            "$kissKhAPI/api/DramaList/Drama/$id?isq=false", referer = "$kissKhAPI/Drama/${
+                getKisskhTitle(contentTitle)
+            }?id=$id"
+        ).parsedSafe<KisskhDetail>() ?: return
 
         val epsId = if (season == null) {
             resDetail.episodes?.first()?.id
@@ -555,45 +834,91 @@ object SoraExtractor : SoraStream() {
             resDetail.episodes?.find { it.number == episode }?.id
         }
 
-        app.get("$kissKhAPI/api/DramaList/Episode/$epsId.png?err=false&ts=&time=", referer = "$kissKhAPI/Drama/${getKisskhTitle(contentTitle)}/Episode-${episode ?: 0}?id=$id&ep=$epsId&page=0&pageSize=100").parsedSafe<KisskhSources>()?.let { source ->
+        app.get(
+            "$kissKhAPI/api/DramaList/Episode/$epsId.png?err=false&ts=&time=",
+            referer = "$kissKhAPI/Drama/${getKisskhTitle(contentTitle)}/Episode-${episode ?: 0}?id=$id&ep=$epsId&page=0&pageSize=100"
+        ).parsedSafe<KisskhSources>()?.let { source ->
             listOf(source.video, source.thirdParty).apmap { link ->
                 if (link?.contains(".m3u8") == true) {
-                    M3u8Helper.generateM3u8("Kisskh", link, "$kissKhAPI/", headers = mapOf("Origin" to kissKhAPI)).forEach(callback)
+                    M3u8Helper.generateM3u8(
+                        "Kisskh",
+                        link,
+                        "$kissKhAPI/",
+                        headers = mapOf("Origin" to kissKhAPI)
+                    ).forEach(callback)
                 } else {
-                    loadExtractor(link?.substringBefore("=http")
-                            ?: return@apmap null, "$kissKhAPI/", subtitleCallback, callback)
+                    loadExtractor(
+                        link?.substringBefore("=http")
+                            ?: return@apmap null, "$kissKhAPI/", subtitleCallback, callback
+                    )
                 }
             }
         }
 
         app.get("$kissKhAPI/api/Sub/$epsId").text.let { resSub ->
             tryParseJson<List<KisskhSubtitle>>(resSub)?.map { sub ->
-                subtitleCallback.invoke(SubtitleFile(getLanguage(sub.label ?: return@map), sub.src
-                        ?: return@map))
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        getLanguage(sub.label ?: return@map), sub.src
+                            ?: return@map
+                    )
+                )
             }
         }
 
 
     }
 
-    suspend fun invokeAnimes(title: String? = null, epsTitle: String? = null, date: String?, airedDate: String?, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeAnimes(
+        title: String? = null,
+        epsTitle: String? = null,
+        date: String?,
+        airedDate: String?,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
 
-        val (aniId, malId) = convertTmdbToAnimeId(title, date, airedDate, if (season == null) TvType.AnimeMovie else TvType.Anime)
+        val (aniId, malId) = convertTmdbToAnimeId(
+            title,
+            date,
+            airedDate,
+            if (season == null) TvType.AnimeMovie else TvType.Anime
+        )
 
         argamap({
             invokeAnimetosho(malId, season, episode, subtitleCallback, callback)
         }, {
             invokeAniwatch(malId, episode, subtitleCallback, callback)
         }, {
-            if (season != null) invokeCrunchyroll(aniId, malId, epsTitle, season, episode, subtitleCallback, callback)
+            if (season != null) invokeCrunchyroll(
+                aniId,
+                malId,
+                epsTitle,
+                season,
+                episode,
+                subtitleCallback,
+                callback
+            )
         })
     }
 
-    private suspend fun invokeAnimetosho(malId: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    private suspend fun invokeAnimetosho(
+        malId: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         fun Elements.getLinks(): List<Triple<String, String, Int>> {
             return this.flatMap { ele ->
                 ele.select("div.links a:matches(KrakenFiles|GoFile)").map {
-                    Triple(it.attr("href"), ele.select("div.size").text(), getIndexQuality(ele.select("div.link a").text()))
+                    Triple(
+                        it.attr("href"),
+                        ele.select("div.size").text(),
+                        getIndexQuality(ele.select("div.link a").text())
+                    )
                 }
             }
         }
@@ -601,54 +926,87 @@ object SoraExtractor : SoraStream() {
         val (seasonSLug, episodeSlug) = getEpisodeSlug(season, episode)
         val jikan = app.get("$jikanAPI/anime/$malId/full").parsedSafe<JikanResponse>()?.data
         val aniId = jikan?.external?.find { it.name == "AniDB" }?.url?.substringAfterLast("=")
-        val res = app.get("$animetoshoAPI/series/${jikan?.title?.createSlug()}.$aniId?filter[0][t]=nyaa_class&filter[0][v]=trusted").document
+        val res =
+            app.get("$animetoshoAPI/series/${jikan?.title?.createSlug()}.$aniId?filter[0][t]=nyaa_class&filter[0][v]=trusted").document
 
         val servers = if (season == null) {
             res.select("div.home_list_entry:has(div.links)").getLinks()
         } else {
-            res.select("div.home_list_entry:has(div.link a:matches([\\.\\s]$episodeSlug[\\.\\s]|S${seasonSLug}E$episodeSlug))").getLinks()
+            res.select("div.home_list_entry:has(div.link a:matches([\\.\\s]$episodeSlug[\\.\\s]|S${seasonSLug}E$episodeSlug))")
+                .getLinks()
         }
 
         servers.filter { it.third in arrayOf(Qualities.P1080.value, Qualities.P720.value) }.apmap {
-            loadCustomTagExtractor(it.second, it.first, "$animetoshoAPI/", subtitleCallback, callback, it.third)
+            loadCustomTagExtractor(
+                it.second,
+                it.first,
+                "$animetoshoAPI/",
+                subtitleCallback,
+                callback,
+                it.third
+            )
         }
 
     }
 
-    private suspend fun invokeAniwatch(malId: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    private suspend fun invokeAniwatch(
+        malId: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val headers = mapOf(
-                "X-Requested-With" to "XMLHttpRequest",
+            "X-Requested-With" to "XMLHttpRequest",
         )
-        val animeId = app.get("$malsyncAPI/mal/anime/${malId ?: return}").parsedSafe<MALSyncResponses>()?.sites?.zoro?.keys?.map { it }
+        val animeId = app.get("$malsyncAPI/mal/anime/${malId ?: return}")
+            .parsedSafe<MALSyncResponses>()?.sites?.zoro?.keys?.map { it }
         animeId?.apmap { id ->
-            val episodeId = app.get("$aniwatchAPI/ajax/v2/episode/list/${id ?: return@apmap}", headers = headers).parsedSafe<AniwatchResponses>()?.html?.let {
+            val episodeId = app.get(
+                "$aniwatchAPI/ajax/v2/episode/list/${id ?: return@apmap}",
+                headers = headers
+            ).parsedSafe<AniwatchResponses>()?.html?.let {
                 Jsoup.parse(it)
-            }?.select("div.ss-list a")?.find { it.attr("data-number") == "${episode ?: 1}" }?.attr("data-id")
+            }?.select("div.ss-list a")?.find { it.attr("data-number") == "${episode ?: 1}" }
+                ?.attr("data-id")
 
-            val servers = app.get("$aniwatchAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}", headers = headers).parsedSafe<AniwatchResponses>()?.html?.let { Jsoup.parse(it) }?.select("div.item.server-item")?.map {
+            val servers = app.get(
+                "$aniwatchAPI/ajax/v2/episode/servers?episodeId=${episodeId ?: return@apmap}",
+                headers = headers
+            ).parsedSafe<AniwatchResponses>()?.html?.let { Jsoup.parse(it) }
+                ?.select("div.item.server-item")?.map {
                 Triple(
-                        it.text(),
-                        it.attr("data-id"),
-                        it.attr("data-type"),
+                    it.text(),
+                    it.attr("data-id"),
+                    it.attr("data-type"),
                 )
             }
 
             servers?.apmap servers@{ server ->
-                val iframe = app.get("$aniwatchAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}", headers = headers).parsedSafe<AniwatchResponses>()?.link
-                        ?: return@servers
+                val iframe = app.get(
+                    "$aniwatchAPI/ajax/v2/episode/sources?id=${server.second ?: return@servers}",
+                    headers = headers
+                ).parsedSafe<AniwatchResponses>()?.link
+                    ?: return@servers
                 val audio = if (server.third == "sub") "Raw" else "English Dub"
                 loadCustomExtractor(
-                        "${server.first} [$audio]",
-                        iframe,
-                        "$aniwatchAPI/",
-                        subtitleCallback,
-                        callback,
+                    "${server.first} [$audio]",
+                    iframe,
+                    "$aniwatchAPI/",
+                    subtitleCallback,
+                    callback,
                 )
             }
         }
     }
 
-    suspend fun invokeLing(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeLing(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title?.replace("–", "-")
         val url = if (season == null) {
             "$lingAPI/en/videos/films/?title=$fixTitle"
@@ -658,9 +1016,9 @@ object SoraExtractor : SoraStream() {
 
         val scriptData = app.get(url).document.select("div.blk.padding_b0 div.col-sm-30").map {
             Triple(
-                    it.selectFirst("div.video-body h5")?.text(),
-                    it.selectFirst("div.video-body > p")?.text(),
-                    it.selectFirst("div.video-body a")?.attr("href"),
+                it.selectFirst("div.video-body h5")?.text(),
+                it.selectFirst("div.video-body > p")?.text(),
+                it.selectFirst("div.video-body a")?.attr("href"),
             )
         }
 
@@ -668,7 +1026,10 @@ object SoraExtractor : SoraStream() {
             scriptData.first()
         } else {
             scriptData.find {
-                it.first?.contains("$fixTitle", true) == true && it.second?.contains("$year") == true
+                it.first?.contains(
+                    "$fixTitle",
+                    true
+                ) == true && it.second?.contains("$year") == true
             }
         }
 
@@ -676,21 +1037,41 @@ object SoraExtractor : SoraStream() {
         val iframe = (if (season == null) {
             doc.selectFirst("a.video-js.vjs-default-skin")?.attr("data-href")
         } else {
-            doc.select("div.blk div#tab_$season li")[episode!!.minus(1)].select("h5 a").attr("data-href")
+            doc.select("div.blk div#tab_$season li")[episode!!.minus(1)].select("h5 a")
+                .attr("data-href")
         })?.let { fixUrl(it, lingAPI) }
 
         val source = app.get(iframe ?: return)
         val link = Regex("((https:|http:)//.*\\.mp4)").find(source.text)?.value ?: return
-        callback.invoke(ExtractorLink("Ling", "Ling", "$link/index.m3u8", "$lingAPI/", Qualities.P720.value, INFER_TYPE))
+        callback.invoke(
+            ExtractorLink(
+                "Ling",
+                "Ling",
+                "$link/index.m3u8",
+                "$lingAPI/",
+                Qualities.P720.value,
+                INFER_TYPE
+            )
+        )
 
         source.document.select("div#player-tracks track").map {
-            subtitleCallback.invoke(SubtitleFile(SubtitleHelper.fromTwoLettersToLanguage(it.attr("srclang"))
-                    ?: return@map null, it.attr("src")))
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    SubtitleHelper.fromTwoLettersToLanguage(it.attr("srclang"))
+                        ?: return@map null, it.attr("src")
+                )
+            )
         }
 
     }
 
-    suspend fun invokeUhdmovies(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeUhdmovies(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
 
@@ -723,10 +1104,12 @@ object SoraExtractor : SoraStream() {
             val driveReq = app.get(driveLink)
             val driveRes = driveReq.document
             val bitLink = driveRes.select("a.btn.btn-outline-success").attr("href")
-            val insLink = driveRes.select("a.btn.btn-danger:contains(Instant Download)").attr("href")
+            val insLink =
+                driveRes.select("a.btn.btn-danger:contains(Instant Download)").attr("href")
             val downloadLink = when {
                 insLink.isNotEmpty() -> extractInstantUHD(insLink)
-                driveRes.select("button.btn.btn-success").text().contains("Direct Download", true) -> extractDirectUHD(driveLink, driveReq)
+                driveRes.select("button.btn.btn-success").text()
+                    .contains("Direct Download", true) -> extractDirectUHD(driveLink, driveReq)
 
                 bitLink.isNullOrEmpty() -> {
                     val backupIframe = driveRes.select("a.btn.btn-outline-warning").attr("href")
@@ -741,20 +1124,67 @@ object SoraExtractor : SoraStream() {
             val tags = getUhdTags(quality)
             val qualities = getIndexQuality(quality)
             val size = getIndexSize(quality)
-            callback.invoke(ExtractorLink("UHDMovies", "UHDMovies $tags [$size]", downloadLink
-                    ?: return@apmap, "", qualities))
+            callback.invoke(
+                ExtractorLink(
+                    "UHDMovies", "UHDMovies $tags [$size]", downloadLink
+                        ?: return@apmap, "", qualities
+                )
+            )
         }
     }
 
-    suspend fun invokeDotmovies(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        invokeWpredis(title, year, season, lastSeason, episode, subtitleCallback, callback, dotmoviesAPI)
+    suspend fun invokeDotmovies(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        lastSeason: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        invokeWpredis(
+            title,
+            year,
+            season,
+            lastSeason,
+            episode,
+            subtitleCallback,
+            callback,
+            dotmoviesAPI
+        )
     }
 
-    suspend fun invokeVegamovies(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
-        invokeWpredis(title, year, season, lastSeason, episode, subtitleCallback, callback, vegaMoviesAPI)
+    suspend fun invokeVegamovies(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        lastSeason: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        invokeWpredis(
+            title,
+            year,
+            season,
+            lastSeason,
+            episode,
+            subtitleCallback,
+            callback,
+            vegaMoviesAPI
+        )
     }
 
-    private suspend fun invokeWpredis(title: String? = null, year: Int? = null, season: Int? = null, lastSeason: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit, api: String) {
+    private suspend fun invokeWpredis(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        lastSeason: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+        api: String
+    ) {
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
         var res = app.get("$api/search/$title").document
         val match = when (season) {
@@ -762,42 +1192,55 @@ object SoraExtractor : SoraStream() {
             1 -> "Season 1"
             else -> "Season 1 – $lastSeason"
         }
-        val media = res.selectFirst("div.blog-items article:has(h3.entry-title:matches((?i)$title.*$match)) a")?.attr("href")
+        val media =
+            res.selectFirst("div.blog-items article:has(h3.entry-title:matches((?i)$title.*$match)) a")
+                ?.attr("href")
 
         res = app.get(media ?: return).document
         val hTag = if (season == null) "h5" else "h3"
         val aTag = if (season == null) "Download Now" else "V-Cloud"
         val sTag = if (season == null) "" else "(Season $season|S$seasonSlug)"
-        val entries = res.select("div.entry-content > $hTag:matches((?i)$sTag.*(1080p|2160p))").filter { element -> !element.text().contains("Download", true) }.takeLast(2)
+        val entries = res.select("div.entry-content > $hTag:matches((?i)$sTag.*(1080p|2160p))")
+            .filter { element -> !element.text().contains("Download", true) }.takeLast(2)
         entries.apmap {
-            val tags = """(?:1080p|2160p)(.*)""".toRegex().find(it.text())?.groupValues?.get(1)?.trim()
+            val tags =
+                """(?:1080p|2160p)(.*)""".toRegex().find(it.text())?.groupValues?.get(1)?.trim()
             val href = it.nextElementSibling()?.select("a:contains($aTag)")?.attr("href")
-            val selector = if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
+            val selector =
+                if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
             val server = app.get(
-                    href ?: return@apmap, interceptor = wpredisInterceptor
+                href ?: return@apmap, interceptor = wpredisInterceptor
             ).document.selectFirst("div.entry-content > $selector")
-                    ?.attr("href") ?: return@apmap
+                ?.attr("href") ?: return@apmap
 
             loadCustomTagExtractor(
-                    tags,
-                    server,
-                    "$api/",
-                    subtitleCallback,
-                    callback,
-                    getIndexQuality(it.text())
+                tags,
+                server,
+                "$api/",
+                subtitleCallback,
+                callback,
+                getIndexQuality(it.text())
             )
         }
     }
 
-    suspend fun invokeHdmovies4u(title: String? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeHdmovies4u(
+        title: String? = null,
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         fun String.decodeLink(): String {
             return base64Decode(this.substringAfterLast("/"))
         }
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-        val media = app.get("$hdmovies4uAPI/?s=${if (season == null) imdbId else title}").document.let {
-            val selector = if (season == null) "a" else "a:matches((?i)$title.*Season $season)"
-            it.selectFirst("div.gridxw.gridxe $selector")?.attr("href")
-        }
+        val media =
+            app.get("$hdmovies4uAPI/?s=${if (season == null) imdbId else title}").document.let {
+                val selector = if (season == null) "a" else "a:matches((?i)$title.*Season $season)"
+                it.selectFirst("div.gridxw.gridxe $selector")?.attr("href")
+            }
         val selector = if (season == null) "1080p|2160p" else "(?i)Episode.*(?:1080p|2160p)"
         app.get(media ?: return).document.select("section h4:matches($selector)").apmap { ele ->
             val (tags, size) = ele.select("span").map {
@@ -806,7 +1249,9 @@ object SoraExtractor : SoraStream() {
             val link = ele.nextElementSibling()?.select("a:contains(DriveTOT)")?.attr("href")
             val iframe = bypassBqrecipes(link?.decodeLink() ?: return@apmap).let {
                 if (it?.contains("/pack/") == true) {
-                    val href = app.get(it).document.select("table tbody tr:contains(S${seasonSlug}E${episodeSlug}) a").attr("href")
+                    val href =
+                        app.get(it).document.select("table tbody tr:contains(S${seasonSlug}E${episodeSlug}) a")
+                            .attr("href")
                     bypassBqrecipes(href.decodeLink())
                 } else {
                     it
@@ -816,7 +1261,14 @@ object SoraExtractor : SoraStream() {
         }
     }
 
-    suspend fun invokeGMovies(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeGMovies(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null || season == 1) {
             "$gMoviesAPI/$fixTitle-$year"
@@ -832,7 +1284,8 @@ object SoraExtractor : SoraStream() {
             }
         } else {
             doc.select("div.is-content-justification-center").find {
-                it.previousElementSibling()?.text()?.contains(Regex("(?i)episode\\s?$episode")) == true
+                it.previousElementSibling()?.text()
+                    ?.contains(Regex("(?i)episode\\s?$episode")) == true
             }?.select("div.wp-block-button")?.map {
                 it.select("a").attr("href") to it.text()
             }
@@ -842,11 +1295,23 @@ object SoraExtractor : SoraStream() {
 
         iframe.apmap { (iframeLink, title) ->
             val size = Regex("(?i)\\s(\\S+gb|mb)").find(title)?.groupValues?.getOrNull(1)
-            loadCustomTagExtractor("[$size]", iframeLink, "$gMoviesAPI/", subtitleCallback, callback, getIndexQuality(title))
+            loadCustomTagExtractor(
+                "[$size]",
+                iframeLink,
+                "$gMoviesAPI/",
+                subtitleCallback,
+                callback,
+                getIndexQuality(title)
+            )
         }
     }
 
-    suspend fun invokeFDMovies(title: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeFDMovies(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$fdMoviesAPI/movies/$fixTitle"
@@ -858,7 +1323,12 @@ object SoraExtractor : SoraStream() {
         if (!request.isSuccessful) return
 
         val iframe = request.document.select("div#download tbody tr").map {
-            FDMovieIFrame(it.select("a").attr("href"), it.select("strong.quality").text(), it.select("td:nth-child(4)").text(), it.select("img").attr("src"))
+            FDMovieIFrame(
+                it.select("a").attr("href"),
+                it.select("strong.quality").text(),
+                it.select("td:nth-child(4)").text(),
+                it.select("img").attr("src")
+            )
         }.filter {
             it.quality.contains(Regex("(?i)(1080p|4k)")) && it.type.contains(Regex("(gdtot|oiya|rarbgx)"))
         }
@@ -886,26 +1356,43 @@ object SoraExtractor : SoraStream() {
                 }
             }
 
-            callback.invoke(ExtractorLink("FDMovies", "FDMovies [$size]", videoLink
-                    ?: return@apmap null, "", getQualityFromName(qualities)))
+            callback.invoke(
+                ExtractorLink(
+                    "FDMovies", "FDMovies [$size]", videoLink
+                        ?: return@apmap null, "", getQualityFromName(qualities)
+                )
+            )
         }
 
     }
 
-    suspend fun invokeM4uhd(title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeM4uhd(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val slugTitle = title.createSlug()
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
         val req = app.get("$m4uhdAPI/search/$slugTitle.html")
         val referer = getBaseUrl(req.url)
         val scriptData = req.document.select("div.row div.item").map { ele ->
-            Triple(ele.select("div.tiptitle p").text().substringBefore("(").trim().createSlug(), ele.select("div.jtip-top div:last-child").text().filter { it.isDigit() }, ele.selectFirst("a")?.attr("href"))
+            Triple(
+                ele.select("div.tiptitle p").text().substringBefore("(").trim().createSlug(),
+                ele.select("div.jtip-top div:last-child").text().filter { it.isDigit() },
+                ele.selectFirst("a")?.attr("href")
+            )
         }
 
         val script = if (scriptData.size == 1) {
             scriptData.firstOrNull()
         } else {
             scriptData.find {
-                it.first.equals(slugTitle) && it.second == "$year" && if (season != null) it.third?.contains("-tvshow-") == true else it.third?.contains("-movie-") == true
+                it.first.equals(slugTitle) && it.second == "$year" && if (season != null) it.third?.contains(
+                    "-tvshow-"
+                ) == true else it.third?.contains("-movie-") == true
             }
         }
 
@@ -919,20 +1406,28 @@ object SoraExtractor : SoraStream() {
         val m4uData = if (season == null) {
             doc.select("div.le-server span").map { it.attr("data") }
         } else {
-            val idepisode = doc.selectFirst("div.detail > p:matches((?i)S$seasonSlug-E$episodeSlug) button")?.attr("idepisode")
+            val idepisode =
+                doc.selectFirst("div.detail > p:matches((?i)S$seasonSlug-E$episodeSlug) button")
+                    ?.attr("idepisode")
                     ?: return
-            val requestEmbed = app.post("$referer/ajaxtv", data = mapOf("idepisode" to idepisode, "_token" to "$token"), referer = link, headers = headers, cookies = cookies)
+            val requestEmbed = app.post(
+                "$referer/ajaxtv",
+                data = mapOf("idepisode" to idepisode, "_token" to "$token"),
+                referer = link,
+                headers = headers,
+                cookies = cookies
+            )
             cookies = requestEmbed.cookies
             requestEmbed.document.select("div.le-server span").map { it.attr("data") }
         }
 
         m4uData.apmap { data ->
             val iframe = app.post(
-                    "$referer/ajax",
-                    data = mapOf("m4u" to data, "_token" to "$token"),
-                    referer = link,
-                    headers = headers,
-                    cookies = cookies,
+                "$referer/ajax",
+                data = mapOf("m4u" to data, "_token" to "$token"),
+                referer = link,
+                headers = headers,
+                cookies = cookies,
             ).document.select("iframe").attr("src")
 
             loadExtractor(iframe, referer, subtitleCallback, callback)
@@ -940,7 +1435,12 @@ object SoraExtractor : SoraStream() {
 
     }
 
-    suspend fun invokeTvMovies(title: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeTvMovies(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title.createSlug()
         val url = if (season == null) {
             "$tvMoviesAPI/show/$fixTitle"
@@ -950,25 +1450,41 @@ object SoraExtractor : SoraStream() {
 
         val server = getTvMoviesServer(url, season, episode) ?: return
         val videoData = extractCovyn(server.second ?: return)
-        val quality = Regex("(\\d{3,4})p").find(server.first)?.groupValues?.getOrNull(1)?.toIntOrNull()
+        val quality =
+            Regex("(\\d{3,4})p").find(server.first)?.groupValues?.getOrNull(1)?.toIntOrNull()
 
-        callback.invoke(ExtractorLink("TVMovies", "TVMovies [${videoData?.second}]", videoData?.first
-                ?: return, "", quality ?: Qualities.Unknown.value))
+        callback.invoke(
+            ExtractorLink(
+                "TVMovies", "TVMovies [${videoData?.second}]", videoData?.first
+                    ?: return, "", quality ?: Qualities.Unknown.value
+            )
+        )
 
 
     }
 
-    private suspend fun invokeCrunchyroll(aniId: Int? = null, malId: Int? = null, epsTitle: String? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    private suspend fun invokeCrunchyroll(
+        aniId: Int? = null,
+        malId: Int? = null,
+        epsTitle: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val id = getCrunchyrollId("${aniId ?: return}")
-                ?: getCrunchyrollIdFromMalSync("${malId ?: return}")
+            ?: getCrunchyrollIdFromMalSync("${malId ?: return}")
         val audioLocal = listOf(
-                "ja-JP",
-                "en-US",
-                "zh-CN",
+            "ja-JP",
+            "en-US",
+            "zh-CN",
         )
         val token = getCrunchyrollToken()
         val headers = mapOf("Authorization" to "${token.tokenType} ${token.accessToken}")
-        val seasonIdData = app.get("$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons", headers = headers).parsedSafe<CrunchyrollResponses>()?.data?.let { s ->
+        val seasonIdData = app.get(
+            "$crunchyrollAPI/content/v2/cms/series/${id ?: return}/seasons",
+            headers = headers
+        ).parsedSafe<CrunchyrollResponses>()?.data?.let { s ->
             if (s.size == 1) {
                 s.firstOrNull()
             } else {
@@ -981,14 +1497,24 @@ object SoraExtractor : SoraStream() {
                 } ?: s.find { it.season_number?.plus(1) == season }
             }
         }
-        val seasonId = seasonIdData?.versions?.filter { it.audio_locale in audioLocal }?.map { it.guid to it.audio_locale }
-                ?: listOf(seasonIdData?.id to "ja-JP")
+        val seasonId = seasonIdData?.versions?.filter { it.audio_locale in audioLocal }
+            ?.map { it.guid to it.audio_locale }
+            ?: listOf(seasonIdData?.id to "ja-JP")
 
         seasonId.apmap { (sId, audioL) ->
-            val streamsLink = app.get("$crunchyrollAPI/content/v2/cms/seasons/${sId ?: return@apmap}/episodes", headers = headers).parsedSafe<CrunchyrollResponses>()?.data?.find {
-                it.title.equals(epsTitle, true) || it.slug_title.equals(epsTitle.createSlug(), true) || it.episode_number == episode
+            val streamsLink = app.get(
+                "$crunchyrollAPI/content/v2/cms/seasons/${sId ?: return@apmap}/episodes",
+                headers = headers
+            ).parsedSafe<CrunchyrollResponses>()?.data?.find {
+                it.title.equals(epsTitle, true) || it.slug_title.equals(
+                    epsTitle.createSlug(),
+                    true
+                ) || it.episode_number == episode
             }?.streams_link?.substringAfter("/videos/")?.substringBefore("/streams") ?: return@apmap
-            val sources = app.get("$crunchyrollAPI/cms/v2${token.bucket}/videos/$streamsLink/streams?Policy=${token.policy}&Signature=${token.signature}&Key-Pair-Id=${token.key_pair_id}", headers = headers).parsedSafe<CrunchyrollSourcesResponses>()
+            val sources = app.get(
+                "$crunchyrollAPI/cms/v2${token.bucket}/videos/$streamsLink/streams?Policy=${token.policy}&Signature=${token.signature}&Key-Pair-Id=${token.key_pair_id}",
+                headers = headers
+            ).parsedSafe<CrunchyrollSourcesResponses>()
 
             listOf("adaptive_hls", "vo_adaptive_hls").map { hls ->
                 val name = if (hls == "adaptive_hls") "Crunchyroll" else "Vrv"
@@ -996,26 +1522,56 @@ object SoraExtractor : SoraStream() {
                 val source = sources?.streams?.let {
                     if (hls == "adaptive_hls") it.adaptive_hls else it.vo_adaptive_hls
                 }
-                M3u8Helper.generateM3u8("$name [$audio]", source?.get("")?.get("url")
-                        ?: return@map, "https://static.crunchyroll.com/").forEach(callback)
+                M3u8Helper.generateM3u8(
+                    "$name [$audio]", source?.get("")?.get("url")
+                        ?: return@map, "https://static.crunchyroll.com/"
+                ).forEach(callback)
             }
 
             sources?.subtitles?.map { sub ->
-                subtitleCallback.invoke(SubtitleFile("${fixCrunchyrollLang(sub.key) ?: sub.key} [ass]", sub.value["url"]
-                        ?: return@map null))
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        "${fixCrunchyrollLang(sub.key) ?: sub.key} [ass]", sub.value["url"]
+                            ?: return@map null
+                    )
+                )
             }
         }
     }
 
-    suspend fun invokeMoviezAdd(apiUrl: String? = null, api: String? = null, title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeMoviezAdd(
+        apiUrl: String? = null,
+        api: String? = null,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         invokeBloginguru(apiUrl, api, title, year, season, episode, callback)
     }
 
-    suspend fun invokeBollyMaza(apiUrl: String? = null, api: String? = null, title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeBollyMaza(
+        apiUrl: String? = null,
+        api: String? = null,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         invokeBloginguru(apiUrl, api, title, year, season, episode, callback)
     }
 
-    private suspend fun invokeBloginguru(apiUrl: String? = null, api: String? = null, title: String? = null, year: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    private suspend fun invokeBloginguru(
+        apiUrl: String? = null,
+        api: String? = null,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val fixTitle = title?.createSlug()?.replace("-", " ")
         val doc = app.get("$apiUrl/?s=$fixTitle").document
 
@@ -1029,55 +1585,100 @@ object SoraExtractor : SoraStream() {
             }
         }
 
-        val mediaLink = app.get(matchMedia?.first
-                ?: return).document.selectFirst("a#jake1")?.attr("href")
+        val mediaLink = app.get(
+            matchMedia?.first
+                ?: return
+        ).document.selectFirst("a#jake1")?.attr("href")
         val detailDoc = app.get(mediaLink ?: return).document
-        val media = detailDoc.selectFirst("div.entry-content pre span")?.text()?.split("|")?.map { it.trim() }
+        val media = detailDoc.selectFirst("div.entry-content pre span")?.text()?.split("|")
+            ?.map { it.trim() }
 
         val iframe = (if (season == null) {
             media?.mapIndexed { index, name ->
-                detailDoc.select("div.entry-content > h2")[index].selectFirst("a")?.attr("href") to name
+                detailDoc.select("div.entry-content > h2")[index].selectFirst("a")
+                    ?.attr("href") to name
             }
         } else {
             media?.mapIndexed { index, name ->
-                val linkMedia = detailDoc.select("div.entry-content > h2")[index].selectFirst("a")?.attr("href")
-                app.get(linkMedia
-                        ?: return@mapIndexed null).document.selectFirst("div.entry-content strong:matches((?i)S0?${season}E0?${episode}) a")?.attr("href") to name
+                val linkMedia =
+                    detailDoc.select("div.entry-content > h2")[index].selectFirst("a")?.attr("href")
+                app.get(
+                    linkMedia
+                        ?: return@mapIndexed null
+                ).document.selectFirst("div.entry-content strong:matches((?i)S0?${season}E0?${episode}) a")
+                    ?.attr("href") to name
             }
         })?.filter { it?.first?.startsWith("http") == true }
 
         iframe?.apmap {
             val iframeDoc = app.get(it?.first ?: return@apmap).document
             val formUrl = iframeDoc.select("form").attr("action")
-            val formData = iframeDoc.select("form button").associate { v -> v.attr("name") to v.attr("value") }
+            val formData =
+                iframeDoc.select("form button").associate { v -> v.attr("name") to v.attr("value") }
 
-            val videoUrl = app.post(formUrl, data = formData, referer = it.first).document.selectFirst("div.d-flex.justify-content-center.flex-wrap a")?.attr("href")
-            val quality = Regex("(\\d{3,4})p").find(it.second)?.groupValues?.getOrNull(1)?.toIntOrNull()
+            val videoUrl = app.post(
+                formUrl,
+                data = formData,
+                referer = it.first
+            ).document.selectFirst("div.d-flex.justify-content-center.flex-wrap a")?.attr("href")
+            val quality =
+                Regex("(\\d{3,4})p").find(it.second)?.groupValues?.getOrNull(1)?.toIntOrNull()
             val qualityName = it.second.replace("${quality}p", "").trim()
 
-            callback.invoke(ExtractorLink("$api", "$api $qualityName", videoUrl
-                    ?: return@apmap, "", quality ?: Qualities.Unknown.value))
+            callback.invoke(
+                ExtractorLink(
+                    "$api", "$api $qualityName", videoUrl
+                        ?: return@apmap, "", quality ?: Qualities.Unknown.value
+                )
+            )
         }
 
     }
 
-    suspend fun invokeRStream(id: Int? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeRStream(
+        id: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val url = if (season == null) {
             "$rStreamAPI/e/?tmdb=$id"
         } else {
             "$rStreamAPI/e/?tmdb=$id&s=$season&e=$episode"
         }
 
-        val res = app.get("$url&apikey=whXgvN4kVyoubGwqXpw26Oy3PVryl8dm", referer = "https://watcha.movie/").text
+        val res = app.get(
+            "$url&apikey=whXgvN4kVyoubGwqXpw26Oy3PVryl8dm",
+            referer = "https://watcha.movie/"
+        ).text
         val link = Regex("\"file\":\"(http.*?)\"").find(res)?.groupValues?.getOrNull(1) ?: return
 
-        callback.invoke(ExtractorLink("RStream", "RStream", link, "$rStreamAPI/", Qualities.P1080.value, INFER_TYPE))
+        callback.invoke(
+            ExtractorLink(
+                "RStream",
+                "RStream",
+                link,
+                "$rStreamAPI/",
+                Qualities.P1080.value,
+                INFER_TYPE
+            )
+        )
     }
 
-    suspend fun invokeFlixon(tmdbId: Int? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit, onionUrl: String = "https://onionplay.se/") {
+    suspend fun invokeFlixon(
+        tmdbId: Int? = null,
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+        onionUrl: String = "https://onionplay.se/"
+    ) {
         val request = if (season == null) {
             val res = app.get("$flixonAPI/$imdbId", referer = onionUrl)
-            if (res.text.contains("BEGIN PGP SIGNED MESSAGE")) app.get("$flixonAPI/$imdbId-1", referer = onionUrl) else res
+            if (res.text.contains("BEGIN PGP SIGNED MESSAGE")) app.get(
+                "$flixonAPI/$imdbId-1",
+                referer = onionUrl
+            ) else res
         } else {
             app.get("$flixonAPI/$tmdbId-$season-$episode", referer = onionUrl)
         }
@@ -1085,30 +1686,47 @@ object SoraExtractor : SoraStream() {
         val script = request.document.selectFirst("script:containsData(= \"\";)")?.data()
         val collection = script?.substringAfter("= [")?.substringBefore("];")
         val num = script?.substringAfterLast("(value) -")?.substringBefore(");")?.trim()?.toInt()
-                ?: return
+            ?: return
 
         val iframe = collection?.split(",")?.map { it.trim().toInt() }?.map { nums ->
             nums.minus(num).toChar()
-        }?.joinToString("")?.let { Jsoup.parse(it) }?.selectFirst("button.redirect")?.attr("onclick")?.substringAfter("('")?.substringBefore("')")
+        }?.joinToString("")?.let { Jsoup.parse(it) }?.selectFirst("button.redirect")
+            ?.attr("onclick")?.substringAfter("('")?.substringBefore("')")
 
         delay(1000)
-        val unPacker = app.get(iframe
-                ?: return, referer = "$flixonAPI/").document.selectFirst("script:containsData(JuicyCodes.Run)")?.data()?.substringAfter("JuicyCodes.Run(")?.substringBefore(");")?.split("+")?.joinToString("") { it.replace("\"", "").trim() }?.let { getAndUnpack(base64Decode(it)) }
+        val unPacker = app.get(
+            iframe
+                ?: return, referer = "$flixonAPI/"
+        ).document.selectFirst("script:containsData(JuicyCodes.Run)")?.data()
+            ?.substringAfter("JuicyCodes.Run(")?.substringBefore(");")?.split("+")
+            ?.joinToString("") { it.replace("\"", "").trim() }
+            ?.let { getAndUnpack(base64Decode(it)) }
 
-        val link = Regex("[\"']file[\"']:[\"'](.+?)[\"'],").find(unPacker
-                ?: return)?.groupValues?.getOrNull(1)
+        val link = Regex("[\"']file[\"']:[\"'](.+?)[\"'],").find(
+            unPacker
+                ?: return
+        )?.groupValues?.getOrNull(1)
 
-        callback.invoke(ExtractorLink("Flixon", "Flixon", link
-                ?: return, "https://onionplay.stream/", Qualities.P720.value, link.contains(".m3u8")))
+        callback.invoke(
+            ExtractorLink(
+                "Flixon",
+                "Flixon",
+                link
+                    ?: return,
+                "https://onionplay.stream/",
+                Qualities.P720.value,
+                link.contains(".m3u8")
+            )
+        )
 
     }
 
     suspend fun invokeSmashyStream(
-            imdbId: String? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
             "$smashyStreamAPI/playere.php?imdb=$imdbId"
@@ -1116,7 +1734,10 @@ object SoraExtractor : SoraStream() {
             "$smashyStreamAPI/playere.php?imdb=$imdbId&season=$season&episode=$episode"
         }
 
-        app.get(url, referer = "https://smashystream.com/").document.select("div#_default-servers a.server").map {
+        app.get(
+            url,
+            referer = "https://smashystream.com/"
+        ).document.select("div#_default-servers a.server").map {
             it.attr("data-url") to it.text()
         }.apmap {
             when (it.second) {
@@ -1136,13 +1757,23 @@ object SoraExtractor : SoraStream() {
 
     //TODO only subs
     suspend fun invokeWatchsomuch(
-            imdbId: String? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
     ) {
         val id = imdbId?.removePrefix("tt")
-        val epsId = app.post("$watchSomuchAPI/Watch/ajMovieTorrents.aspx", data = mapOf("index" to "0", "mid" to "$id", "wsk" to "f6ea6cde-e42b-4c26-98d3-b4fe48cdd4fb", "lid" to "", "liu" to ""), headers = mapOf("X-Requested-With" to "XMLHttpRequest")).parsedSafe<WatchsomuchResponses>()?.movie?.torrents?.let { eps ->
+        val epsId = app.post(
+            "$watchSomuchAPI/Watch/ajMovieTorrents.aspx",
+            data = mapOf(
+                "index" to "0",
+                "mid" to "$id",
+                "wsk" to "f6ea6cde-e42b-4c26-98d3-b4fe48cdd4fb",
+                "lid" to "",
+                "liu" to ""
+            ),
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        ).parsedSafe<WatchsomuchResponses>()?.movie?.torrents?.let { eps ->
             if (season == null) {
                 eps.firstOrNull()?.id
             } else {
@@ -1159,71 +1790,112 @@ object SoraExtractor : SoraStream() {
         }
 
         app.get(subUrl).parsedSafe<WatchsomuchSubResponses>()?.subtitles?.map { sub ->
-            subtitleCallback.invoke(SubtitleFile(sub.label ?: "", fixUrl(sub.url
-                    ?: return@map null, watchSomuchAPI)))
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    sub.label ?: "", fixUrl(
+                        sub.url
+                            ?: return@map null, watchSomuchAPI
+                    )
+                )
+            )
         }
 
 
     }
 
     suspend fun invokeShinobiMovies(
-            apiUrl: String,
-            api: String,
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
+        apiUrl: String,
+        api: String,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
     ) {
         invokeIndex(
-                apiUrl,
-                api,
-                title,
-                year,
-                season,
-                episode,
-                callback,
+            apiUrl,
+            api,
+            title,
+            year,
+            season,
+            episode,
+            callback,
         )
     }
 
     private suspend fun invokeIndex(
-            apiUrl: String,
-            api: String,
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
-            password: String = "",
+        apiUrl: String,
+        api: String,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+        password: String = "",
     ) {
         val passHeaders = mapOf("Authorization" to password)
         val query = getIndexQuery(title, year, season, episode).let {
             if (api in mkvIndex) "$it mkv" else it
         }
-        val body = """{"q":"$query","password":null,"page_token":null,"page_index":0}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
+        val body =
+            """{"q":"$query","password":null,"page_token":null,"page_index":0}""".toRequestBody(
+                RequestBodyTypes.JSON.toMediaTypeOrNull()
+            )
         val data = mapOf("q" to query, "page_token" to "", "page_index" to "0")
         val search = if (api in encodedIndex) {
-            decodeIndexJson(if (api in lockedIndex) app.post("${apiUrl}search", data = data, headers = passHeaders, referer = apiUrl, timeout = 120L).text else app.post("${apiUrl}search", data = data, referer = apiUrl).text)
+            decodeIndexJson(
+                if (api in lockedIndex) app.post(
+                    "${apiUrl}search",
+                    data = data,
+                    headers = passHeaders,
+                    referer = apiUrl,
+                    timeout = 120L
+                ).text else app.post("${apiUrl}search", data = data, referer = apiUrl).text
+            )
         } else {
             app.post("${apiUrl}search", requestBody = body, referer = apiUrl, timeout = 120L).text
         }
-        val media = if (api in untrimmedIndex) searchIndex(title, season, episode, year, search, false) else searchIndex(title, season, episode, year, search)
+        val media = if (api in untrimmedIndex) searchIndex(
+            title,
+            season,
+            episode,
+            year,
+            search,
+            false
+        ) else searchIndex(title, season, episode, year, search)
         media?.apmap { file ->
-            val pathBody = """{"id":"${file.id ?: return@apmap null}"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
+            val pathBody =
+                """{"id":"${file.id ?: return@apmap null}"}""".toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
             val pathData = mapOf(
-                    "id" to file.id,
+                "id" to file.id,
             )
             val path = (if (api in encodedIndex) {
                 if (api in lockedIndex) {
-                    app.post("${apiUrl}id2path", data = pathData, headers = passHeaders, referer = apiUrl, timeout = 120L)
+                    app.post(
+                        "${apiUrl}id2path",
+                        data = pathData,
+                        headers = passHeaders,
+                        referer = apiUrl,
+                        timeout = 120L
+                    )
                 } else {
                     app.post("${apiUrl}id2path", data = pathData, referer = apiUrl, timeout = 120L)
                 }
             } else {
-                app.post("${apiUrl}id2path", requestBody = pathBody, referer = apiUrl, timeout = 120L)
+                app.post(
+                    "${apiUrl}id2path",
+                    requestBody = pathBody,
+                    referer = apiUrl,
+                    timeout = 120L
+                )
             }).text.let { path ->
                 if (api in ddomainIndex) {
-                    val worker = app.get("${fixUrl(path, apiUrl).encodeUrl()}?a=view", referer = if (api in needRefererIndex) apiUrl else "", timeout = 120L).document.selectFirst("script:containsData(downloaddomain)")?.data()?.substringAfter("\"downloaddomain\":\"")?.substringBefore("\",")?.let {
+                    val worker = app.get(
+                        "${fixUrl(path, apiUrl).encodeUrl()}?a=view",
+                        referer = if (api in needRefererIndex) apiUrl else "",
+                        timeout = 120L
+                    ).document.selectFirst("script:containsData(downloaddomain)")?.data()
+                        ?.substringAfter("\"downloaddomain\":\"")?.substringBefore("\",")?.let {
                         "$it/0:"
                     }
                     fixUrl(path, worker ?: return@apmap null)
@@ -1232,72 +1904,82 @@ object SoraExtractor : SoraStream() {
                 }
             }.encodeUrl()
 
-            val size = "%.2f GB".format(bytesToGigaBytes(file.size?.toDouble()
-                    ?: return@apmap null))
+            val size = "%.2f GB".format(
+                bytesToGigaBytes(
+                    file.size?.toDouble()
+                        ?: return@apmap null
+                )
+            )
             val quality = getIndexQuality(file.name)
             val tags = getIndexQualityTags(file.name)
 
-            callback.invoke(ExtractorLink(
+            callback.invoke(
+                ExtractorLink(
                     api,
                     "$api $tags [$size]",
                     path,
                     if (api in needRefererIndex) apiUrl else "",
                     quality,
-            ))
+                )
+            )
 
         }
 
     }
 
     suspend fun invokeGdbotMovies(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val query = getIndexQuery(title, null, season, episode)
         val files = app.get("$gdbot/search?q=$query").document.select("ul.divide-y li").map {
             Triple(it.select("a").attr("href"), it.select("a").text(), it.select("span").text())
         }.filter {
             matchingIndex(
-                    it.second,
-                    null,
-                    title,
-                    year,
-                    season,
-                    episode,
+                it.second,
+                null,
+                title,
+                year,
+                season,
+                episode,
             )
         }.sortedByDescending {
             it.third.getFileSize()
         }
 
         files.let { file ->
-            listOfNotNull(file.find { it.second.contains("2160p", true) }, file.find { it.second.contains("1080p", true) })
+            listOfNotNull(
+                file.find { it.second.contains("2160p", true) },
+                file.find { it.second.contains("1080p", true) })
         }.apmap { file ->
             val videoUrl = extractGdflix(file.first)
             val quality = getIndexQuality(file.second)
             val tags = getIndexQualityTags(file.second)
             val size = Regex("(\\d+\\.?\\d+\\sGB|MB)").find(file.third)?.groupValues?.get(0)?.trim()
 
-            callback.invoke(ExtractorLink(
+            callback.invoke(
+                ExtractorLink(
                     "GdbotMovies",
                     "GdbotMovies $tags [$size]",
                     videoUrl ?: return@apmap null,
                     "",
                     quality,
-            ))
+                )
+            )
 
         }
 
     }
 
     suspend fun invokeDahmerMovies(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
             "$dahmerMoviesAPI/movies/${title?.replace(":", "")} ($year)/"
@@ -1321,19 +2003,27 @@ object SoraExtractor : SoraStream() {
         paths.map {
             val quality = getIndexQuality(it.first)
             val tags = getIndexQualityTags(it.first)
-            callback.invoke(ExtractorLink(
+            callback.invoke(
+                ExtractorLink(
                     "DahmerMovies",
                     "DahmerMovies $tags",
                     (url + it.second).encodeUrl(),
                     "",
                     quality,
-            ))
+                )
+            )
 
         }
 
     }
 
-    suspend fun invoke2embed(imdbId: String?, season: Int?, episode: Int?, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invoke2embed(
+        imdbId: String?,
+        season: Int?,
+        episode: Int?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val url = if (season == null) {
             "$twoEmbedAPI/embed/$imdbId"
         } else {
@@ -1341,7 +2031,7 @@ object SoraExtractor : SoraStream() {
         }
 
         val framesrc = app.get(url).document.selectFirst("iframe#iframesrc")?.attr("data-src")
-                ?: return
+            ?: return
         val ref = getBaseUrl(framesrc)
         val id = framesrc.substringAfter("id=").substringBefore("&")
         loadExtractor("https://wishfast.top/e/$id", "$ref/", subtitleCallback, callback)
@@ -1349,25 +2039,35 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeOmovies(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
     ) {
-        invokeGpress(title, year, season, episode, callback, BuildConfig.OMOVIES_API, "Omovies", base64Decode("X3NtUWFtQlFzRVRi"), base64Decode("X3NCV2NxYlRCTWFU"))
+        invokeGpress(
+            title,
+            year,
+            season,
+            episode,
+            callback,
+            BuildConfig.OMOVIES_API,
+            "Omovies",
+            base64Decode("X3NtUWFtQlFzRVRi"),
+            base64Decode("X3NCV2NxYlRCTWFU")
+        )
     }
 
     private suspend fun invokeGpress(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
-            api: String,
-            name: String,
-            mediaSelector: String,
-            episodeSelector: String,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+        api: String,
+        name: String,
+        mediaSelector: String,
+        episodeSelector: String,
     ) {
         fun String.decrypt(key: String): List<GpressSources>? {
             return tryParseJson<List<GpressSources>>(base64Decode(this).decodePrimewireXor(key))
@@ -1380,7 +2080,7 @@ object SoraExtractor : SoraStream() {
             "$title Season $season"
         }
         val savedCookies = mapOf(
-                base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
+            base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
         )
         val req = app.get("$api/search/$query")
         val doc = req.document
@@ -1392,7 +2092,10 @@ object SoraExtractor : SoraStream() {
             } else {
                 el.find {
                     if (season == null) {
-                        (it.first.equals(title, true) || it.first.equals("$title ($year)", true)) && it.second.equals("$year")
+                        (it.first.equals(title, true) || it.first.equals(
+                            "$title ($year)",
+                            true
+                        )) && it.second.equals("$year")
                     } else {
                         it.first.equals("$title - Season $season", true)
                     }
@@ -1404,13 +2107,15 @@ object SoraExtractor : SoraStream() {
             media.third
         } else {
             val res = app.get(fixUrl(media.third, api))
-            res.document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")?.attr("href")
+            res.document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")
+                ?.attr("href")
         } ?: return
 
         val users = if (season == null) {
             media.third.substringAfterLast("/") to "0"
         } else {
-            media.third.substringAfterLast("/") to iframe.substringAfterLast("/").substringBefore("-")
+            media.third.substringAfterLast("/") to iframe.substringAfterLast("/")
+                .substringBefore("-")
         }
         val res = app.get(fixUrl(iframe, api), verify = false)
         delay(2000)
@@ -1421,23 +2126,35 @@ object SoraExtractor : SoraStream() {
         val url = res.document.select("meta[property=og:url]").attr("content")
         val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         val qualities = intArrayOf(2160, 1440, 1080, 720, 480, 360)
-        val serverRes = app.get("$api/user/servers/${users.first}?ep=${users.second}", cookies = cookies, referer = url, headers = headers)
+        val serverRes = app.get(
+            "$api/user/servers/${users.first}?ep=${users.second}",
+            cookies = cookies,
+            referer = url,
+            headers = headers
+        )
         val unpack = getAndUnpack(serverRes.text)
         val key = unpack.substringAfter("(key=").substringBefore(")")
         val key2 = unpack.substringAfter("<\"").substringBefore("\".")
         serverRes.document.select("ul li").amap { el ->
             val server = el.attr("data-value")
-            val encryptedData = app.get("${fixUrl(serverUrl, api)}?server=$server&_=$unixTimeMS", cookies = cookies, referer = url, headers = headers).text
+            val encryptedData = app.get(
+                "${fixUrl(serverUrl, api)}?server=$server&_=$unixTimeMS",
+                cookies = cookies,
+                referer = url,
+                headers = headers
+            ).text
             val links = encryptedData.decrypt(key) ?: encryptedData.decrypt(key2) ?: return@amap
             links.forEach { video ->
                 qualities.filter { it <= video.max.toInt() }.forEach {
-                    callback(ExtractorLink(
+                    callback(
+                        ExtractorLink(
                             name,
                             name,
                             video.src.split("360", limit = 3).joinToString(it.toString()),
                             "$api/",
                             it,
-                    ))
+                        )
+                    )
                 }
             }
         }
@@ -1445,12 +2162,12 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeShowflix(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val where = if (season == null) "movieName" else "seriesName"
         val classes = if (season == null) "movies" else "series"
@@ -1471,24 +2188,25 @@ object SoraExtractor : SoraStream() {
         }
     """.trimIndent().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
 
-        val data = app.post("https://parse.showflix.tk/parse/classes/$classes", requestBody = body).text
+        val data =
+            app.post("https://parse.showflix.tk/parse/classes/$classes", requestBody = body).text
         val iframes = if (season == null) {
             val result = tryParseJson<ShowflixSearchMovies>(data)?.resultsMovies?.find {
                 it.movieName.equals("$title ($year)", true)
             }
             listOf(
-                    "https://streamwish.to/e/${result?.streamwish}",
-                    "https://filelions.to/v/${result?.filelions}.html",
-                    "https://streamruby.com/e/${result?.streamruby}.html",
+                "https://streamwish.to/e/${result?.streamwish}",
+                "https://filelions.to/v/${result?.filelions}.html",
+                "https://streamruby.com/e/${result?.streamruby}.html",
             )
         } else {
             val result = tryParseJson<ShowflixSearchSeries>(data)?.resultsSeries?.find {
                 it.seriesName.equals(title, true)
             }
             listOf(
-                    result?.streamwish?.get("Season $season")?.get(episode!!),
-                    result?.filelions?.get("Season $season")?.get(episode!!),
-                    result?.streamruby?.get("Season $season")?.get(episode!!),
+                result?.streamwish?.get("Season $season")?.get(episode!!),
+                result?.filelions?.get("Season $season")?.get(episode!!),
+                result?.streamruby?.get("Season $season")?.get(episode!!),
             )
         }
 
@@ -1499,13 +2217,13 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeCinemaTv(
-            imdbId: String? = null,
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
+        imdbId: String? = null,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val id = imdbId?.removePrefix("tt")
         val slug = title.createSlug()
@@ -1515,11 +2233,12 @@ object SoraExtractor : SoraStream() {
             "$cinemaTvAPI/shows/play/$id-$slug-$year"
         }
 
-        val session = "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
+        val session =
+            "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
 
         val headers = mapOf(
-                "Cookie" to session,
-                "x-requested-with" to "com.wwcinematv",
+            "Cookie" to session,
+            "x-requested-with" to "com.wwcinematv",
         )
 
         val doc = app.get(url, headers = headers).document
@@ -1538,81 +2257,130 @@ object SoraExtractor : SoraStream() {
             "$cinemaTvAPI/api/v1/security/episode-access?id_episode=$episodeId&hash=$hash&expires=$expires"
         }
 
-        val sources = app.get(videoUrl, referer = url, headers = mapOf("X-Requested-With" to "XMLHttpRequest")).parsedSafe<CinemaTvResponse>()
+        val sources = app.get(
+            videoUrl,
+            referer = url,
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        ).parsedSafe<CinemaTvResponse>()
 
         sources?.streams?.mapKeys { source ->
-            callback.invoke(ExtractorLink("CinemaTv", "CinemaTv", source.value, "$cinemaTvAPI/", getQualityFromName(source.key), true))
+            callback.invoke(
+                ExtractorLink(
+                    "CinemaTv",
+                    "CinemaTv",
+                    source.value,
+                    "$cinemaTvAPI/",
+                    getQualityFromName(source.key),
+                    true
+                )
+            )
         }
 
         sources?.subtitles?.map { sub ->
             val file = sub.file.toString()
-            subtitleCallback.invoke(SubtitleFile(
+            subtitleCallback.invoke(
+                SubtitleFile(
                     sub.language ?: return@map,
                     if (file.startsWith("[")) return@map else fixUrl(file, cinemaTvAPI),
-            ))
+                )
+            )
         }
 
     }
 
-    suspend fun invokeNinetv(tmdbId: Int? = null, season: Int? = null, episode: Int? = null, subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit) {
+    suspend fun invokeNinetv(
+        tmdbId: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val url = if (season == null) {
             "$nineTvAPI/movie/$tmdbId"
         } else {
             "$nineTvAPI/tv/$tmdbId-$season-$episode"
         }
 
-        val iframe = app.get(url, referer = "https://pressplay.top/").document.selectFirst("iframe")?.attr("src")
+        val iframe = app.get(url, referer = "https://pressplay.top/").document.selectFirst("iframe")
+            ?.attr("src")
 
         loadExtractor(iframe ?: return, "$nineTvAPI/", subtitleCallback, callback)
 
     }
 
-    suspend fun invokeNowTv(tmdbId: Int? = null, imdbId: String? = null, season: Int? = null, episode: Int? = null, callback: (ExtractorLink) -> Unit, referer: String = "https://bflix.gs/") {
+    suspend fun invokeNowTv(
+        tmdbId: Int? = null,
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+        referer: String = "https://bflix.gs/"
+    ) {
         val slug = getEpisodeSlug(season, episode)
-        var url = if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
+        var url =
+            if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
         if (!app.get(url, referer = referer).isSuccessful) {
-            url = if (season == null) "$nowTvAPI/$imdbId.mp4" else "$nowTvAPI/tv/$imdbId/s${season}e${slug.second}.mp4"
+            url =
+                if (season == null) "$nowTvAPI/$imdbId.mp4" else "$nowTvAPI/tv/$imdbId/s${season}e${slug.second}.mp4"
             if (!app.get(url, referer = referer).isSuccessful) return
         }
-        callback.invoke(ExtractorLink(
+        callback.invoke(
+            ExtractorLink(
                 "NowTv",
                 "NowTv",
                 url,
                 referer,
                 Qualities.P1080.value,
-        ))
+            )
+        )
     }
 
     suspend fun invokeRidomovies(
-            tmdbId: Int? = null,
-            imdbId: String? = null,
-            callback: (ExtractorLink) -> Unit,
+        tmdbId: Int? = null,
+        imdbId: String? = null,
+        callback: (ExtractorLink) -> Unit,
     ) {
-        val slug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId").parsedSafe<RidoSearch>()?.data?.items?.find {
+        val slug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
+            .parsedSafe<RidoSearch>()?.data?.items?.find {
             it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
         }?.slug ?: return
-        app.get("$ridomoviesAPI/core/api/movies/$slug/videos").parsedSafe<RidoResponses>()?.data?.apmap { link ->
+        app.get("$ridomoviesAPI/core/api/movies/$slug/videos")
+            .parsedSafe<RidoResponses>()?.data?.apmap { link ->
             val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
             val unpacked = getAndUnpack(app.get(iframe, referer = "$ridomoviesAPI/").text)
             val video = Regex("=\"(aHR.*?)\";").find(unpacked)?.groupValues?.get(1)
-            callback.invoke(ExtractorLink("Ridomovies", "Ridomovies", base64Decode(video
-                    ?: return@apmap), "${getBaseUrl(iframe)}/", Qualities.P1080.value, isM3u8 = true))
+            callback.invoke(
+                ExtractorLink(
+                    "Ridomovies", "Ridomovies", base64Decode(
+                        video
+                            ?: return@apmap
+                    ), "${getBaseUrl(iframe)}/", Qualities.P1080.value, isM3u8 = true
+                )
+            )
         }
     }
 
     suspend fun invokeAllMovieland(
-            imdbId: String? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
-            host: String = "https://esh-bostewsom-i-273.site",
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+        host: String = "https://esh-bostewsom-i-273.site",
     ) {
-        val res = app.get("$host/play/$imdbId", referer = "$allmovielandAPI/").document.selectFirst("script:containsData(player =)")?.data()?.substringAfter("{")?.substringBefore(";")?.substringBefore(")")
+        val res = app.get(
+            "$host/play/$imdbId",
+            referer = "$allmovielandAPI/"
+        ).document.selectFirst("script:containsData(player =)")?.data()?.substringAfter("{")
+            ?.substringBefore(";")?.substringBefore(")")
         val json = tryParseJson<AllMovielandPlaylist>("{${res ?: return}")
         val headers = mapOf("X-CSRF-TOKEN" to "${json?.key}")
 
-        val serverRes = app.get(fixUrl(json?.file
-                ?: return, host), headers = headers, referer = "$allmovielandAPI/").text.replace(Regex(""",\s*\[]"""), "")
+        val serverRes = app.get(
+            fixUrl(
+                json?.file
+                    ?: return, host
+            ), headers = headers, referer = "$allmovielandAPI/"
+        ).text.replace(Regex(""",\s*\[]"""), "")
         val servers = tryParseJson<ArrayList<AllMovielandServer>>(serverRes).let { server ->
             if (season == null) {
                 server?.map { it.file to it.title }
@@ -1624,19 +2392,24 @@ object SoraExtractor : SoraStream() {
         }
 
         servers?.apmap { (server, lang) ->
-            val path = app.post("${host}/playlist/${server ?: return@apmap}.txt", headers = headers, referer = "$allmovielandAPI/").text
-            M3u8Helper.generateM3u8("Allmovieland [$lang]", path, "$allmovielandAPI/").forEach(callback)
+            val path = app.post(
+                "${host}/playlist/${server ?: return@apmap}.txt",
+                headers = headers,
+                referer = "$allmovielandAPI/"
+            ).text
+            M3u8Helper.generateM3u8("Allmovieland [$lang]", path, "$allmovielandAPI/")
+                .forEach(callback)
         }
 
     }
 
     suspend fun invokeEmovies(
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
     ) {
         val slug = title.createSlug()
         val url = if (season == null) {
@@ -1652,16 +2425,22 @@ object SoraExtractor : SoraStream() {
             res.selectFirst("select#selectServer option[sv=oserver]")?.attr("value")
         } else {
             res.select("div.le-server a").find {
-                val num = Regex("Episode (\\d+)").find(it.text())?.groupValues?.get(1)?.toIntOrNull()
+                val num =
+                    Regex("Episode (\\d+)").find(it.text())?.groupValues?.get(1)?.toIntOrNull()
                 num == episode
             }?.attr("href")
         })?.substringAfter("id=")?.substringBefore("&")
 
-        val server = app.get("$emoviesAPI/ajax/v4_get_sources?s=oserver&id=${id ?: return}&_=${unixTimeMS}", headers = mapOf("X-Requested-With" to "XMLHttpRequest")).parsedSafe<EMovieServer>()?.value
+        val server = app.get(
+            "$emoviesAPI/ajax/v4_get_sources?s=oserver&id=${id ?: return}&_=${unixTimeMS}",
+            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        ).parsedSafe<EMovieServer>()?.value
 
-        val script = app.get(server
-                ?: return, referer = "$emoviesAPI/").document.selectFirst("script:containsData(sources:)")?.data()
-                ?: return
+        val script = app.get(
+            server
+                ?: return, referer = "$emoviesAPI/"
+        ).document.selectFirst("script:containsData(sources:)")?.data()
+            ?: return
         val sources = Regex("sources:\\s*\\[(.*)],").find(script)?.groupValues?.get(1)?.let {
             tryParseJson<List<EMovieSources>>("[$it]")
         }
@@ -1670,39 +2449,59 @@ object SoraExtractor : SoraStream() {
         }
 
         sources?.map { source ->
-            M3u8Helper.generateM3u8("Emovies", source.file
-                    ?: return@map, "https://embed.vodstream.xyz/").forEach(callback)
+            M3u8Helper.generateM3u8(
+                "Emovies", source.file
+                    ?: return@map, "https://embed.vodstream.xyz/"
+            ).forEach(callback)
         }
 
         tracks?.map { track ->
-            subtitleCallback.invoke(SubtitleFile(
+            subtitleCallback.invoke(
+                SubtitleFile(
                     track.label ?: "",
                     track.file ?: return@map,
-            ))
+                )
+            )
         }
 
 
     }
 
     suspend fun invokeSFMovies(
-            tmdbId: Int? = null,
-            title: String? = null,
-            year: Int? = null,
-            season: Int? = null,
-            episode: Int? = null,
-            callback: (ExtractorLink) -> Unit,
+        tmdbId: Int? = null,
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
     ) {
-        val headers = mapOf("Authorization" to "Bearer 44d784c55e9a1e3dbb586f24b18b1cbcd1521673bd6178ef385890d2f989681fe22d05e291e2e0f03fce99cbc50cd520219e52cc6e30c944a559daf53a129af18349ec98f6a0e4e66b8d370a354f4f7fbd49df0ab806d533a3db71eecc7f75131a59ce8cffc5e0cc38e8af5919c23c0d904fbe31995308f065f0ff9cd1eda488")
-        val data = app.get("${BuildConfig.SFMOVIES_API}/api/mains?filters[title][\$contains]=$title", headers = headers).parsedSafe<SFMoviesSearch>()?.data
+        val headers =
+            mapOf("Authorization" to "Bearer 44d784c55e9a1e3dbb586f24b18b1cbcd1521673bd6178ef385890d2f989681fe22d05e291e2e0f03fce99cbc50cd520219e52cc6e30c944a559daf53a129af18349ec98f6a0e4e66b8d370a354f4f7fbd49df0ab806d533a3db71eecc7f75131a59ce8cffc5e0cc38e8af5919c23c0d904fbe31995308f065f0ff9cd1eda488")
+        val data = app.get(
+            "${BuildConfig.SFMOVIES_API}/api/mains?filters[title][\$contains]=$title",
+            headers = headers
+        ).parsedSafe<SFMoviesSearch>()?.data
         val media = data?.find {
-            it.attributes?.contentId.equals("$tmdbId") || (it.attributes?.title.equals(title, true) || it.attributes?.releaseDate?.substringBefore("-").equals("$year"))
+            it.attributes?.contentId.equals("$tmdbId") || (it.attributes?.title.equals(
+                title,
+                true
+            ) || it.attributes?.releaseDate?.substringBefore("-").equals("$year"))
         }
         val video = if (season == null || episode == null) {
             media?.attributes?.video
         } else {
             media?.attributes?.seriess?.get(season - 1)?.get(episode - 1)?.svideos
         } ?: return
-        callback.invoke(ExtractorLink("SFMovies", "SFMovies", fixUrl(video, getSfServer()), "", Qualities.P1080.value, INFER_TYPE))
+        callback.invoke(
+            ExtractorLink(
+                "SFMovies",
+                "SFMovies",
+                fixUrl(video, getSfServer()),
+                "",
+                Qualities.P1080.value,
+                INFER_TYPE
+            )
+        )
     }
 
 }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index dbbd51de..9e2ec1d1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -743,14 +743,15 @@ suspend fun getCrunchyrollToken(): CrunchyrollAccessToken {
 
     val token = tryParseJson<CrunchyrollToken>(client.newCall(request).execute().body.string())
     val headers = mapOf("Authorization" to "${token?.tokenType} ${token?.accessToken}")
-    val cms = app.get("$crunchyrollAPI/index/v2", headers = headers).parsedSafe<CrunchyrollToken>()?.cms
+    val cms =
+        app.get("$crunchyrollAPI/index/v2", headers = headers).parsedSafe<CrunchyrollToken>()?.cms
     return CrunchyrollAccessToken(
-            token?.accessToken,
-            token?.tokenType,
-            cms?.bucket,
-            cms?.policy,
-            cms?.signature,
-            cms?.key_pair_id,
+        token?.accessToken,
+        token?.tokenType,
+        cms?.bucket,
+        cms?.policy,
+        cms?.signature,
+        cms?.key_pair_id,
     )
 }
 

From 3955446a36d94f51e5be352138e8e108621812a1 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:05:14 +0700
Subject: [PATCH 057/125] fix #507

---
 Kinoger/build.gradle.kts                       | 2 +-
 Kinoger/src/main/kotlin/com/hexated/Kinoger.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Kinoger/build.gradle.kts b/Kinoger/build.gradle.kts
index 7dfa6898..68c19e49 100644
--- a/Kinoger/build.gradle.kts
+++ b/Kinoger/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
index c7b78584..bdbcaea6 100644
--- a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
+++ b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
@@ -50,7 +50,7 @@ class Kinoger : MainAPI() {
         val title = this.selectFirst("a")?.text() ?: this.selectFirst("img")?.attr("alt")
         ?: this.selectFirst("a")?.attr("title") ?: return null
         val posterUrl = fixUrlNull(
-                (this.nextElementSibling()?.selectFirst("div.content_text img") ?: this.selectFirst("div.content_text img") ?: this.selectFirst("img"))?.getImageAttr()
+            (this.selectFirst("div.content_text img") ?: this.nextElementSibling()?.selectFirst("div.content_text img") ?: this.selectFirst("img"))?.getImageAttr()
         )
 
         return newTvSeriesSearchResponse(title, href, TvType.AsianDrama) {

From 2da3119c8c03df6b128616e7e6eb158562c5c2a3 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 8 Jan 2024 12:24:49 +0700
Subject: [PATCH 058/125] kinoger: fix detail page

---
 Kinoger/src/main/kotlin/com/hexated/Kinoger.kt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
index bdbcaea6..30e78a2a 100644
--- a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
+++ b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
@@ -70,24 +70,24 @@ class Kinoger : MainAPI() {
         val poster = fixUrlNull(document.selectFirst("div.images-border img")?.getImageAttr())
         val description = document.select("div.images-border").text()
         val year = """\((\d{4})\)""".toRegex().find(title)?.groupValues?.get(1)?.toIntOrNull()
-        val type = if (document.selectFirst("label[title=Stream HD+]")
-                        ?.hasText() == true
-        ) TvType.Movie else TvType.TvSeries
+        val tags = document.select("li.category a").map { it.text() }
 
         val recommendations = document.select("ul.ul_related li").mapNotNull {
             it.toSearchResult()
         }
 
         val script = document.selectFirst("script:containsData(pw.show)")?.data()
-                ?.substringAfter("[")?.substringBeforeLast("]")?.replace("\'", "\"")
-        val json = AppUtils.tryParseJson<List<List<String>>>("[$script]")
+        val data = script?.substringAfter("[")?.substringBeforeLast("]")?.replace("\'", "\"")
+        val json = AppUtils.tryParseJson<List<List<String>>>("[$data]")
+
+        val type = if(script?.substringBeforeLast(")")?.substringAfterLast(",") == "0.2") TvType.Movie else TvType.TvSeries
 
         val episodes = json?.flatMapIndexed { season: Int, iframes: List<String> ->
             iframes.mapIndexed { episode, iframe ->
                 Episode(
-                        iframe.trim(),
-                        season = season + 1,
-                        episode = episode + 1
+                    iframe.trim(),
+                    season = season + 1,
+                    episode = episode + 1
                 )
             }
         } ?: emptyList()
@@ -96,6 +96,7 @@ class Kinoger : MainAPI() {
             this.posterUrl = poster
             this.year = year
             this.plot = description
+            this.tags = tags
             this.recommendations = recommendations
         }
     }

From 69be199c369597d774738985461ba41dc1d6cf1e Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 8 Jan 2024 20:50:43 +0700
Subject: [PATCH 059/125] fix

---
 Minioppai/build.gradle.kts                          | 2 +-
 Minioppai/src/main/kotlin/com/hexated/Extractors.kt | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Minioppai/build.gradle.kts b/Minioppai/build.gradle.kts
index 87203b16..cb83145d 100644
--- a/Minioppai/build.gradle.kts
+++ b/Minioppai/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 9
+version = 10
 
 
 cloudstream {
diff --git a/Minioppai/src/main/kotlin/com/hexated/Extractors.kt b/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
index 3e172453..d919bc5c 100644
--- a/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
@@ -47,12 +47,7 @@ open class Streampai : ExtractorApi() {
                     url,
                     getQualityFromName(it.label),
                     headers = mapOf(
-                        "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
-                        "Accept-Language" to "en-US,en;q=0.5",
-                        "DNT" to "1",
                         "Range" to "bytes=0-",
-                        "Sec-Fetch-Dest" to "video",
-                        "Sec-Fetch-Mode" to "no-cors",
                     )
                 )
             )

From 7f23d6e4bf57c4414fa4607422146bb03856e814 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 9 Jan 2024 02:01:12 +0700
Subject: [PATCH 060/125] glad you ain't gave up yet

---
 KuramanimeProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KuramanimeProvider/build.gradle.kts b/KuramanimeProvider/build.gradle.kts
index b24ec21b..7d620269 100644
--- a/KuramanimeProvider/build.gradle.kts
+++ b/KuramanimeProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 35
+version = 36
 
 
 cloudstream {

From 852796cc15cab0f7678e73a2a6383d3caf065b00 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 11 Jan 2024 05:07:40 +0700
Subject: [PATCH 061/125] bump

---
 SoraStream/build.gradle.kts                             | 2 +-
 SoraStream/src/main/kotlin/com/hexated/Extractors.kt    | 1 -
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 106eb0ab..b5b9a14a 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 214
+version = 215
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 880238b5..b11a554b 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -12,7 +12,6 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.extractors.Jeniusplay
 import com.lagradost.cloudstream3.extractors.PixelDrain
-import com.lagradost.cloudstream3.extractors.Vidplay
 import com.lagradost.cloudstream3.utils.*
 import java.math.BigInteger
 import java.security.MessageDigest
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 4d913dfe..a3aa728f 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -764,8 +764,9 @@ object SoraExtractor : SoraStream() {
         val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id")
             ?: return
 
-        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources")
-            .parsedSafe<VidsrctoSources>()?.result?.apmap {
+        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources", headers = mapOf(
+            "X-Requested-With" to "XMLHttpRequest"
+        )).parsedSafe<VidsrctoSources>()?.result?.apmap {
             val encUrl = app.get("$vidsrctoAPI/ajax/embed/source/${it.id}")
                 .parsedSafe<VidsrctoResponse>()?.result?.url
             loadExtractor(

From b77d6ead500af353b3c81fedbd010de529bccfa9 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 11 Jan 2024 18:49:11 +0700
Subject: [PATCH 062/125] fix

---
 .../src/main/kotlin/com/hexated/Extractors.kt | 90 ++++++++++++++++++
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 91 ++++++++++++++-----
 .../src/main/kotlin/com/hexated/SoraStream.kt |  8 +-
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  6 +-
 .../kotlin/com/hexated/SoraStreamPlugin.kt    |  3 +
 5 files changed, 163 insertions(+), 35 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index b11a554b..78d52668 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -342,6 +342,96 @@ open class Netembed : ExtractorApi() {
     }
 }
 
+open class Ridoo : ExtractorApi() {
+    override val name = "Ridoo"
+    override var mainUrl = "https://ridoo.net"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, referer = referer)
+        val script = if (!getPacked(response.text).isNullOrEmpty()) {
+            getAndUnpack(response.text)
+        } else {
+            response.document.selectFirst("script:containsData(sources:)")?.data()
+        }
+        val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                m3u8 ?: return,
+                mainUrl,
+                Qualities.P1080.value,
+                INFER_TYPE
+            )
+        )
+    }
+
+}
+
+open class Streamvid : ExtractorApi() {
+    override val name = "Streamvid"
+    override val mainUrl = "https://streamvid.net"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, referer = referer)
+        val script = if (!getPacked(response.text).isNullOrEmpty()) {
+            getAndUnpack(response.text)
+        } else {
+            response.document.selectFirst("script:containsData(sources:)")?.data()
+        }
+        val m3u8 =
+            Regex("src:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        M3u8Helper.generateM3u8(
+            name,
+            m3u8 ?: return,
+            mainUrl
+        ).forEach(callback)
+    }
+
+}
+
+open class Embedrise : ExtractorApi() {
+    override val name = "Embedrise"
+    override val mainUrl = "https://embedrise.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url, referer = referer).document
+        val title = res.select("title").text()
+        val video = res.select("video#player source").attr("src")
+
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                video,
+                "$mainUrl/",
+                getIndexQuality(title),
+                INFER_TYPE
+            )
+        )
+
+    }
+
+}
+
 class Streamwish : Filesim() {
     override val name = "Streamwish"
     override var mainUrl = "https://streamwish.to"
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index a3aa728f..25c6f27f 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -476,17 +476,34 @@ object SoraExtractor : SoraStream() {
         document.select("ul#playeroptionsul > li")
             .filter { element -> element.select("span.flag img").attr("src").contains("/en.") }
             .map {
-                Triple(it.attr("data-post"), it.attr("data-nume"), it.attr("data-type"))
+                Triple(
+                    it.attr("data-post"),
+                    it.attr("data-nume"),
+                    it.attr("data-type")
+                )
             }.apmap { (id, nume, type) ->
-            val source = app.get(
-                "$host/wp-json/dooplayer/v2/${id}/${type}/${nume}",
-                headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-                referer = "$host/"
-            ).parsed<ResponseHash>().embed_url
-            if (!source.contains("youtube")) {
-                loadExtractor(source, "$host/", subtitleCallback, callback)
+                val source = app.get(
+                    "$host/wp-json/dooplayer/v2/${id}/${type}/${nume}",
+                    headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
+                    referer = "$host/"
+                ).parsed<ResponseHash>().embed_url
+                if (!source.contains("youtube")) {
+                    if (source.startsWith("https://voe.sx")) {
+                        val req = app.get(source, referer = "$host/")
+                        val server = getBaseUrl(req.url)
+                        val script = req.text.substringAfter("wc0 = '").substringBefore("'")
+                        val video = tryParseJson<Map<String, String>>(base64Decode(script))?.get("file")
+                        M3u8Helper.generateM3u8(
+                            "Voe",
+                            video ?: return@apmap,
+                            "$server/",
+                            headers = mapOf("Origin" to server)
+                        ).forEach(callback)
+                    } else {
+                        loadExtractor(source, "$host/", subtitleCallback, callback)
+                    }
+                }
             }
-        }
     }
 
     suspend fun invokeNoverse(
@@ -2339,25 +2356,51 @@ object SoraExtractor : SoraStream() {
     suspend fun invokeRidomovies(
         tmdbId: Int? = null,
         imdbId: String? = null,
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val slug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
-            .parsedSafe<RidoSearch>()?.data?.items?.find {
-            it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
-        }?.slug ?: return
-        app.get("$ridomoviesAPI/core/api/movies/$slug/videos")
-            .parsedSafe<RidoResponses>()?.data?.apmap { link ->
+        val slug = if (season == null) {
+            app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
+                .parsedSafe<RidoSearch>()?.data?.items?.find {
+                    it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
+                }?.slug
+        } else {
+            app.get("$ridomoviesAPI/tv/${title.createSlug()}/season-$season/episode-$episode").text.substringAfterLast(
+                """postid\":\""""
+            ).substringBefore("""\"""")
+        } ?: return
+        val url = if(season == null) {
+            "$ridomoviesAPI/core/api/movies/$slug/videos"
+        } else {
+            "$ridomoviesAPI/core/api/episodes/$slug/videos"
+        }
+        app.get(url).parsedSafe<RidoResponses>()?.data?.apmap { link ->
             val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
-            val unpacked = getAndUnpack(app.get(iframe, referer = "$ridomoviesAPI/").text)
-            val video = Regex("=\"(aHR.*?)\";").find(unpacked)?.groupValues?.get(1)
-            callback.invoke(
-                ExtractorLink(
-                    "Ridomovies", "Ridomovies", base64Decode(
-                        video
-                            ?: return@apmap
-                    ), "${getBaseUrl(iframe)}/", Qualities.P1080.value, isM3u8 = true
+            if(iframe.startsWith("https://closeload.top")) {
+                val unpacked =
+                    getAndUnpack(
+                        app.get(
+                            iframe,
+                            referer = "$ridomoviesAPI/"
+                        ).text
+                    )
+                val video = Regex("=\"(aHR.*?)\";").find(unpacked)?.groupValues?.get(1)
+                callback.invoke(
+                    ExtractorLink(
+                        "Ridomovies",
+                        "Ridomovies",
+                        base64Decode(video ?: return@apmap),
+                        "${getBaseUrl(iframe)}/",
+                        Qualities.P1080.value,
+                        isM3u8 = true
+                    )
                 )
-            )
+            } else {
+                loadExtractor(iframe, "$ridomoviesAPI/", subtitleCallback, callback)
+            }
         }
     }
 
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index b9b4b147..bbcac45e 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -104,7 +104,7 @@ open class SoraStream : TmdbProvider() {
         const val nowTvAPI = "https://myfilestorage.xyz"
         const val gokuAPI = "https://goku.sx"
         const val zshowAPI = BuildConfig.ZSHOW_API
-        const val ridomoviesAPI = "https://ridomovies.pw"
+        const val ridomoviesAPI = "https://ridomovies.tv"
         const val emoviesAPI = "https://emovies.si"
         const val multimoviesAPI = "https://multimovies.top"
         const val multimovies2API = "https://multimovies.click"
@@ -584,11 +584,7 @@ open class SoraStream : TmdbProvider() {
                 if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
             },
             {
-                if (!res.isAnime && res.season == null) invokeRidomovies(
-                    res.id,
-                    res.imdbId,
-                    callback
-                )
+                if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, res.title, res.season, res.episode, subtitleCallback, callback)
             },
             {
                 if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 03d63963..5ab38d6c 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -223,11 +223,7 @@ class SoraStreamLite : SoraStream() {
                 )
             },
             {
-                if (!res.isAnime && res.season == null) invokeRidomovies(
-                    res.id,
-                    res.imdbId,
-                    callback
-                )
+                if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, res.title, res.season, res.episode, subtitleCallback, callback)
             },
             {
                 if (!res.isAnime) invokeEmovies(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
index d2456f6e..abc461c1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
@@ -30,5 +30,8 @@ class SoraStreamPlugin: Plugin() {
         registerExtractorAPI(Netembed())
         registerExtractorAPI(Flaswish())
         registerExtractorAPI(Comedyshow())
+        registerExtractorAPI(Ridoo())
+        registerExtractorAPI(Streamvid())
+        registerExtractorAPI(Embedrise())
     }
 }
\ No newline at end of file

From 081e5aa1fde193bea57cf7f29e2a097c53a1e3d2 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:17:54 +0700
Subject: [PATCH 063/125] sora: added aniwave & fix few sources

---
 SoraStream/build.gradle.kts                   |   2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt |   5 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 114 ++++--
 .../src/main/kotlin/com/hexated/SoraParser.kt | 383 ++++++++++--------
 .../src/main/kotlin/com/hexated/SoraStream.kt |  83 ++--
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  10 +-
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |  49 +++
 7 files changed, 394 insertions(+), 252 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index b5b9a14a..ccfdee88 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 215
+version = 216
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 78d52668..b11a7d31 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -263,8 +263,7 @@ open class Streamruby : ExtractorApi() {
         } else {
             response.document.selectFirst("script:containsData(sources:)")?.data()
         }
-        val m3u8 =
-            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
         M3u8Helper.generateM3u8(
             name,
             m3u8 ?: return,
@@ -466,7 +465,7 @@ class Animefever : Filesim() {
     override var mainUrl = "https://animefever.fun"
 }
 
-class Multimovies : Filesim() {
+class Multimovies : Ridoo() {
     override val name = "Multimovies"
     override var mainUrl = "https://multimovies.cloud"
 }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 25c6f27f..f848b653 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -492,7 +492,8 @@ object SoraExtractor : SoraStream() {
                         val req = app.get(source, referer = "$host/")
                         val server = getBaseUrl(req.url)
                         val script = req.text.substringAfter("wc0 = '").substringBefore("'")
-                        val video = tryParseJson<Map<String, String>>(base64Decode(script))?.get("file")
+                        val video =
+                            tryParseJson<Map<String, String>>(base64Decode(script))?.get("file")
                         M3u8Helper.generateM3u8(
                             "Voe",
                             video ?: return@apmap,
@@ -528,8 +529,8 @@ object SoraExtractor : SoraStream() {
         } else {
             doc.select("table.table-striped tbody tr")
                 .find { it.text().contains("Episode $episode") }?.select("td")?.map {
-                it.select("a").attr("href") to it.select("a").text()
-            }
+                    it.select("a").attr("href") to it.select("a").text()
+                }
         } ?: return
 
         delay(4000)
@@ -781,9 +782,11 @@ object SoraExtractor : SoraStream() {
         val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id")
             ?: return
 
-        app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/sources", headers = mapOf(
-            "X-Requested-With" to "XMLHttpRequest"
-        )).parsedSafe<VidsrctoSources>()?.result?.apmap {
+        app.get(
+            "$vidsrctoAPI/ajax/embed/episode/$mediaId/sources", headers = mapOf(
+                "X-Requested-With" to "XMLHttpRequest"
+            )
+        ).parsedSafe<VidsrctoSources>()?.result?.apmap {
             val encUrl = app.get("$vidsrctoAPI/ajax/embed/source/${it.id}")
                 .parsedSafe<VidsrctoResponse>()?.result?.url
             loadExtractor(
@@ -905,21 +908,68 @@ object SoraExtractor : SoraStream() {
             if (season == null) TvType.AnimeMovie else TvType.Anime
         )
 
-        argamap({
-            invokeAnimetosho(malId, season, episode, subtitleCallback, callback)
-        }, {
-            invokeAniwatch(malId, episode, subtitleCallback, callback)
-        }, {
-            if (season != null) invokeCrunchyroll(
-                aniId,
-                malId,
-                epsTitle,
-                season,
-                episode,
+        val malsync = app.get("$malsyncAPI/mal/anime/${malId ?: return}")
+            .parsedSafe<MALSyncResponses>()?.sites
+
+        val zoroIds = malsync?.zoro?.keys?.map { it }
+        val aniwaveId = malsync?.nineAnime?.firstNotNullOf { it.value["url"] }
+
+        argamap(
+            {
+                invokeAnimetosho(malId, season, episode, subtitleCallback, callback)
+            },
+            {
+                invokeAniwatch(zoroIds, episode, subtitleCallback, callback)
+            },
+            {
+                invokeAniwave(aniwaveId, episode, subtitleCallback, callback)
+            },
+            {
+                if (season != null) invokeCrunchyroll(
+                    aniId,
+                    malId,
+                    epsTitle,
+                    season,
+                    episode,
+                    subtitleCallback,
+                    callback
+                )
+            }
+        )
+    }
+
+    private suspend fun invokeAniwave(
+        url: String? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url ?: return).document
+        val id = res.select("div#watch-main").attr("data-id")
+        val episodeId =
+            app.get("$aniwaveAPI/ajax/episode/list/$id?vrf=${AniwaveUtils.encodeVrf(id)}")
+                .parsedSafe<AniwaveResponse>()?.asJsoup()
+                ?.selectFirst("ul.ep-range li a[data-num=${episode ?: 1}]")?.attr("data-ids")
+                ?: return
+        val servers =
+            app.get("$aniwaveAPI/ajax/server/list/$episodeId?vrf=${AniwaveUtils.encodeVrf(episodeId)}")
+                .parsedSafe<AniwaveResponse>()?.asJsoup()
+                ?.select("div.servers > div[data-type!=sub] ul li") ?: return
+
+        servers.apmap {
+            val linkId = it.attr("data-link-id")
+            val iframe =
+                app.get("$aniwaveAPI/ajax/server/$linkId?vrf=${AniwaveUtils.encodeVrf(linkId)}")
+                    .parsedSafe<AniwaveServer>()?.result?.decrypt()
+            val audio = if (it.attr("data-cmid").endsWith("softsub")) "Raw" else "English Dub"
+            loadCustomExtractor(
+                "${it.text()} [$audio]",
+                iframe ?: return@apmap,
+                "$aniwaveAPI/",
                 subtitleCallback,
-                callback
+                callback,
             )
-        })
+        }
     }
 
     private suspend fun invokeAnimetosho(
@@ -968,7 +1018,7 @@ object SoraExtractor : SoraStream() {
     }
 
     private suspend fun invokeAniwatch(
-        malId: Int? = null,
+        animeIds: List<String?>? = null,
         episode: Int? = null,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
@@ -976,9 +1026,7 @@ object SoraExtractor : SoraStream() {
         val headers = mapOf(
             "X-Requested-With" to "XMLHttpRequest",
         )
-        val animeId = app.get("$malsyncAPI/mal/anime/${malId ?: return}")
-            .parsedSafe<MALSyncResponses>()?.sites?.zoro?.keys?.map { it }
-        animeId?.apmap { id ->
+        animeIds?.apmap { id ->
             val episodeId = app.get(
                 "$aniwatchAPI/ajax/v2/episode/list/${id ?: return@apmap}",
                 headers = headers
@@ -992,12 +1040,12 @@ object SoraExtractor : SoraStream() {
                 headers = headers
             ).parsedSafe<AniwatchResponses>()?.html?.let { Jsoup.parse(it) }
                 ?.select("div.item.server-item")?.map {
-                Triple(
-                    it.text(),
-                    it.attr("data-id"),
-                    it.attr("data-type"),
-                )
-            }
+                    Triple(
+                        it.text(),
+                        it.attr("data-id"),
+                        it.attr("data-type"),
+                    )
+                }
 
             servers?.apmap servers@{ server ->
                 val iframe = app.get(
@@ -1914,8 +1962,8 @@ object SoraExtractor : SoraStream() {
                         timeout = 120L
                     ).document.selectFirst("script:containsData(downloaddomain)")?.data()
                         ?.substringAfter("\"downloaddomain\":\"")?.substringBefore("\",")?.let {
-                        "$it/0:"
-                    }
+                            "$it/0:"
+                        }
                     fixUrl(path, worker ?: return@apmap null)
                 } else {
                     fixUrl(path, apiUrl)
@@ -2372,14 +2420,14 @@ object SoraExtractor : SoraStream() {
                 """postid\":\""""
             ).substringBefore("""\"""")
         } ?: return
-        val url = if(season == null) {
+        val url = if (season == null) {
             "$ridomoviesAPI/core/api/movies/$slug/videos"
         } else {
             "$ridomoviesAPI/core/api/episodes/$slug/videos"
         }
         app.get(url).parsedSafe<RidoResponses>()?.data?.apmap { link ->
             val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
-            if(iframe.startsWith("https://closeload.top")) {
+            if (iframe.startsWith("https://closeload.top")) {
                 val unpacked =
                     getAndUnpack(
                         app.get(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index c4378663..fd388fbc 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -1,31 +1,56 @@
 package com.hexated
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
 
 data class CrunchyrollAccessToken(
-        val accessToken: String? = null,
-        val tokenType: String? = null,
-        val bucket: String? = null,
-        val policy: String? = null,
-        val signature: String? = null,
-        val key_pair_id: String? = null,
+    val accessToken: String? = null,
+    val tokenType: String? = null,
+    val bucket: String? = null,
+    val policy: String? = null,
+    val signature: String? = null,
+    val key_pair_id: String? = null,
 )
 
 data class FDMovieIFrame(
-        val link: String,
-        val quality: String,
-        val size: String,
-        val type: String,
+    val link: String,
+    val quality: String,
+    val size: String,
+    val type: String,
 )
 
 data class AniIds(var id: Int? = null, var idMal: Int? = null)
 
 data class TmdbDate(
-        val today: String,
-        val nextWeek: String,
+    val today: String,
+    val nextWeek: String,
 )
 
-data class AniMedia(@JsonProperty("id") var id: Int? = null, @JsonProperty("idMal") var idMal: Int? = null)
+data class AniwaveResponse(
+    val result: String
+) {
+    fun asJsoup(): Document {
+        return Jsoup.parse(result)
+    }
+}
+
+data class AniwaveServer(
+    val result: Result
+) {
+    data class Result(
+        val url: String
+    ) {
+        fun decrypt(): String {
+            return AniwaveUtils.decodeVrf(url)
+        }
+    }
+}
+
+data class AniMedia(
+    @JsonProperty("id") var id: Int? = null,
+    @JsonProperty("idMal") var idMal: Int? = null
+)
 
 data class AniPage(@JsonProperty("media") var media: java.util.ArrayList<AniMedia> = arrayListOf())
 
@@ -34,155 +59,155 @@ data class AniData(@JsonProperty("Page") var Page: AniPage? = AniPage())
 data class AniSearch(@JsonProperty("data") var data: AniData? = AniData())
 
 data class GpressSources(
-        @JsonProperty("src") val src: String,
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: Int? = null,
-        @JsonProperty("max") val max: String,
+    @JsonProperty("src") val src: String,
+    @JsonProperty("file") val file: String? = null,
+    @JsonProperty("label") val label: Int? = null,
+    @JsonProperty("max") val max: String,
 )
 
 data class UHDBackupUrl(
-        @JsonProperty("url") val url: String? = null,
+    @JsonProperty("url") val url: String? = null,
 )
 
 data class ResponseHash(
-        @JsonProperty("embed_url") val embed_url: String,
-        @JsonProperty("key") val key: String? = null,
-        @JsonProperty("type") val type: String? = null,
+    @JsonProperty("embed_url") val embed_url: String,
+    @JsonProperty("key") val key: String? = null,
+    @JsonProperty("type") val type: String? = null,
 )
 
 data class KisskhSources(
-        @JsonProperty("Video") val video: String?,
-        @JsonProperty("ThirdParty") val thirdParty: String?,
+    @JsonProperty("Video") val video: String?,
+    @JsonProperty("ThirdParty") val thirdParty: String?,
 )
 
 data class KisskhSubtitle(
-        @JsonProperty("src") val src: String?,
-        @JsonProperty("label") val label: String?,
+    @JsonProperty("src") val src: String?,
+    @JsonProperty("label") val label: String?,
 )
 
 data class KisskhEpisodes(
-        @JsonProperty("id") val id: Int?,
-        @JsonProperty("number") val number: Int?,
+    @JsonProperty("id") val id: Int?,
+    @JsonProperty("number") val number: Int?,
 )
 
 data class KisskhDetail(
-        @JsonProperty("episodes") val episodes: ArrayList<KisskhEpisodes>? = arrayListOf(),
+    @JsonProperty("episodes") val episodes: ArrayList<KisskhEpisodes>? = arrayListOf(),
 )
 
 data class KisskhResults(
-        @JsonProperty("id") val id: Int?,
-        @JsonProperty("title") val title: String?,
+    @JsonProperty("id") val id: Int?,
+    @JsonProperty("title") val title: String?,
 )
 
 data class DriveBotLink(
-        @JsonProperty("url") val url: String? = null,
+    @JsonProperty("url") val url: String? = null,
 )
 
 data class DirectDl(
-        @JsonProperty("download_url") val download_url: String? = null,
+    @JsonProperty("download_url") val download_url: String? = null,
 )
 
 data class Safelink(
-        @JsonProperty("safelink") val safelink: String? = null,
+    @JsonProperty("safelink") val safelink: String? = null,
 )
 
 data class FDAds(
-        @JsonProperty("linkr") val linkr: String? = null,
+    @JsonProperty("linkr") val linkr: String? = null,
 )
 
 data class ZShowEmbed(
-        @JsonProperty("m") val meta: String? = null,
+    @JsonProperty("m") val meta: String? = null,
 )
 
 data class WatchsomuchTorrents(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("movieId") val movieId: Int? = null,
-        @JsonProperty("season") val season: Int? = null,
-        @JsonProperty("episode") val episode: Int? = null,
+    @JsonProperty("id") val id: Int? = null,
+    @JsonProperty("movieId") val movieId: Int? = null,
+    @JsonProperty("season") val season: Int? = null,
+    @JsonProperty("episode") val episode: Int? = null,
 )
 
 data class WatchsomuchMovies(
-        @JsonProperty("torrents") val torrents: ArrayList<WatchsomuchTorrents>? = arrayListOf(),
+    @JsonProperty("torrents") val torrents: ArrayList<WatchsomuchTorrents>? = arrayListOf(),
 )
 
 data class WatchsomuchResponses(
-        @JsonProperty("movie") val movie: WatchsomuchMovies? = null,
+    @JsonProperty("movie") val movie: WatchsomuchMovies? = null,
 )
 
 data class WatchsomuchSubtitles(
-        @JsonProperty("url") val url: String? = null,
-        @JsonProperty("label") val label: String? = null,
+    @JsonProperty("url") val url: String? = null,
+    @JsonProperty("label") val label: String? = null,
 )
 
 data class WatchsomuchSubResponses(
-        @JsonProperty("subtitles") val subtitles: ArrayList<WatchsomuchSubtitles>? = arrayListOf(),
+    @JsonProperty("subtitles") val subtitles: ArrayList<WatchsomuchSubtitles>? = arrayListOf(),
 )
 
 data class IndexMedia(
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("driveId") val driveId: String? = null,
-        @JsonProperty("mimeType") val mimeType: String? = null,
-        @JsonProperty("size") val size: String? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("modifiedTime") val modifiedTime: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("driveId") val driveId: String? = null,
+    @JsonProperty("mimeType") val mimeType: String? = null,
+    @JsonProperty("size") val size: String? = null,
+    @JsonProperty("name") val name: String? = null,
+    @JsonProperty("modifiedTime") val modifiedTime: String? = null,
 )
 
 data class IndexData(
-        @JsonProperty("files") val files: ArrayList<IndexMedia>? = arrayListOf(),
+    @JsonProperty("files") val files: ArrayList<IndexMedia>? = arrayListOf(),
 )
 
 data class IndexSearch(
-        @JsonProperty("data") val data: IndexData? = null,
+    @JsonProperty("data") val data: IndexData? = null,
 )
 
 data class JikanExternal(
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("url") val url: String? = null,
+    @JsonProperty("name") val name: String? = null,
+    @JsonProperty("url") val url: String? = null,
 )
 
 data class JikanData(
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("external") val external: ArrayList<JikanExternal>? = arrayListOf(),
+    @JsonProperty("title") val title: String? = null,
+    @JsonProperty("external") val external: ArrayList<JikanExternal>? = arrayListOf(),
 )
 
 data class JikanResponse(
-        @JsonProperty("data") val data: JikanData? = null,
+    @JsonProperty("data") val data: JikanData? = null,
 )
 
 data class CinemaTvSubtitles(
-        @JsonProperty("language") val language: String? = null,
-        @JsonProperty("file") val file: Any? = null,
+    @JsonProperty("language") val language: String? = null,
+    @JsonProperty("file") val file: Any? = null,
 )
 
 data class CinemaTvResponse(
-        @JsonProperty("streams") val streams: HashMap<String, String>? = null,
-        @JsonProperty("subtitles") val subtitles: ArrayList<CinemaTvSubtitles>? = arrayListOf(),
+    @JsonProperty("streams") val streams: HashMap<String, String>? = null,
+    @JsonProperty("subtitles") val subtitles: ArrayList<CinemaTvSubtitles>? = arrayListOf(),
 )
 
 data class VidsrctoResult(
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("url") val url: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("title") val title: String? = null,
+    @JsonProperty("url") val url: String? = null,
 )
 
 data class VidsrctoResponse(
-        @JsonProperty("result") val result: VidsrctoResult? = null,
+    @JsonProperty("result") val result: VidsrctoResult? = null,
 )
 
 data class VidsrctoSources(
-        @JsonProperty("result") val result: ArrayList<VidsrctoResult>? = arrayListOf(),
+    @JsonProperty("result") val result: ArrayList<VidsrctoResult>? = arrayListOf(),
 )
 
 data class VidsrctoSubtitles(
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("file") val file: String? = null,
+    @JsonProperty("label") val label: String? = null,
+    @JsonProperty("file") val file: String? = null,
 )
 
 data class AnilistExternalLinks(
-        @JsonProperty("id") var id: Int? = null,
-        @JsonProperty("site") var site: String? = null,
-        @JsonProperty("url") var url: String? = null,
-        @JsonProperty("type") var type: String? = null,
+    @JsonProperty("id") var id: Int? = null,
+    @JsonProperty("site") var site: String? = null,
+    @JsonProperty("url") var url: String? = null,
+    @JsonProperty("type") var type: String? = null,
 )
 
 data class AnilistMedia(@JsonProperty("externalLinks") var externalLinks: ArrayList<AnilistExternalLinks> = arrayListOf())
@@ -192,244 +217,248 @@ data class AnilistData(@JsonProperty("Media") var Media: AnilistMedia? = Anilist
 data class AnilistResponses(@JsonProperty("data") var data: AnilistData? = AnilistData())
 
 data class CrunchyrollToken(
-        @JsonProperty("access_token") val accessToken: String? = null,
-        @JsonProperty("token_type") val tokenType: String? = null,
-        @JsonProperty("cms") val cms: Cms? = null,
+    @JsonProperty("access_token") val accessToken: String? = null,
+    @JsonProperty("token_type") val tokenType: String? = null,
+    @JsonProperty("cms") val cms: Cms? = null,
 ) {
     data class Cms(
-            @JsonProperty("bucket") var bucket: String? = null,
-            @JsonProperty("policy") var policy: String? = null,
-            @JsonProperty("signature") var signature: String? = null,
-            @JsonProperty("key_pair_id") var key_pair_id: String? = null,
+        @JsonProperty("bucket") var bucket: String? = null,
+        @JsonProperty("policy") var policy: String? = null,
+        @JsonProperty("signature") var signature: String? = null,
+        @JsonProperty("key_pair_id") var key_pair_id: String? = null,
     )
 }
 
 data class CrunchyrollVersions(
-        @JsonProperty("audio_locale") val audio_locale: String? = null,
-        @JsonProperty("guid") val guid: String? = null,
+    @JsonProperty("audio_locale") val audio_locale: String? = null,
+    @JsonProperty("guid") val guid: String? = null,
 )
 
 data class CrunchyrollData(
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("slug_title") val slug_title: String? = null,
-        @JsonProperty("season_number") val season_number: Int? = null,
-        @JsonProperty("episode_number") val episode_number: Int? = null,
-        @JsonProperty("versions") val versions: ArrayList<CrunchyrollVersions>? = null,
-        @JsonProperty("streams_link") val streams_link: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("title") val title: String? = null,
+    @JsonProperty("slug_title") val slug_title: String? = null,
+    @JsonProperty("season_number") val season_number: Int? = null,
+    @JsonProperty("episode_number") val episode_number: Int? = null,
+    @JsonProperty("versions") val versions: ArrayList<CrunchyrollVersions>? = null,
+    @JsonProperty("streams_link") val streams_link: String? = null,
 )
 
 data class CrunchyrollResponses(
-        @JsonProperty("data") val data: ArrayList<CrunchyrollData>? = arrayListOf(),
+    @JsonProperty("data") val data: ArrayList<CrunchyrollData>? = arrayListOf(),
 )
 
 data class CrunchyrollSourcesResponses(
-        @JsonProperty("streams") val streams: Streams? = Streams(),
-        @JsonProperty("subtitles") val subtitles: HashMap<String, HashMap<String, String>>? = hashMapOf(),
+    @JsonProperty("streams") val streams: Streams? = Streams(),
+    @JsonProperty("subtitles") val subtitles: HashMap<String, HashMap<String, String>>? = hashMapOf(),
 ) {
     data class Streams(
-            @JsonProperty("adaptive_hls") val adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
-            @JsonProperty("vo_adaptive_hls") val vo_adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
+        @JsonProperty("adaptive_hls") val adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
+        @JsonProperty("vo_adaptive_hls") val vo_adaptive_hls: HashMap<String, HashMap<String, String>>? = hashMapOf(),
     )
 }
 
 data class MALSyncSites(
-        @JsonProperty("Zoro") val zoro: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
+    @JsonProperty("Zoro") val zoro: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
+    @JsonProperty("9anime") val nineAnime: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
 )
 
 data class MALSyncResponses(
-        @JsonProperty("Sites") val sites: MALSyncSites? = null,
+    @JsonProperty("Sites") val sites: MALSyncSites? = null,
 )
 
 data class AniwatchResponses(
-        @JsonProperty("html") val html: String? = null,
-        @JsonProperty("link") val link: String? = null,
+    @JsonProperty("html") val html: String? = null,
+    @JsonProperty("link") val link: String? = null,
 )
 
 data class MalSyncRes(
-        @JsonProperty("Sites") val Sites: Map<String, Map<String, Map<String, String>>>? = null,
+    @JsonProperty("Sites") val Sites: Map<String, Map<String, Map<String, String>>>? = null,
 )
 
 data class GokuData(
-        @JsonProperty("link") val link: String? = null,
+    @JsonProperty("link") val link: String? = null,
 )
 
 data class GokuServer(
-        @JsonProperty("data") val data: GokuData? = GokuData(),
+    @JsonProperty("data") val data: GokuData? = GokuData(),
 )
 
 data class AllMovielandEpisodeFolder(
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("file") val file: String? = null,
+    @JsonProperty("title") val title: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("file") val file: String? = null,
 )
 
 data class AllMovielandSeasonFolder(
-        @JsonProperty("episode") val episode: String? = null,
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("folder") val folder: ArrayList<AllMovielandEpisodeFolder>? = arrayListOf(),
+    @JsonProperty("episode") val episode: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("folder") val folder: ArrayList<AllMovielandEpisodeFolder>? = arrayListOf(),
 )
 
 data class AllMovielandServer(
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("folder") val folder: ArrayList<AllMovielandSeasonFolder>? = arrayListOf(),
+    @JsonProperty("title") val title: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("file") val file: String? = null,
+    @JsonProperty("folder") val folder: ArrayList<AllMovielandSeasonFolder>? = arrayListOf(),
 )
 
 data class AllMovielandPlaylist(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("key") val key: String? = null,
-        @JsonProperty("href") val href: String? = null,
+    @JsonProperty("file") val file: String? = null,
+    @JsonProperty("key") val key: String? = null,
+    @JsonProperty("href") val href: String? = null,
 )
 
 data class DumpMedia(
-        @JsonProperty("id") val id: String? = null,
-        @JsonProperty("domainType") val domainType: Int? = null,
-        @JsonProperty("name") val name: String? = null,
-        @JsonProperty("releaseTime") val releaseTime: String? = null,
+    @JsonProperty("id") val id: String? = null,
+    @JsonProperty("domainType") val domainType: Int? = null,
+    @JsonProperty("name") val name: String? = null,
+    @JsonProperty("releaseTime") val releaseTime: String? = null,
 )
 
 data class DumpQuickSearchData(
-        @JsonProperty("searchResults") val searchResults: ArrayList<DumpMedia>? = arrayListOf(),
+    @JsonProperty("searchResults") val searchResults: ArrayList<DumpMedia>? = arrayListOf(),
 )
 
 data class SubtitlingList(
-        @JsonProperty("languageAbbr") val languageAbbr: String? = null,
-        @JsonProperty("language") val language: String? = null,
-        @JsonProperty("subtitlingUrl") val subtitlingUrl: String? = null,
+    @JsonProperty("languageAbbr") val languageAbbr: String? = null,
+    @JsonProperty("language") val language: String? = null,
+    @JsonProperty("subtitlingUrl") val subtitlingUrl: String? = null,
 )
 
 data class DefinitionList(
-        @JsonProperty("code") val code: String? = null,
-        @JsonProperty("description") val description: String? = null,
+    @JsonProperty("code") val code: String? = null,
+    @JsonProperty("description") val description: String? = null,
 )
 
 data class EpisodeVo(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("seriesNo") val seriesNo: Int? = null,
-        @JsonProperty("definitionList") val definitionList: ArrayList<DefinitionList>? = arrayListOf(),
-        @JsonProperty("subtitlingList") val subtitlingList: ArrayList<SubtitlingList>? = arrayListOf(),
+    @JsonProperty("id") val id: Int? = null,
+    @JsonProperty("seriesNo") val seriesNo: Int? = null,
+    @JsonProperty("definitionList") val definitionList: ArrayList<DefinitionList>? = arrayListOf(),
+    @JsonProperty("subtitlingList") val subtitlingList: ArrayList<SubtitlingList>? = arrayListOf(),
 )
 
 data class DumpMediaDetail(
-        @JsonProperty("episodeVo") val episodeVo: ArrayList<EpisodeVo>? = arrayListOf(),
+    @JsonProperty("episodeVo") val episodeVo: ArrayList<EpisodeVo>? = arrayListOf(),
 )
 
 data class EMovieServer(
-        @JsonProperty("value") val value: String? = null,
+    @JsonProperty("value") val value: String? = null,
 )
 
 data class EMovieSources(
-        @JsonProperty("file") val file: String? = null,
+    @JsonProperty("file") val file: String? = null,
 )
 
 data class EMovieTraks(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
+    @JsonProperty("file") val file: String? = null,
+    @JsonProperty("label") val label: String? = null,
 )
 
 data class ShowflixResultsMovies(
-        @JsonProperty("movieName") val movieName: String? = null,
-        @JsonProperty("streamwish") val streamwish: String? = null,
-        @JsonProperty("filelions") val filelions: String? = null,
-        @JsonProperty("streamruby") val streamruby: String? = null,
+    @JsonProperty("movieName") val movieName: String? = null,
+    @JsonProperty("streamwish") val streamwish: String? = null,
+    @JsonProperty("filelions") val filelions: String? = null,
+    @JsonProperty("streamruby") val streamruby: String? = null,
 )
 
 data class ShowflixResultsSeries(
-        @JsonProperty("seriesName") val seriesName: String? = null,
-        @JsonProperty("streamwish") val streamwish: HashMap<String, List<String>>? = hashMapOf(),
-        @JsonProperty("filelions") val filelions: HashMap<String, List<String>>? = hashMapOf(),
-        @JsonProperty("streamruby") val streamruby: HashMap<String, List<String>>? = hashMapOf(),
+    @JsonProperty("seriesName") val seriesName: String? = null,
+    @JsonProperty("streamwish") val streamwish: HashMap<String, List<String>>? = hashMapOf(),
+    @JsonProperty("filelions") val filelions: HashMap<String, List<String>>? = hashMapOf(),
+    @JsonProperty("streamruby") val streamruby: HashMap<String, List<String>>? = hashMapOf(),
 )
 
 data class ShowflixSearchMovies(
-        @JsonProperty("results") val resultsMovies: ArrayList<ShowflixResultsMovies>? = arrayListOf(),
+    @JsonProperty("results") val resultsMovies: ArrayList<ShowflixResultsMovies>? = arrayListOf(),
 )
 
 data class ShowflixSearchSeries(
-        @JsonProperty("results") val resultsSeries: ArrayList<ShowflixResultsSeries>? = arrayListOf(),
+    @JsonProperty("results") val resultsSeries: ArrayList<ShowflixResultsSeries>? = arrayListOf(),
 )
 
 data class SFMoviesSeriess(
-        @JsonProperty("title") var title: String? = null,
-        @JsonProperty("svideos") var svideos: String? = null,
+    @JsonProperty("title") var title: String? = null,
+    @JsonProperty("svideos") var svideos: String? = null,
 )
 
 data class SFMoviesAttributes(
-        @JsonProperty("title") var title: String? = null,
-        @JsonProperty("video") var video: String? = null,
-        @JsonProperty("releaseDate") var releaseDate: String? = null,
-        @JsonProperty("seriess") var seriess: ArrayList<ArrayList<SFMoviesSeriess>>? = arrayListOf(),
-        @JsonProperty("contentId") var contentId: String? = null,
+    @JsonProperty("title") var title: String? = null,
+    @JsonProperty("video") var video: String? = null,
+    @JsonProperty("releaseDate") var releaseDate: String? = null,
+    @JsonProperty("seriess") var seriess: ArrayList<ArrayList<SFMoviesSeriess>>? = arrayListOf(),
+    @JsonProperty("contentId") var contentId: String? = null,
 )
 
-data class SFMoviesData(@JsonProperty("id") var id: Int? = null, @JsonProperty("attributes") var attributes: SFMoviesAttributes? = SFMoviesAttributes())
+data class SFMoviesData(
+    @JsonProperty("id") var id: Int? = null,
+    @JsonProperty("attributes") var attributes: SFMoviesAttributes? = SFMoviesAttributes()
+)
 
 data class SFMoviesSearch(
-        @JsonProperty("data") var data: ArrayList<SFMoviesData>? = arrayListOf(),
+    @JsonProperty("data") var data: ArrayList<SFMoviesData>? = arrayListOf(),
 )
 
 data class RidoContentable(
-        @JsonProperty("imdbId") var imdbId: String? = null,
-        @JsonProperty("tmdbId") var tmdbId: Int? = null,
+    @JsonProperty("imdbId") var imdbId: String? = null,
+    @JsonProperty("tmdbId") var tmdbId: Int? = null,
 )
 
 data class RidoItems(
-        @JsonProperty("slug") var slug: String? = null,
-        @JsonProperty("contentable") var contentable: RidoContentable? = null,
+    @JsonProperty("slug") var slug: String? = null,
+    @JsonProperty("contentable") var contentable: RidoContentable? = null,
 )
 
 data class RidoData(
-        @JsonProperty("url") var url: String? = null,
-        @JsonProperty("items") var items: ArrayList<RidoItems>? = arrayListOf(),
+    @JsonProperty("url") var url: String? = null,
+    @JsonProperty("items") var items: ArrayList<RidoItems>? = arrayListOf(),
 )
 
 data class RidoResponses(
-        @JsonProperty("data") var data: ArrayList<RidoData>? = arrayListOf(),
+    @JsonProperty("data") var data: ArrayList<RidoData>? = arrayListOf(),
 )
 
 data class RidoSearch(
-        @JsonProperty("data") var data: RidoData? = null,
+    @JsonProperty("data") var data: RidoData? = null,
 )
 
 data class SmashySources(
-        @JsonProperty("sourceUrls") var sourceUrls: ArrayList<String>? = arrayListOf(),
-        @JsonProperty("subtitleUrls") var subtitleUrls: String? = null,
+    @JsonProperty("sourceUrls") var sourceUrls: ArrayList<String>? = arrayListOf(),
+    @JsonProperty("subtitleUrls") var subtitleUrls: String? = null,
 )
 
 data class SmashyDSources(
-        @JsonProperty("sourceUrls") var sourceUrls: ArrayList<SmashyDSourcesUrls>? = arrayListOf(),
+    @JsonProperty("sourceUrls") var sourceUrls: ArrayList<SmashyDSourcesUrls>? = arrayListOf(),
 )
 
 data class SmashyDSourcesUrls(
-        @JsonProperty("file") var file: String? = null,
-        @JsonProperty("title") var title: String? = null,
+    @JsonProperty("file") var file: String? = null,
+    @JsonProperty("title") var title: String? = null,
 )
 
 data class AoneroomResponse(
-        @JsonProperty("data") val data: Data? = null,
+    @JsonProperty("data") val data: Data? = null,
 ) {
     data class Data(
-            @JsonProperty("items") val items: ArrayList<Items>? = arrayListOf(),
-            @JsonProperty("list") val list: ArrayList<List>? = arrayListOf(),
+        @JsonProperty("items") val items: ArrayList<Items>? = arrayListOf(),
+        @JsonProperty("list") val list: ArrayList<List>? = arrayListOf(),
     ) {
         data class Items(
-                @JsonProperty("subjectId") val subjectId: String? = null,
-                @JsonProperty("title") val title: String? = null,
-                @JsonProperty("releaseDate") val releaseDate: String? = null,
+            @JsonProperty("subjectId") val subjectId: String? = null,
+            @JsonProperty("title") val title: String? = null,
+            @JsonProperty("releaseDate") val releaseDate: String? = null,
         )
 
         data class List(
-                @JsonProperty("resourceLink") val resourceLink: String? = null,
-                @JsonProperty("extCaptions") val extCaptions: ArrayList<ExtCaptions>? = arrayListOf(),
-                @JsonProperty("se") val se: Int? = null,
-                @JsonProperty("ep") val ep: Int? = null,
-                @JsonProperty("resolution") val resolution: Int? = null,
+            @JsonProperty("resourceLink") val resourceLink: String? = null,
+            @JsonProperty("extCaptions") val extCaptions: ArrayList<ExtCaptions>? = arrayListOf(),
+            @JsonProperty("se") val se: Int? = null,
+            @JsonProperty("ep") val ep: Int? = null,
+            @JsonProperty("resolution") val resolution: Int? = null,
         ) {
             data class ExtCaptions(
-                    @JsonProperty("lanName") val lanName: String? = null,
-                    @JsonProperty("url") val url: String? = null,
+                @JsonProperty("lanName") val lanName: String? = null,
+                @JsonProperty("url") val url: String? = null,
             )
         }
     }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index bbcac45e..64e37094 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -91,6 +91,7 @@ open class SoraStream : TmdbProvider() {
         const val filmxyAPI = "https://www.filmxy.vip"
         const val kimcartoonAPI = "https://kimcartoon.li"
         const val aniwatchAPI = "https://aniwatch.to"
+        const val aniwaveAPI = "https://aniwave.to"
         const val crunchyrollAPI = "https://beta-api.crunchyroll.com"
         const val kissKhAPI = "https://kisskh.co"
         const val lingAPI = "https://ling-online.net"
@@ -185,8 +186,8 @@ open class SoraStream : TmdbProvider() {
         val type = if (request.data.contains("/movie")) "movie" else "tv"
         val home = app.get("${request.data}$adultQuery&page=$page")
             .parsedSafe<Results>()?.results?.mapNotNull { media ->
-            media.toSearchResponse(type)
-        } ?: throw ErrorLoadingException("Invalid Json reponse")
+                media.toSearchResponse(type)
+            } ?: throw ErrorLoadingException("Invalid Json reponse")
         return newHomePageResponse(request.name, home)
     }
 
@@ -205,8 +206,8 @@ open class SoraStream : TmdbProvider() {
     override suspend fun search(query: String): List<SearchResponse>? {
         return app.get("$tmdbAPI/search/multi?api_key=$apiKey&language=en-US&query=$query&page=1&include_adult=${settingsForProvider.enableAdult}")
             .parsedSafe<Results>()?.results?.mapNotNull { media ->
-            media.toSearchResponse()
-        }
+                media.toSearchResponse()
+            }
     }
 
     override suspend fun load(url: String): LoadResponse? {
@@ -257,39 +258,39 @@ open class SoraStream : TmdbProvider() {
             val episodes = res.seasons?.mapNotNull { season ->
                 app.get("$tmdbAPI/${data.type}/${data.id}/season/${season.seasonNumber}?api_key=$apiKey")
                     .parsedSafe<MediaDetailEpisodes>()?.episodes?.map { eps ->
-                    Episode(
-                        LinkData(
-                            data.id,
-                            res.external_ids?.imdb_id,
-                            res.external_ids?.tvdb_id,
-                            data.type,
-                            eps.seasonNumber,
-                            eps.episodeNumber,
-                            title = title,
-                            year = season.airDate?.split("-")?.first()?.toIntOrNull(),
-                            orgTitle = orgTitle,
-                            isAnime = isAnime,
-                            airedYear = year,
-                            lastSeason = lastSeason,
-                            epsTitle = eps.name,
-                            jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title,
-                            date = season.airDate,
-                            airedDate = res.releaseDate
-                                ?: res.firstAirDate,
-                            isAsian = isAsian,
-                            isBollywood = isBollywood,
-                            isCartoon = isCartoon
-                        ).toJson(),
-                        name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "",
-                        season = eps.seasonNumber,
-                        episode = eps.episodeNumber,
-                        posterUrl = getImageUrl(eps.stillPath),
-                        rating = eps.voteAverage?.times(10)?.roundToInt(),
-                        description = eps.overview
-                    ).apply {
-                        this.addDate(eps.airDate)
+                        Episode(
+                            LinkData(
+                                data.id,
+                                res.external_ids?.imdb_id,
+                                res.external_ids?.tvdb_id,
+                                data.type,
+                                eps.seasonNumber,
+                                eps.episodeNumber,
+                                title = title,
+                                year = season.airDate?.split("-")?.first()?.toIntOrNull(),
+                                orgTitle = orgTitle,
+                                isAnime = isAnime,
+                                airedYear = year,
+                                lastSeason = lastSeason,
+                                epsTitle = eps.name,
+                                jpTitle = res.alternative_titles?.results?.find { it.iso_3166_1 == "JP" }?.title,
+                                date = season.airDate,
+                                airedDate = res.releaseDate
+                                    ?: res.firstAirDate,
+                                isAsian = isAsian,
+                                isBollywood = isBollywood,
+                                isCartoon = isCartoon
+                            ).toJson(),
+                            name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "",
+                            season = eps.seasonNumber,
+                            episode = eps.episodeNumber,
+                            posterUrl = getImageUrl(eps.stillPath),
+                            rating = eps.voteAverage?.times(10)?.roundToInt(),
+                            description = eps.overview
+                        ).apply {
+                            this.addDate(eps.airDate)
+                        }
                     }
-                }
             }?.flatten() ?: listOf()
             newTvSeriesLoadResponse(
                 title,
@@ -584,7 +585,15 @@ open class SoraStream : TmdbProvider() {
                 if (!res.isAnime) invokeNowTv(res.id, res.imdbId, res.season, res.episode, callback)
             },
             {
-                if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, res.title, res.season, res.episode, subtitleCallback, callback)
+                if (!res.isAnime) invokeRidomovies(
+                    res.id,
+                    res.imdbId,
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
             },
             {
                 if (!res.isAnime) invokeAllMovieland(res.imdbId, res.season, res.episode, callback)
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 5ab38d6c..8bd35537 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -223,7 +223,15 @@ class SoraStreamLite : SoraStream() {
                 )
             },
             {
-                if (!res.isAnime && res.season == null) invokeRidomovies(res.id, res.imdbId, res.title, res.season, res.episode, subtitleCallback, callback)
+                if (!res.isAnime) invokeRidomovies(
+                    res.id,
+                    res.imdbId,
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
             },
             {
                 if (!res.isAnime) invokeEmovies(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 9e2ec1d1..0b5a2b6c 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -1304,6 +1304,55 @@ suspend fun request(
     return client.newCall(request).await()
 }
 
+// steal from https://github.com/aniyomiorg/aniyomi-extensions/blob/master/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/AniwaveUtils.kt
+// credits to @samfundev
+object AniwaveUtils {
+
+    fun encodeVrf(input: String): String {
+        val rc4Key = SecretKeySpec("ysJhV6U27FVIjjuk".toByteArray(), "RC4")
+        val cipher = Cipher.getInstance("RC4")
+        cipher.init(Cipher.DECRYPT_MODE, rc4Key, cipher.parameters)
+        var vrf = cipher.doFinal(input.toByteArray())
+        vrf = Base64.encode(vrf, Base64.URL_SAFE or Base64.NO_WRAP)
+        vrf = Base64.encode(vrf, Base64.DEFAULT or Base64.NO_WRAP)
+        vrf = vrfShift(vrf)
+        vrf = Base64.encode(vrf, Base64.DEFAULT)
+        vrf = rot13(vrf)
+        val stringVrf = vrf.toString(Charsets.UTF_8)
+        return encode(stringVrf)
+    }
+
+    fun decodeVrf(input: String): String {
+        var vrf = input.toByteArray()
+        vrf = Base64.decode(vrf, Base64.URL_SAFE)
+        val rc4Key = SecretKeySpec("hlPeNwkncH0fq9so".toByteArray(), "RC4")
+        val cipher = Cipher.getInstance("RC4")
+        cipher.init(Cipher.DECRYPT_MODE, rc4Key, cipher.parameters)
+        vrf = cipher.doFinal(vrf)
+        return decode(vrf.toString(Charsets.UTF_8))
+    }
+
+    private fun rot13(vrf: ByteArray): ByteArray {
+        for (i in vrf.indices) {
+            val byte = vrf[i]
+            if (byte in 'A'.code..'Z'.code) {
+                vrf[i] = ((byte - 'A'.code + 13) % 26 + 'A'.code).toByte()
+            } else if (byte in 'a'.code..'z'.code) {
+                vrf[i] = ((byte - 'a'.code + 13) % 26 + 'a'.code).toByte()
+            }
+        }
+        return vrf
+    }
+
+    private fun vrfShift(vrf: ByteArray): ByteArray {
+        for (i in vrf.indices) {
+            val shift = arrayOf(-3, 3, -4, 2, -2, 5, 4, 5)[i % 8]
+            vrf[i] = vrf[i].plus(shift).toByte()
+        }
+        return vrf
+    }
+}
+
 object DumpUtils {
 
     private val deviceId = getDeviceId()

From b92fc94c42695a4b5df4a2bb54c5857ce2a56921 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:27:43 +0700
Subject: [PATCH 064/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 64e37094..7f37edeb 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -302,7 +302,7 @@ open class SoraStream : TmdbProvider() {
                 this.backgroundPosterUrl = bgPoster
                 this.year = year
                 this.plot = res.overview
-                this.tags = keywords ?: genres
+                this.tags = keywords.takeIf { !it.isNullOrEmpty() } ?: genres
                 this.rating = rating
                 this.showStatus = getStatus(res.status)
                 this.recommendations = recommendations
@@ -339,7 +339,7 @@ open class SoraStream : TmdbProvider() {
                 this.year = year
                 this.plot = res.overview
                 this.duration = res.runtime
-                this.tags = keywords ?: genres
+                this.tags = keywords.takeIf { !it.isNullOrEmpty() } ?: genres
                 this.rating = rating
                 this.recommendations = recommendations
                 this.actors = actors

From cf98c1fce5e1e72172141d61a55fdb5a34cc357e Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Fri, 12 Jan 2024 14:50:58 +0700
Subject: [PATCH 065/125] update

---
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 7f37edeb..75171175 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -281,7 +281,7 @@ open class SoraStream : TmdbProvider() {
                                 isBollywood = isBollywood,
                                 isCartoon = isCartoon
                             ).toJson(),
-                            name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "",
+                            name = eps.name + if (isUpcoming(eps.airDate)) " • [UPCOMING]" else "",
                             season = eps.seasonNumber,
                             episode = eps.episodeNumber,
                             posterUrl = getImageUrl(eps.stillPath),

From 832656852ab3c7fc5842f06e67119ad79122c707 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 14 Jan 2024 19:17:36 +0700
Subject: [PATCH 066/125] fix NontonAnimeIDProvider

---
 NontonAnimeIDProvider/build.gradle.kts        |   2 +-
 .../com/hexated/NontonAnimeIDProvider.kt      | 103 ++++++++++--------
 Samehadaku/build.gradle.kts                   |   2 +-
 .../src/main/kotlin/com/hexated/Samehadaku.kt |  17 +--
 .../main/kotlin/com/hexated/SoraExtractor.kt  |   2 +-
 5 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/NontonAnimeIDProvider/build.gradle.kts b/NontonAnimeIDProvider/build.gradle.kts
index 03222cbe..52dfc64e 100644
--- a/NontonAnimeIDProvider/build.gradle.kts
+++ b/NontonAnimeIDProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 20
+version = 21
 
 
 cloudstream {
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
index 0f5d6418..773fa560 100644
--- a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
-import com.lagradost.cloudstream3.extractors.Hxfile
+import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
 import org.jsoup.Jsoup
@@ -13,7 +13,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 class NontonAnimeIDProvider : MainAPI() {
-    override var mainUrl = "https://nontonanimeid.mom"
+    override var mainUrl = "https://nontonanimeid.biz"
     override var name = "NontonAnimeID"
     override val hasQuickSearch = false
     override val hasMainPage = true
@@ -21,16 +21,16 @@ class NontonAnimeIDProvider : MainAPI() {
     override val hasDownloadSupport = true
 
     override val supportedTypes = setOf(
-            TvType.Anime,
-            TvType.AnimeMovie,
-            TvType.OVA
+        TvType.Anime,
+        TvType.AnimeMovie,
+        TvType.OVA
     )
 
     companion object {
         fun getType(t: String): TvType {
             return when {
-                t.contains("TV",true) -> TvType.Anime
-                t.contains("Movie",true) -> TvType.AnimeMovie
+                t.contains("TV", true) -> TvType.Anime
+                t.contains("Movie", true) -> TvType.AnimeMovie
                 else -> TvType.OVA
             }
         }
@@ -45,12 +45,12 @@ class NontonAnimeIDProvider : MainAPI() {
     }
 
     override val mainPage = mainPageOf(
-            "" to "Latest Update",
-            "ongoing-list/" to " Ongoing List",
-            "popular-series/" to "Popular Series",
+        "" to "Latest Update",
+        "ongoing-list/" to " Ongoing List",
+        "popular-series/" to "Popular Series",
     )
 
-    override suspend fun getMainPage(page: Int, request : MainPageRequest): HomePageResponse {
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         val document = app.get("$mainUrl/${request.data}").document
         val home = document.select(".animeseries").mapNotNull {
             it.toSearchResult()
@@ -78,7 +78,7 @@ class NontonAnimeIDProvider : MainAPI() {
             val title = it.selectFirst("h2")!!.text().trim()
             val poster = it.selectFirst("img")?.getImageAttr()
             val tvType = getType(
-                    it.selectFirst(".boxinfores > span.typeseries")!!.text().toString()
+                it.selectFirst(".boxinfores > span.typeseries")!!.text().toString()
             )
             val href = fixUrl(it.selectFirst("a")!!.attr("href"))
 
@@ -100,15 +100,16 @@ class NontonAnimeIDProvider : MainAPI() {
         mainUrl = getBaseUrl(req.url)
         val document = req.document
 
-        val title = document.selectFirst("h1.entry-title.cs")!!.text().removeSurrounding("Nonton Anime", "Sub Indo").trim()
+        val title = document.selectFirst("h1.entry-title.cs")!!.text()
+            .removeSurrounding("Nonton Anime", "Sub Indo").trim()
         val poster = document.selectFirst(".poster > img")?.getImageAttr()
         val tags = document.select(".tagline > a").map { it.text() }
 
         val year = Regex("\\d, (\\d*)").find(
-                document.select(".bottomtitle > span:nth-child(5)").text()
+            document.select(".bottomtitle > span:nth-child(5)").text()
         )?.groupValues?.get(1)?.toIntOrNull()
         val status = getStatus(
-                document.select("span.statusseries").text().trim()
+            document.select("span.statusseries").text().trim()
         )
         val type = getType(document.select("span.typeseries").text().trim().lowercase())
         val rating = document.select("span.nilaiseries").text().trim().toIntOrNull()
@@ -118,21 +119,21 @@ class NontonAnimeIDProvider : MainAPI() {
         val episodes = if (document.select("button.buttfilter").isNotEmpty()) {
             val id = document.select("input[name=series_id]").attr("value")
             val numEp =
-                    document.selectFirst(".latestepisode > a")?.text()?.replace(Regex("\\D"), "")
-                            .toString()
+                document.selectFirst(".latestepisode > a")?.text()?.replace(Regex("\\D"), "")
+                    .toString()
             Jsoup.parse(
-                    app.post(
-                            url = "$mainUrl/wp-admin/admin-ajax.php",
-                            data = mapOf(
-                                    "misha_number_of_results" to numEp,
-                                    "misha_order_by" to "date-DESC",
-                                    "action" to "mishafilter",
-                                    "series_id" to id
-                            )
-                    ).parsed<EpResponse>().content
+                app.post(
+                    url = "$mainUrl/wp-admin/admin-ajax.php",
+                    data = mapOf(
+                        "misha_number_of_results" to numEp,
+                        "misha_order_by" to "date-DESC",
+                        "action" to "mishafilter",
+                        "series_id" to id
+                    )
+                ).parsed<EpResponse>().content
             ).select("li").map {
                 val episode = Regex("Episode\\s?(\\d+)").find(
-                        it.selectFirst("a")?.text().toString()
+                    it.selectFirst("a")?.text().toString()
                 )?.groupValues?.getOrNull(0) ?: it.selectFirst("a")?.text()
                 val link = fixUrl(it.selectFirst("a")!!.attr("href"))
                 Episode(link, episode = episode?.toIntOrNull())
@@ -140,7 +141,7 @@ class NontonAnimeIDProvider : MainAPI() {
         } else {
             document.select("ul.misha_posts_wrap2 > li").map {
                 val episode = Regex("Episode\\s?(\\d+)").find(
-                        it.selectFirst("a")?.text().toString()
+                    it.selectFirst("a")?.text().toString()
                 )?.groupValues?.getOrNull(0) ?: it.selectFirst("a")?.text()
                 val link = it.select("a").attr("href")
                 Episode(link, episode = episode?.toIntOrNull())
@@ -157,7 +158,7 @@ class NontonAnimeIDProvider : MainAPI() {
             }
         }
 
-        val tracker = APIHolder.getTracker(listOf(title),TrackerType.getTypes(type),year,true)
+        val tracker = APIHolder.getTracker(listOf(title), TrackerType.getTypes(type), year, true)
 
         return newAnimeLoadResponse(title, url, type) {
             engName = title
@@ -178,33 +179,39 @@ class NontonAnimeIDProvider : MainAPI() {
     }
 
     override suspend fun loadLinks(
-            data: String,
-            isCasting: Boolean,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ): Boolean {
 
         val document = app.get(data).document
 
+        val nonce =
+            document.select("script#ajax_video-js-extra").attr("src").substringAfter("base64,")
+                .let {
+                    AppUtils.parseJson<Map<String, String>>(base64Decode(it).substringAfter("="))["nonce"]
+                }
+
         document.select(".container1 > ul > li:not(.boxtab)").apmap {
             val dataPost = it.attr("data-post")
             val dataNume = it.attr("data-nume")
             val dataType = it.attr("data-type")
 
             val iframe = app.post(
-                    url = "$mainUrl/wp-admin/admin-ajax.php",
-                    data = mapOf(
-                            "action" to "player_ajax",
-                            "post" to dataPost,
-                            "nume" to dataNume,
-                            "type" to dataType,
-                            "nonce" to "8c5a2e3cb2"
-                    ),
-                    referer = data,
-                    headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+                url = "$mainUrl/wp-admin/admin-ajax.php",
+                data = mapOf(
+                    "action" to "player_ajax",
+                    "post" to dataPost,
+                    "nume" to dataNume,
+                    "type" to dataType,
+                    "nonce" to "$nonce"
+                ),
+                referer = data,
+                headers = mapOf("X-Requested-With" to "XMLHttpRequest")
             ).document.selectFirst("iframe")?.attr("src")
 
-            loadExtractor(iframe ?: return@apmap , "$mainUrl/", subtitleCallback, callback)
+            loadExtractor(iframe ?: return@apmap, "$mainUrl/", subtitleCallback, callback)
         }
 
         return true
@@ -226,10 +233,10 @@ class NontonAnimeIDProvider : MainAPI() {
     }
 
     private data class EpResponse(
-            @JsonProperty("posts") val posts: String?,
-            @JsonProperty("max_page") val max_page: Int?,
-            @JsonProperty("found_posts") val found_posts: Int?,
-            @JsonProperty("content") val content: String
+        @JsonProperty("posts") val posts: String?,
+        @JsonProperty("max_page") val max_page: Int?,
+        @JsonProperty("found_posts") val found_posts: Int?,
+        @JsonProperty("content") val content: String
     )
 
 }
diff --git a/Samehadaku/build.gradle.kts b/Samehadaku/build.gradle.kts
index e816d7c9..f1f9be79 100644
--- a/Samehadaku/build.gradle.kts
+++ b/Samehadaku/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 20
+version = 21
 
 
 cloudstream {
diff --git a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
index 144f8fd6..95770cea 100644
--- a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
+++ b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
@@ -4,7 +4,6 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
-import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.loadExtractor
@@ -21,7 +20,6 @@ class Samehadaku : MainAPI() {
             TvType.AnimeMovie,
             TvType.OVA
     )
-    private val interceptor by lazy { CloudflareKiller() }
     companion object {
         const val acefile = "https://acefile.co"
 
@@ -52,7 +50,7 @@ class Samehadaku : MainAPI() {
         val items = mutableListOf<HomePageList>()
 
         if (request.name != "Episode Terbaru" && page <= 1) {
-            val doc = app.get(request.data, interceptor = interceptor).document
+            val doc = app.get(request.data).document
             doc.select("div.widget_senction:not(:contains(Baca Komik))").forEach { block ->
                 val header = block.selectFirst("div.widget-title h3")?.ownText() ?: return@forEach
                 val home = block.select("div.animepost").mapNotNull {
@@ -63,7 +61,7 @@ class Samehadaku : MainAPI() {
         }
 
         if (request.name == "Episode Terbaru") {
-            val home = app.get(request.data + page, interceptor = interceptor).document.selectFirst("div.post-show")?.select("ul li")
+            val home = app.get(request.data + page).document.selectFirst("div.post-show")?.select("ul li")
                     ?.mapNotNull {
                         it.toSearchResult()
                     } ?: throw ErrorLoadingException("No Media Found")
@@ -83,13 +81,12 @@ class Samehadaku : MainAPI() {
         return newAnimeSearchResponse(title, href ?: return null, TvType.Anime) {
             this.posterUrl = posterUrl
             addSub(epNum)
-            posterHeaders = interceptor.getCookieHeaders(mainUrl).toMap()
         }
 
     }
 
     override suspend fun search(query: String): List<SearchResponse> {
-        val document = app.get("$mainUrl/?s=$query", interceptor = interceptor).document
+        val document = app.get("$mainUrl/?s=$query").document
         return document.select("main#main div.animepost").mapNotNull {
             it.toSearchResult()
         }
@@ -99,10 +96,10 @@ class Samehadaku : MainAPI() {
         val fixUrl = if (url.contains("/anime/")) {
             url
         } else {
-            app.get(url, interceptor = interceptor).document.selectFirst("div.nvs.nvsc a")?.attr("href")
+            app.get(url).document.selectFirst("div.nvs.nvsc a")?.attr("href")
         }
 
-        val document = app.get(fixUrl ?: return null, interceptor = interceptor).document
+        val document = app.get(fixUrl ?: return null).document
         val title = document.selectFirst("h1.entry-title")?.text()?.removeBloat() ?: return null
         val poster = document.selectFirst("div.thumb > img")?.attr("src")
         val tags = document.select("div.genre-info > a").map { it.text() }
@@ -147,7 +144,6 @@ class Samehadaku : MainAPI() {
             this.recommendations = recommendations
             addMalId(tracker?.malId)
             addAniListId(tracker?.aniId?.toIntOrNull())
-            posterHeaders = interceptor.getCookieHeaders(mainUrl).toMap()
         }
 
     }
@@ -159,7 +155,7 @@ class Samehadaku : MainAPI() {
             callback: (ExtractorLink) -> Unit
     ): Boolean {
 
-        val document = app.get(data, interceptor = interceptor).document
+        val document = app.get(data).document
 
         argamap(
                 {
@@ -178,7 +174,6 @@ class Samehadaku : MainAPI() {
                                 ),
                                 referer = data,
                                 headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-                                interceptor = interceptor
                         ).document.select("iframe").attr("src")
 
                         loadFixedExtractor(fixedIframe(iframe), it.text(), "$mainUrl/", subtitleCallback, callback)
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index f848b653..cde6e82d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -126,7 +126,7 @@ object SoraExtractor : SoraStream() {
             referer = iframedoc
         ).document.selectFirst("script:containsData(Playerjs)")?.data()
         val video = script?.substringAfter("file:\"#2")?.substringBefore("\"")
-            ?.replace(Regex("(//\\S+?=)"), "")?.let { base64Decode(it) }
+            ?.replace(Regex("/.*?=?="), "")?.let { base64Decode(it) }
 
         callback.invoke(
             ExtractorLink(

From bb6ca9648943652744e85b20659bca4e84fe87fd Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Sun, 14 Jan 2024 17:48:06 +0530
Subject: [PATCH 067/125] update and refactor stuff (#516)

---
 AnimeDekhoProvider/build.gradle.kts           |  7 +--
 .../main/kotlin/com/anon/AnimeDekhoPlugin.kt  | 10 +---
 .../kotlin/com/anon/AnimeDekhoProvider.kt     | 51 +++++++------------
 Movierulzhd/build.gradle.kts                  |  2 +-
 .../src/main/kotlin/com/hexated/Animesaga.kt  |  2 -
 .../src/main/kotlin/com/hexated/Hdmovie2.kt   |  6 +--
 .../main/kotlin/com/hexated/Movierulzhd.kt    |  2 +-
 SoraStream/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/SoraStream.kt |  2 +-
 9 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/AnimeDekhoProvider/build.gradle.kts b/AnimeDekhoProvider/build.gradle.kts
index d50f2b6d..224fc347 100644
--- a/AnimeDekhoProvider/build.gradle.kts
+++ b/AnimeDekhoProvider/build.gradle.kts
@@ -1,11 +1,8 @@
-version = 1
-
+version = 2
 
 cloudstream {
     language = "hi"
-    // All of these properties are optional, you can safely remove them
-
-    description = "YOU HAVE SKIP ADS on the SITE each 24 hours, Hindi dubbed cartoons"
+    description = "SKIP ADS on the SITE every 24 hours to Play, has Hindi Dubbed Cartoons"
     authors = listOf("anon")
 
     /**
diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt
index 4e71f19a..78711060 100644
--- a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoPlugin.kt
@@ -3,19 +3,11 @@ package com.anon
 import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
 import com.lagradost.cloudstream3.plugins.Plugin
 import android.content.Context
-// import com.lagradost.cloudstream3.utils.ExtractorApi
-// import com.lagradost.cloudstream3.utils.extractorApis
 
 @CloudstreamPlugin
 class AnimeDekhoPlugin: Plugin() {
     override fun load(context: Context) {
-        // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(AnimeDekhoProvider())
         //addExtractor(MultiQualityXYZ())
     }
-
-    // private fun addExtractor(element: ExtractorApi) {
-    //     element.sourcePlugin = __filename
-    //     extractorApis.add(0, element)
-    // }
-}
+}
\ No newline at end of file
diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
index cecd5719..995329ba 100644
--- a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
@@ -28,18 +28,17 @@ import okhttp3.RequestBody.Companion.toRequestBody
 
 import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 
-
-class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of MainAPI
-    override var mainUrl = "https://animedekho.com/"
+class AnimeDekhoProvider : MainAPI() {
+    override var mainUrl = "https://animedekho.com"
     override var name = "Anime Dekho"
-
     override val hasMainPage = true
-
     override var lang = "hi"
     override val hasDownloadSupport = true
 
     override val supportedTypes = setOf(
-        TvType.TvSeries,
+        TvType.Cartoon,
+        TvType.Anime,
+        TvType.AnimeMovie,
         TvType.Movie
     )
 
@@ -53,15 +52,12 @@ class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of M
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         val link = "$mainUrl${request.data}"
         val document = app.get(link).document
-        //Log.d("TAGNAME", "$document")
         val home = document.select("article").mapNotNull {
             it.toSearchResult()
         }
         return newHomePageResponse(request.name, home)
     }
 
-
-
     private fun Element.toSearchResult(): AnimeSearchResponse? {
         //val href = fixUrl(this.selectFirst("a")?.attr("href") ?: return null)
         val href = this.selectFirst("a.lnk-blk")?.attr("href") ?: "null"
@@ -128,7 +124,6 @@ class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of M
         callback: (ExtractorLink) -> Unit
     ): Boolean {
 
-
         var vidlink = ""
 
         if(data.contains("https://vidxstream.xyz")){
@@ -142,7 +137,6 @@ class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of M
 
             var term = Regex("""\bterm-(\d+)\b""").find(name)?.value!!?.replace("term-","")
 
-
             vidlink = app.get("https://animedekho.com/?trembed=0&trid="+term)
                                 .document?.selectFirst("iframe")?.attr("src") ?: "null"
         }
@@ -151,7 +145,6 @@ class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of M
 
         val body = app.get(vidlink).text
 
-
         val master = Regex("""JScript[\w+]?\s*=\s*'([^']+)""").find(body)!!.groupValues?.get(1)
 
         val decrypt = cryptoAESHandler(master ?: return false, "4MmH9EsZrq0WEekn".toByteArray(), false)?.replace("\\", "") ?: "ERROR"
@@ -172,27 +165,17 @@ class AnimeDekhoProvider : MainAPI() { // all providers must be an instance of M
             "user-agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/116.0",
                 )
         
-        callback.invoke(
-                            ExtractorLink(
-                                source = "Toon",
-                                name = "Toon",
-                                url = vidfinal!!,
-                                referer = "https://vidxstream.xyz/",
-                                quality = Qualities.Unknown.value,
-                                isM3u8 = true,
-                                headers = headers,
-                                
-                            )
-                        )
-        
-        
-                             
-
+        callback.invoke(ExtractorLink
+            (
+            source = "Toon",
+            name = "Toon",
+            url = vidfinal!!,
+            referer = "https://vidxstream.xyz/",
+            quality = Qualities.Unknown.value,
+            isM3u8 = true,
+            headers = headers,
+            )
+        )
         return true
-
-        
     }
-
-    
-}
-
+}
\ No newline at end of file
diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index f12a9845..a53635d6 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 56
+version = 57
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt b/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt
index 524ac176..9baa9220 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt
@@ -18,6 +18,4 @@ class Animesaga : Movierulzhd() {
         "tvshows" to "TV-Shows",
         "genre/hindi-dub" to "Hindi Dub",
     )
-
-
 }
\ No newline at end of file
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
index 5ed281c4..8bad009b 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
@@ -12,14 +12,14 @@ import org.jsoup.Jsoup
 
 class Hdmovie2 : Movierulzhd() {
 
-    override var mainUrl = "https://hdmovie2.foo"
+    override var mainUrl = "https://hdmovie2.ist"
     override var name = "Hdmovie2"
     override val mainPage = mainPageOf(
         "trending" to "Trending",
         "movies" to "Movies",
-        "genre/tv-series" to "TV-Series",
+        "genre/tv-series" to "TV Shows",
         "genre/netflix" to "Netflix",
-        "genre/zee5-tv-series" to "Zee5 TV Series",
+        "genre/zee5-tv-series" to "Zee5",
     )
 
     override suspend fun loadLinks(
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
index 85624375..d2e786e2 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
@@ -11,7 +11,7 @@ import java.net.URI
 
 open class Movierulzhd : MainAPI() {
 
-    override var mainUrl = "https://movierulzhd.host"
+    override var mainUrl = "https://movierulzhd.fit"
     var directUrl = ""
     override var name = "Movierulzhd"
     override val hasMainPage = true
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index ccfdee88..cbd92fca 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 216
+version = 217
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 75171175..122fdce8 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -125,7 +125,7 @@ open class SoraStream : TmdbProvider() {
         const val gMoviesAPI = "https://gdrivemovies.xyz"
         const val hdmovies4uAPI = "https://hdmovies4u.dad"
         const val vegaMoviesAPI = "https://vegamovies.dad"
-        const val dotmoviesAPI = "https://dotmovies.bet"
+        const val dotmoviesAPI = "https://dotmovies.rsvp"
         const val tvMoviesAPI = "https://www.tvseriesnmovies.com"
         const val moviezAddAPI = "https://ww3.moviezaddiction.click"
         const val bollyMazaAPI = "https://ww3.bollymaza.click"

From e79d9922ef791947f8f8bb871dbb52ae7db94f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Faruk=20Sancak?= <keyiflerolsun@gmail.com>
Date: Sun, 14 Jan 2024 15:18:13 +0300
Subject: [PATCH 068/125] Update build.gradle.kts (#522)

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 15b04626..f0d0f5c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -78,8 +78,8 @@ subprojects {
 
         implementation(kotlin("stdlib")) // adds standard kotlin features, like listOf, mapOf etc
         implementation("com.github.Blatzar:NiceHttp:0.4.4") // http library
-        implementation("org.jsoup:jsoup:1.16.2") // html parser
-        implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
+        implementation("org.jsoup:jsoup:1.17.2") // html parser
+        implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
         implementation("io.karn:khttp-android:0.1.2")
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") // html parser
         implementation("org.mozilla:rhino:1.7.14") //run JS

From 9c2048d1ae1826ffb063b9d14f2c069dee80f639 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 14 Jan 2024 19:51:28 +0700
Subject: [PATCH 069/125] fix

---
 NontonAnimeIDProvider/build.gradle.kts                      | 2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt               | 6 ++++++
 .../src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt    | 2 +-
 .../main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt  | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/NontonAnimeIDProvider/build.gradle.kts b/NontonAnimeIDProvider/build.gradle.kts
index 52dfc64e..84af76c6 100644
--- a/NontonAnimeIDProvider/build.gradle.kts
+++ b/NontonAnimeIDProvider/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=nontonanimeid.mom&sz=%size%"
+    iconUrl = "https://www.google.com/s2/favicons?domain=nontonanimeid.org&sz=%size%"
 }
\ No newline at end of file
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt
index 348fc46c..c71d79d2 100644
--- a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/Extractors.kt
@@ -73,6 +73,12 @@ class EmbedKotakAnimeid : Hxfile() {
     override val requiresReferer = true
 }
 
+class Kotaksb : Hxfile() {
+    override val name = "Kotaksb"
+    override val mainUrl = "https://kotaksb.fun"
+    override val requiresReferer = true
+}
+
 class KotakAnimeidCom : Hxfile() {
     override val name = "KotakAnimeid"
     override val mainUrl = "https://kotakanimeid.com"
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
index 773fa560..53a745c8 100644
--- a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProvider.kt
@@ -13,7 +13,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 class NontonAnimeIDProvider : MainAPI() {
-    override var mainUrl = "https://nontonanimeid.biz"
+    override var mainUrl = "https://nontonanimeid.org"
     override var name = "NontonAnimeID"
     override val hasQuickSearch = false
     override val hasMainPage = true
diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt
index dc5d0385..27d493b3 100644
--- a/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt
+++ b/NontonAnimeIDProvider/src/main/kotlin/com/hexated/NontonAnimeIDProviderPlugin.kt
@@ -14,5 +14,6 @@ class NontonAnimeIDProviderPlugin: Plugin() {
         registerExtractorAPI(EmbedKotakAnimeid())
         registerExtractorAPI(KotakAnimeidCom())
         registerExtractorAPI(Gdplayer())
+        registerExtractorAPI(Kotaksb())
     }
 }
\ No newline at end of file

From b351a9e62d858544c7e4ec49b073ae094da52c8d Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 15 Jan 2024 13:24:24 +0700
Subject: [PATCH 070/125] added Moflix #347

---
 Moflix/build.gradle.kts                       |  26 ++
 Moflix/src/main/AndroidManifest.xml           |   2 +
 .../src/main/kotlin/com/hexated/Extractors.kt |  52 +++
 Moflix/src/main/kotlin/com/hexated/Moflix.kt  | 326 ++++++++++++++++++
 .../main/kotlin/com/hexated/MoflixPlugin.kt   |  18 +
 5 files changed, 424 insertions(+)
 create mode 100644 Moflix/build.gradle.kts
 create mode 100644 Moflix/src/main/AndroidManifest.xml
 create mode 100644 Moflix/src/main/kotlin/com/hexated/Extractors.kt
 create mode 100644 Moflix/src/main/kotlin/com/hexated/Moflix.kt
 create mode 100644 Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt

diff --git a/Moflix/build.gradle.kts b/Moflix/build.gradle.kts
new file mode 100644
index 00000000..e0197813
--- /dev/null
+++ b/Moflix/build.gradle.kts
@@ -0,0 +1,26 @@
+// use an integer for version numbers
+version = 1
+
+
+cloudstream {
+    language = "de"
+    // All of these properties are optional, you can safely remove them
+
+    // description = "Lorem Ipsum"
+    authors = listOf("Hexated")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "TvSeries",
+        "Movie",
+    )
+
+    iconUrl = "https://www.google.com/s2/favicons?domain=moflix-stream.xyz&sz=%size%"
+}
\ No newline at end of file
diff --git a/Moflix/src/main/AndroidManifest.xml b/Moflix/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..c98063f8
--- /dev/null
+++ b/Moflix/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.hexated"/>
\ No newline at end of file
diff --git a/Moflix/src/main/kotlin/com/hexated/Extractors.kt b/Moflix/src/main/kotlin/com/hexated/Extractors.kt
new file mode 100644
index 00000000..7100f24f
--- /dev/null
+++ b/Moflix/src/main/kotlin/com/hexated/Extractors.kt
@@ -0,0 +1,52 @@
+package com.hexated
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.*
+
+class MoflixLink : MoflixClick() {
+    override val name = "MoflixLink"
+    override val mainUrl = "https://moflix-stream.link"
+}
+
+class MoflixFans : MoflixClick() {
+    override val name = "MoflixFans"
+    override val mainUrl = "https://moflix-stream.fans"
+}
+
+class Highstream : MoflixClick() {
+    override val name = "Highstream"
+    override val mainUrl = "https://highstream.tv"
+}
+
+open class MoflixClick : ExtractorApi() {
+    override val name = "MoflixClick"
+    override val mainUrl = "https://moflix-stream.click"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val response = app.get(url, referer = referer)
+        val script = if (!getPacked(response.text).isNullOrEmpty()) {
+            getAndUnpack(response.text)
+        } else {
+            response.document.selectFirst("script:containsData(sources:)")?.data()
+        }
+        val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        callback.invoke(
+            ExtractorLink(
+                name,
+                name,
+                m3u8 ?: return,
+                "$mainUrl/",
+                Qualities.Unknown.value,
+                INFER_TYPE
+            )
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/Moflix/src/main/kotlin/com/hexated/Moflix.kt b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
new file mode 100644
index 00000000..4d569d08
--- /dev/null
+++ b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
@@ -0,0 +1,326 @@
+package com.hexated
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.addTMDbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import kotlin.math.roundToInt
+
+class Moflix : MainAPI() {
+    override var name = "Moflix"
+    override var mainUrl = "https://moflix-stream.xyz"
+    override var lang = "de"
+    override val hasMainPage = true
+    override val hasQuickSearch = true
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie)
+
+    companion object {
+        fun getType(isSeries: Boolean?): TvType {
+            return when (isSeries) {
+                true -> TvType.TvSeries
+                else -> TvType.Movie
+            }
+        }
+
+        fun getStatus(t: String?): ShowStatus {
+            return when (t) {
+                "ongoing" -> ShowStatus.Ongoing
+                else -> ShowStatus.Completed
+            }
+        }
+    }
+
+    override val mainPage = mainPageOf(
+        "351" to "Kürzlich hinzugefügt",
+        "345" to "Movie-Datenbank",
+        "352" to "Angesagte Serien",
+        "358" to "Kinder & Familien",
+    )
+
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+        val order = if (request.data == "345") "popularity:desc" else "channelables.order:asc"
+        val home = app.get(
+            "$mainUrl/api/v1/channel/${request.data}?returnContentOnly=true&restriction=&order=$order&paginate=simple&perPage=50&query=&page=$page",
+            referer = "$mainUrl/"
+        ).parsedSafe<Responses>()?.pagination?.data?.mapNotNull { it.toSearchResponse() }
+            ?: emptyList()
+
+        return newHomePageResponse(request.name, home)
+    }
+
+    private fun Data.toSearchResponse(): SearchResponse? {
+        return newTvSeriesSearchResponse(
+            this.name ?: return null,
+            "${this.id}",
+            TvType.TvSeries,
+            false
+        ) {
+            posterUrl = this@toSearchResponse.poster?.compress()
+        }
+    }
+
+    override suspend fun quickSearch(query: String): List<SearchResponse>? = search(query)
+
+    override suspend fun search(query: String): List<SearchResponse>? {
+        return app.get("$mainUrl/api/v1/search/$query?loader=searchPage", referer = "$mainUrl/")
+            .parsedSafe<Responses>()?.results?.mapNotNull { it.toSearchResponse() }
+    }
+
+    override suspend fun load(url: String): LoadResponse {
+        val res = app.get(
+            "$mainUrl/api/v1/titles/${url.removePrefix("$mainUrl/")}?loader=titlePage",
+            referer = "$mainUrl/"
+        )
+            .parsedSafe<Responses>()
+
+        val id = res?.title?.id
+        val title = res?.title?.name ?: ""
+        val poster = res?.title?.poster
+        val backdrop = res?.title?.backdrop
+        val tags = res?.title?.keywords?.mapNotNull { it.displayName }
+        val year = res?.title?.year
+        val isSeries = res?.title?.isSeries
+        val type = getType(isSeries)
+        val description = res?.title?.description
+        val trailers = res?.title?.videos?.filter { it.category.equals("trailer", true) }
+            ?.mapNotNull { it.src }
+        val rating = "${res?.title?.rating}".toRatingInt()
+        val actors = res?.credits?.actors?.mapNotNull {
+            ActorData(
+                Actor(it.name ?: return@mapNotNull null, it.poster),
+                roleString = it.pivot?.character
+            )
+        }
+        val recommendations = app.get("$mainUrl/api/v1/titles/$id/related", referer = "$mainUrl/")
+            .parsedSafe<Responses>()?.titles?.mapNotNull { it.toSearchResponse() }
+
+        return if (type == TvType.TvSeries) {
+            val episodes = res?.seasons?.data?.mapNotNull { season ->
+                app.get(
+                    "$mainUrl/api/v1/titles/${res.title?.id}/seasons/${season.number}?loader=seasonPage",
+                    referer = "$mainUrl/"
+                ).parsedSafe<Responses>()?.episodes?.data?.map { episode ->
+                    val status =
+                        if (episode.status.equals("upcoming", true)) " • [UPCOMING]" else ""
+                    Episode(
+                        LoadData(
+                            id,
+                            episode.seasonNumber,
+                            episode.episodeNumber,
+                            res.title?.isSeries
+                        ).toJson(),
+                        episode.name + status,
+                        episode.seasonNumber,
+                        episode.episodeNumber,
+                        episode.poster,
+                        episode.rating?.times(10)?.roundToInt(),
+                        episode.description,
+                    ).apply {
+                        this.addDate(episode.releaseDate?.substringBefore("T"))
+                    }
+                }
+            }?.flatten() ?: emptyList()
+            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
+                this.posterUrl = poster
+                this.backgroundPosterUrl = backdrop
+                this.year = year
+                this.showStatus = getStatus(res?.title?.status)
+                this.plot = description
+                this.tags = tags
+                this.rating = rating
+                this.actors = actors
+                this.recommendations = recommendations
+                addTrailer(trailers)
+                addImdbId(res?.title?.imdbId)
+                addTMDbId(res?.title?.tmdbId)
+            }
+        } else {
+            val urls = res?.title?.videos?.filter { it.category.equals("full", true) }
+
+            newMovieLoadResponse(
+                title,
+                url,
+                TvType.Movie,
+                LoadData(isSeries = isSeries, urls = urls)
+            ) {
+                this.posterUrl = poster
+                this.backgroundPosterUrl = backdrop
+                this.year = year
+                this.comingSoon = res?.title?.status.equals("upcoming", true)
+                this.plot = description
+                this.tags = tags
+                this.rating = rating
+                this.actors = actors
+                this.recommendations = recommendations
+                addTrailer(trailers)
+                addImdbId(res?.title?.imdbId)
+                addTMDbId(res?.title?.tmdbId)
+            }
+        }
+    }
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+
+        val json = parseJson<LoadData>(data)
+
+        val iframes = if (json.isSeries == true) {
+            app.get(
+                "$mainUrl/api/v1/titles/${json.id}/seasons/${json.season}/episodes/${json.episode}?loader=episodePage",
+                referer = "$mainUrl/"
+            ).parsedSafe<Episodes>()?.episode?.videos?.filter { it.category.equals("full", true) }
+        } else {
+            json.urls
+        }
+
+        iframes?.apmap { iframe ->
+            loadCustomExtractor(
+                iframe.src ?: return@apmap,
+                "$mainUrl/",
+                subtitleCallback,
+                callback,
+                iframe.quality?.filter { it.isDigit() }?.toIntOrNull()
+            )
+        }
+
+        return true
+    }
+
+    private suspend fun loadCustomExtractor(
+        url: String,
+        referer: String? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+        quality: Int? = null,
+    ) {
+        loadExtractor(url, referer, subtitleCallback) { link ->
+            if (link.quality == Qualities.Unknown.value) {
+                callback.invoke(
+                    ExtractorLink(
+                        link.source,
+                        link.name,
+                        link.url,
+                        link.referer,
+                        quality ?: link.quality,
+                        link.type,
+                        link.headers,
+                        link.extractorData
+                    )
+                )
+            }
+        }
+    }
+
+    private fun String.compress(): String {
+        return this.replace("/original/", "/w500/")
+    }
+
+    data class LoadData(
+        val id: Int? = null,
+        val season: Int? = null,
+        val episode: Int? = null,
+        val isSeries: Boolean? = null,
+        val urls: List<Videos>? = listOf(),
+    )
+
+    data class Responses(
+        @JsonProperty("pagination") val pagination: Pagination? = null,
+        @JsonProperty("title") val title: Title? = null,
+        @JsonProperty("credits") val credits: Credits? = null,
+        @JsonProperty("seasons") val seasons: Seasons? = null,
+        @JsonProperty("episodes") val episodes: Episodes? = null,
+        @JsonProperty("titles") val titles: ArrayList<Data>? = arrayListOf(),
+        @JsonProperty("results") val results: ArrayList<Data>? = arrayListOf(),
+    )
+
+    data class Seasons(
+        @JsonProperty("data") val data: ArrayList<Data>? = arrayListOf(),
+    ) {
+        data class Data(
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("number") val number: Int? = null,
+            @JsonProperty("poster") val poster: String? = null,
+            @JsonProperty("release_date") val releaseDate: String? = null,
+        )
+    }
+
+    data class Episodes(
+        @JsonProperty("data") val data: ArrayList<Data>? = arrayListOf(),
+        @JsonProperty("episode") val episode: Data? = null,
+    ) {
+        data class Data(
+            @JsonProperty("id") val id: Int? = null,
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("description") val description: String? = null,
+            @JsonProperty("season_number") val seasonNumber: Int? = null,
+            @JsonProperty("episode_number") val episodeNumber: Int? = null,
+            @JsonProperty("rating") val rating: Float? = null,
+            @JsonProperty("poster") val poster: String? = null,
+            @JsonProperty("release_date") val releaseDate: String? = null,
+            @JsonProperty("status") val status: String? = null,
+            @JsonProperty("videos") val videos: ArrayList<Videos>? = arrayListOf(),
+        )
+    }
+
+    data class Pagination(
+        @JsonProperty("data") val data: ArrayList<Data>? = arrayListOf(),
+    )
+
+    data class Data(
+        @JsonProperty("id") val id: Any? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("poster") val poster: String? = null,
+        @JsonProperty("backdrop") val backdrop: String? = null,
+    )
+
+    data class Credits(
+        @JsonProperty("actors") val actors: ArrayList<Actors>? = arrayListOf(),
+    ) {
+        data class Actors(
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("poster") val poster: String? = null,
+            @JsonProperty("pivot") val pivot: Pivot? = null,
+        ) {
+            data class Pivot(
+                @JsonProperty("character") val character: String? = null,
+            )
+        }
+    }
+
+    data class Videos(
+        @JsonProperty("category") val category: String? = null,
+        @JsonProperty("src") val src: String? = null,
+        @JsonProperty("quality") val quality: String? = null,
+    )
+
+    data class Title(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("release_date") val releaseDate: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("poster") val poster: String? = null,
+        @JsonProperty("backdrop") val backdrop: String? = null,
+        @JsonProperty("description") val description: String? = null,
+        @JsonProperty("certification") val certification: String? = null,
+        @JsonProperty("rating") val rating: Float? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("tmdb_id") val tmdbId: String? = null,
+        @JsonProperty("status") val status: String? = null,
+        @JsonProperty("is_series") val isSeries: Boolean? = null,
+        @JsonProperty("videos") val videos: ArrayList<Videos>? = arrayListOf(),
+        @JsonProperty("keywords") val keywords: ArrayList<Keywords>? = arrayListOf(),
+    ) {
+        data class Keywords(
+            @JsonProperty("display_name") val displayName: String? = null,
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt b/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt
new file mode 100644
index 00000000..7e15db0a
--- /dev/null
+++ b/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt
@@ -0,0 +1,18 @@
+
+package com.hexated
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+
+@CloudstreamPlugin
+class MoflixPlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(Moflix())
+        registerExtractorAPI(MoflixClick())
+        registerExtractorAPI(Highstream())
+        registerExtractorAPI(MoflixFans())
+        registerExtractorAPI(MoflixLink())
+    }
+}
\ No newline at end of file

From 442b79be85ad56d838177a65ece5d1d18bddd2b5 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 15 Jan 2024 14:36:56 +0700
Subject: [PATCH 071/125] fix

---
 Moflix/src/main/kotlin/com/hexated/Moflix.kt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Moflix/src/main/kotlin/com/hexated/Moflix.kt b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
index 4d569d08..385eb0aa 100644
--- a/Moflix/src/main/kotlin/com/hexated/Moflix.kt
+++ b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
@@ -74,8 +74,7 @@ class Moflix : MainAPI() {
         val res = app.get(
             "$mainUrl/api/v1/titles/${url.removePrefix("$mainUrl/")}?loader=titlePage",
             referer = "$mainUrl/"
-        )
-            .parsedSafe<Responses>()
+        ).parsedSafe<Responses>()
 
         val id = res?.title?.id
         val title = res?.title?.name ?: ""
@@ -202,7 +201,7 @@ class Moflix : MainAPI() {
         quality: Int? = null,
     ) {
         loadExtractor(url, referer, subtitleCallback) { link ->
-            if (link.quality == Qualities.Unknown.value) {
+            if (link.quality == Qualities.Unknown.value || !link.isM3u8) {
                 callback.invoke(
                     ExtractorLink(
                         link.source,

From ee89e90282abda6b24110a3d41283952e52f63b5 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 15 Jan 2024 17:25:32 +0700
Subject: [PATCH 072/125] close #347

---
 Cinemathek/build.gradle.kts                   |  26 +++
 Cinemathek/src/main/AndroidManifest.xml       |   2 +
 .../src/main/kotlin/com/hexated/Cinemathek.kt | 180 ++++++++++++++++++
 .../kotlin/com/hexated/CinemathekPlugin.kt    |  14 ++
 4 files changed, 222 insertions(+)
 create mode 100644 Cinemathek/build.gradle.kts
 create mode 100644 Cinemathek/src/main/AndroidManifest.xml
 create mode 100644 Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt
 create mode 100644 Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt

diff --git a/Cinemathek/build.gradle.kts b/Cinemathek/build.gradle.kts
new file mode 100644
index 00000000..2f904102
--- /dev/null
+++ b/Cinemathek/build.gradle.kts
@@ -0,0 +1,26 @@
+// use an integer for version numbers
+version = 1
+
+
+cloudstream {
+    language = "de"
+    // All of these properties are optional, you can safely remove them
+
+    // description = "Lorem Ipsum"
+    authors = listOf("Hexated")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "TvSeries",
+        "Movie",
+    )
+
+    iconUrl = "https://www.google.com/s2/favicons?domain=cinemathek.net&sz=%size%"
+}
\ No newline at end of file
diff --git a/Cinemathek/src/main/AndroidManifest.xml b/Cinemathek/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..c98063f8
--- /dev/null
+++ b/Cinemathek/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.hexated"/>
\ No newline at end of file
diff --git a/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt b/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt
new file mode 100644
index 00000000..cb99cb16
--- /dev/null
+++ b/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt
@@ -0,0 +1,180 @@
+package com.hexated
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
+import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.utils.*
+import org.jsoup.nodes.Element
+
+class Cinemathek : MainAPI() {
+    override var mainUrl = "https://cinemathek.net"
+    override var name = "Cinemathek"
+    override val hasMainPage = true
+    override var lang = "de"
+    override val supportedTypes = setOf(
+        TvType.Movie,
+        TvType.TvSeries,
+    )
+
+    override val mainPage = mainPageOf(
+        "filme" to "Filme",
+        "serien" to "TV Shows",
+        "episoden" to "Episodes",
+    )
+
+    override suspend fun getMainPage(
+        page: Int,
+        request: MainPageRequest
+    ): HomePageResponse {
+        val document = app.get("$mainUrl/${request.data}/page/$page/").document
+        val home =
+            document.select("div.items.full article, div#archive-content article").mapNotNull {
+                it.toSearchResult()
+            }
+        return newHomePageResponse(
+            list = HomePageList(
+                name = request.name,
+                list = home,
+                request.data == "episoden"
+            ),
+            hasNext = true
+        )
+    }
+
+    private fun getProperLink(uri: String): String {
+        return when {
+            uri.contains("/episoden/") -> {
+                uri.replace(Regex("-\\d+x\\d+"), "").replace("/episoden/", "/serien/")
+            }
+
+            else -> {
+                uri
+            }
+        }
+    }
+
+    private fun Element.toSearchResult(): SearchResponse {
+        val title = this.selectFirst("h3 > a")!!.text()
+        val href = getProperLink(this.selectFirst("h3 > a")!!.attr("href"))
+        val posterUrl = this.select("div.poster > img").attr("src").toString()
+        val quality = getQualityFromString(this.select("span.quality").text())
+        return newMovieSearchResponse(title, href, TvType.Movie) {
+            this.posterUrl = posterUrl
+            this.quality = quality
+        }
+    }
+
+    override suspend fun search(query: String): List<SearchResponse> {
+        val document = app.get("$mainUrl/search/$query").document
+        return document.select("div.result-item").map {
+            val title = it.selectFirst("div.title > a")!!.text()
+            val href = getProperLink(it.selectFirst("div.title > a")!!.attr("href"))
+            val posterUrl = it.selectFirst("img")!!.attr("src").toString()
+            newMovieSearchResponse(title, href, TvType.TvSeries) {
+                this.posterUrl = posterUrl
+            }
+        }
+    }
+
+    override suspend fun load(url: String): LoadResponse {
+        val document = app.get(url).document
+        val title = document.selectFirst("div.data > h1")?.text() ?: ""
+        val poster = document.select("div.poster > img").attr("src").toString()
+        val tags = document.select("div.sgeneros > a").map { it.text() }
+
+        val year = Regex(",\\s?(\\d+)").find(
+            document.select("span.date").text().trim()
+        )?.groupValues?.get(1).toString().toIntOrNull()
+        val tvType = if (document.select("ul#section > li:nth-child(1)").text().contains("Episodes")
+        ) TvType.TvSeries else TvType.Movie
+        val description = document.select("div.wp-content > p").text().trim()
+        val trailer = document.selectFirst("div.embed iframe")?.attr("src")
+        val rating =
+            document.selectFirst("span.dt_rating_vgs")?.text()?.toRatingInt()
+        val actors = document.select("div.persons > div[itemprop=actor]").map {
+            Actor(it.select("meta[itemprop=name]").attr("content"), it.select("img").attr("src"))
+        }
+
+        val recommendations = document.select("div.owl-item").map {
+            val recName =
+                it.selectFirst("a")!!.attr("href").toString().removeSuffix("/").split("/").last()
+            val recHref = it.selectFirst("a")!!.attr("href")
+            val recPosterUrl = it.selectFirst("img")?.attr("src").toString()
+            newTvSeriesSearchResponse(recName, recHref, TvType.TvSeries) {
+                this.posterUrl = recPosterUrl
+            }
+        }
+
+        return if (tvType == TvType.TvSeries) {
+            val episodes = document.select("ul.episodios > li").map {
+                val href = it.select("a").attr("href")
+                val name = fixTitle(it.select("div.episodiotitle > a").text().trim())
+                val image = it.select("div.imagen > img").attr("src")
+                val episode = it.select("div.numerando").text().replace(" ", "").split("-").last()
+                    .toIntOrNull()
+                val season = it.select("div.numerando").text().replace(" ", "").split("-").first()
+                    .toIntOrNull()
+                Episode(
+                    href,
+                    name,
+                    season,
+                    episode,
+                    image
+                )
+            }
+            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
+                this.posterUrl = poster
+                this.year = year
+                this.plot = description
+                this.tags = tags
+                this.rating = rating
+                addActors(actors)
+                this.recommendations = recommendations
+                addTrailer(trailer)
+            }
+        } else {
+            newMovieLoadResponse(title, url, TvType.Movie, url) {
+                this.posterUrl = poster
+                this.year = year
+                this.plot = description
+                this.tags = tags
+                this.rating = rating
+                addActors(actors)
+                this.recommendations = recommendations
+                addTrailer(trailer)
+            }
+        }
+    }
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+        val document = app.get(data).document
+        document.select("ul#playeroptionsul > li").map {
+            Triple(
+                it.attr("data-post"),
+                it.attr("data-nume"),
+                it.attr("data-type")
+            )
+        }.apmap { (id, nume, type) ->
+            val iframe = app.get(
+                url = "$mainUrl/wp-json/dooplayer/v2/$id/$type/$nume",
+                referer = data,
+                headers = mapOf("Accept" to "*/*", "X-Requested-With" to "XMLHttpRequest")
+            ).parsedSafe<ResponseHash>()?.embedUrl ?: return@apmap
+
+            if (!iframe.contains("youtube")) loadExtractor(iframe, "$mainUrl/", subtitleCallback, callback)
+        }
+
+        return true
+    }
+
+    data class ResponseHash(
+        @JsonProperty("embed_url") val embedUrl: String,
+    )
+
+}
\ No newline at end of file
diff --git a/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt b/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt
new file mode 100644
index 00000000..7e06c41a
--- /dev/null
+++ b/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt
@@ -0,0 +1,14 @@
+
+package com.hexated
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+
+@CloudstreamPlugin
+class CinemathekPlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(Cinemathek())
+    }
+}
\ No newline at end of file

From f79dc0209db2b0a6012289e6a94b02389ed86a8a Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:04:54 +0700
Subject: [PATCH 073/125] fix Nimegami

---
 .../src/main/kotlin/com/hexated/Extractors.kt | 29 +++++++++++++++++++
 .../src/main/kotlin/com/hexated/Nimegami.kt   | 25 +---------------
 .../main/kotlin/com/hexated/NimegamiPlugin.kt |  1 +
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Nimegami/src/main/kotlin/com/hexated/Extractors.kt b/Nimegami/src/main/kotlin/com/hexated/Extractors.kt
index 62a47223..3452bf15 100644
--- a/Nimegami/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/Extractors.kt
@@ -50,4 +50,33 @@ open class Mitedrive : ExtractorApi() {
         @JsonProperty("data") val data: Data? = null,
     )
 
+}
+
+open class Berkasdrive : ExtractorApi() {
+    override val name = "Berkasdrive"
+    override val mainUrl = "https://dl.berkasdrive.com"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val res = app.get(url, referer = referer).document
+        val video = res.select("video#player source").attr("src")
+
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                video,
+                "$mainUrl/",
+                Qualities.Unknown.value,
+                INFER_TYPE
+            )
+        )
+
+    }
+
 }
\ No newline at end of file
diff --git a/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt b/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
index ed1353f7..00655f71 100644
--- a/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
@@ -9,7 +9,6 @@ import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import org.jsoup.nodes.Element
 import org.jsoup.select.Elements
-import java.net.URI
 
 class Nimegami : MainAPI() {
     override var mainUrl = "https://nimegami.id"
@@ -150,7 +149,7 @@ class Nimegami : MainAPI() {
         tryParseJson<ArrayList<Sources>>(base64Decode(data))?.map { sources ->
             sources.url?.apmap { url ->
                 loadFixedExtractor(
-                    url.fixIframe(),
+                    url,
                     sources.format,
                     "$mainUrl/",
                     subtitleCallback,
@@ -185,32 +184,10 @@ class Nimegami : MainAPI() {
         }
     }
 
-    private fun getBaseUrl(url: String): String {
-        return URI(url).let {
-            "${it.scheme}://${it.host}"
-        }
-    }
-
     private fun Elements.getContent(css: String): Elements {
         return this.select("tr:contains($css) td:last-child")
     }
 
-    private fun String.fixIframe(): String {
-        val url = base64Decode(this.substringAfter("url=").substringAfter("id="))
-        return when {
-            url.contains("hxfile") -> {
-                val host = getBaseUrl(url)
-                val id = url.substringAfterLast("/")
-                "$host/embed-$id.html"
-            }
-            url.startsWith("https://mitedrive.my.id") -> url.replace(
-                "https://mitedrive.my.id",
-                "https://mitedrive.com"
-            )
-            else -> fixUrl(url)
-        }
-    }
-
     data class Sources(
         @JsonProperty("format") val format: String? = null,
         @JsonProperty("url") val url: ArrayList<String>? = arrayListOf(),
diff --git a/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt b/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt
index 8ab01378..87802ce3 100644
--- a/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt
@@ -11,5 +11,6 @@ class NimegamiPlugin: Plugin() {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(Nimegami())
         registerExtractorAPI(Mitedrive())
+        registerExtractorAPI(Berkasdrive())
     }
 }
\ No newline at end of file

From b5a2aed28b6ea15261544fdcc185eeabfaba211b Mon Sep 17 00:00:00 2001
From: Hexated <37908684+hexated@users.noreply.github.com>
Date: Mon, 15 Jan 2024 20:22:10 +0700
Subject: [PATCH 074/125] Update build.gradle.kts

---
 Nimegami/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Nimegami/build.gradle.kts b/Nimegami/build.gradle.kts
index 153e146c..02118155 100644
--- a/Nimegami/build.gradle.kts
+++ b/Nimegami/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 7
+version = 8
 
 
 cloudstream {

From 9b296953284ab6aab29b9674b3bf0d640f561d8e Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 04:50:32 +0700
Subject: [PATCH 075/125] Cinemathek: fix loadLink

---
 Cinemathek/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/Cinemathek.kt | 22 +++++++++++++++++++
 .../kotlin/com/hexated/CinemathekPlugin.kt    |  4 ++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Cinemathek/build.gradle.kts b/Cinemathek/build.gradle.kts
index 2f904102..f8a7cf30 100644
--- a/Cinemathek/build.gradle.kts
+++ b/Cinemathek/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt b/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt
index cb99cb16..82640438 100644
--- a/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt
+++ b/Cinemathek/src/main/kotlin/com/hexated/Cinemathek.kt
@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.extractors.DoodLaExtractor
+import com.lagradost.cloudstream3.extractors.Filesim
 import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
@@ -177,4 +179,24 @@ class Cinemathek : MainAPI() {
         @JsonProperty("embed_url") val embedUrl: String,
     )
 
+}
+
+class StreamwishCom : Filesim() {
+    override val name = "Streamwish"
+    override var mainUrl = "https://streamwish.com"
+}
+
+class Ds2play : DoodLaExtractor() {
+    override var name = "Ds2play"
+    override var mainUrl = "https://ds2play.com"
+}
+
+class Do0od : DoodLaExtractor() {
+    override var name = "Do0od"
+    override var mainUrl = "https://do0od.com"
+}
+
+class Filelions : Filesim() {
+    override val name = "Filelions"
+    override var mainUrl = "https://filelions.live"
 }
\ No newline at end of file
diff --git a/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt b/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt
index 7e06c41a..3c7a7699 100644
--- a/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt
+++ b/Cinemathek/src/main/kotlin/com/hexated/CinemathekPlugin.kt
@@ -10,5 +10,9 @@ class CinemathekPlugin: Plugin() {
     override fun load(context: Context) {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(Cinemathek())
+        registerExtractorAPI(StreamwishCom())
+        registerExtractorAPI(Ds2play())
+        registerExtractorAPI(Do0od())
+        registerExtractorAPI(Filelions())
     }
 }
\ No newline at end of file

From 11b4998d1d9bf7cfcec3a7fa63b07fb363af145f Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:56:30 +0700
Subject: [PATCH 076/125] fix #487, fix #530, fix #531

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 24 +++--
 .../src/main/kotlin/com/hexated/SoraStream.kt |  5 +-
 .../src/main/kotlin/com/hexated/SoraUtils.kt  | 29 +++---
 StremioX/build.gradle.kts                     | 14 ++-
 .../src/main/kotlin/com/hexated/StremioC.kt   | 89 ++++++++++---------
 .../src/main/kotlin/com/hexated/StremioX.kt   | 43 ++++-----
 .../main/kotlin/com/hexated/SubsExtractors.kt | 21 ++---
 StremioX/src/main/kotlin/com/hexated/Utils.kt | 51 +++++------
 9 files changed, 137 insertions(+), 141 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index cbd92fca..12d64480 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 217
+version = 218
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index cde6e82d..9823c0c2 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1275,7 +1275,7 @@ object SoraExtractor : SoraStream() {
             val selector =
                 if (season == null) "p a:contains(V-Cloud)" else "h4:matches(0?$episode) + p a:contains(V-Cloud)"
             val server = app.get(
-                href ?: return@apmap, interceptor = wpredisInterceptor
+                href ?: return@apmap, interceptor = wpRedisInterceptor
             ).document.selectFirst("div.entry-content > $selector")
                 ?.attr("href") ?: return@apmap
 
@@ -1717,13 +1717,13 @@ object SoraExtractor : SoraStream() {
             "$url&apikey=whXgvN4kVyoubGwqXpw26Oy3PVryl8dm",
             referer = "https://watcha.movie/"
         ).text
-        val link = Regex("\"file\":\"(http.*?)\"").find(res)?.groupValues?.getOrNull(1) ?: return
+        val link = Regex("\"file\":\"(http.*?)\"").find(res)?.groupValues?.getOrNull(1)
 
         callback.invoke(
             ExtractorLink(
                 "RStream",
                 "RStream",
-                link,
+                link ?: return,
                 "$rStreamAPI/",
                 Qualities.P1080.value,
                 INFER_TYPE
@@ -2053,7 +2053,7 @@ object SoraExtractor : SoraStream() {
             "$dahmerMoviesAPI/tvs/${title?.replace(":", " -")}/Season $season/"
         }
 
-        val request = app.get(url, timeout = 120L)
+        val request = app.get(url, interceptor = TimeOutInterceptor())
         if (!request.isSuccessful) return
         val paths = request.document.select("a").map {
             it.text() to it.attr("href")
@@ -2382,12 +2382,18 @@ object SoraExtractor : SoraStream() {
         callback: (ExtractorLink) -> Unit,
         referer: String = "https://bflix.gs/"
     ) {
+        suspend fun String.isSuccess() : Boolean {
+            return app.get(this, referer = referer).isSuccessful
+        }
         val slug = getEpisodeSlug(season, episode)
-        var url =
-            if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
-        if (!app.get(url, referer = referer).isSuccessful) {
-            url =
-                if (season == null) "$nowTvAPI/$imdbId.mp4" else "$nowTvAPI/tv/$imdbId/s${season}e${slug.second}.mp4"
+        var url = if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
+        if (!url.isSuccess()) {
+            url = if (season == null) {
+                val temp = "$nowTvAPI/$imdbId.mp4"
+                if (temp.isSuccess()) temp else "$nowTvAPI/$tmdbId-1.mp4"
+            } else {
+                "$nowTvAPI/tv/$imdbId/s${season}e${slug.second}.mp4"
+            }
             if (!app.get(url, referer = referer).isSuccessful) return
         }
         callback.invoke(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 122fdce8..9fdb1441 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -68,7 +68,7 @@ open class SoraStream : TmdbProvider() {
         TvType.Anime,
     )
 
-    val wpredisInterceptor by lazy { CloudflareKiller() }
+    val wpRedisInterceptor by lazy { CloudflareKiller() }
     val multiInterceptor by lazy { CloudflareKiller() }
 
     /** AUTHOR : Hexated & Sora */
@@ -250,8 +250,7 @@ open class SoraStream : TmdbProvider() {
         val recommendations =
             res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() }
 
-        val trailer =
-            res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" }?.randomOrNull()
+        val trailer = res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" }
 
         return if (type == TvType.TvSeries) {
             val lastSeason = res.last_episode_to_air?.season_number
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 0b5a2b6c..e85277a1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -23,6 +23,7 @@ import com.lagradost.nicehttp.requestCreator
 import kotlinx.coroutines.delay
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -1285,23 +1286,17 @@ private enum class Symbol(val decimalValue: Int) {
     }
 }
 
-suspend fun request(
-    url: String,
-    allowRedirects: Boolean = true,
-    timeout: Long = 60L
-): Response {
-    val client = OkHttpClient().newBuilder()
-        .connectTimeout(timeout, TimeUnit.SECONDS)
-        .readTimeout(timeout, TimeUnit.SECONDS)
-        .writeTimeout(timeout, TimeUnit.SECONDS)
-        .followRedirects(allowRedirects)
-        .followSslRedirects(allowRedirects)
-        .build()
-
-    val request: Request = Request.Builder()
-        .url(url)
-        .build()
-    return client.newCall(request).await()
+class TimeOutInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val call = chain
+            .withConnectTimeout(60, TimeUnit.SECONDS)
+            .withReadTimeout(60, TimeUnit.SECONDS)
+            .withWriteTimeout(60, TimeUnit.SECONDS)
+            .request()
+            .newBuilder()
+            .build()
+        return chain.proceed(call)
+    }
 }
 
 // steal from https://github.com/aniyomiorg/aniyomi-extensions/blob/master/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/AniwaveUtils.kt
diff --git a/StremioX/build.gradle.kts b/StremioX/build.gradle.kts
index c08ea2b1..6c7bb75e 100644
--- a/StremioX/build.gradle.kts
+++ b/StremioX/build.gradle.kts
@@ -1,6 +1,16 @@
-// use an integer for version numbers
-version = 12
+import org.jetbrains.kotlin.konan.properties.Properties
 
+// use an integer for version numbers
+version = 13
+
+android {
+    defaultConfig {
+        val properties = Properties()
+        properties.load(project.rootProject.file("local.properties").inputStream())
+
+        buildConfigField("String", "TMDB_API", "\"${properties.getProperty("TMDB_API")}\"")
+    }
+}
 
 cloudstream {
     language = "en"
diff --git a/StremioX/src/main/kotlin/com/hexated/StremioC.kt b/StremioX/src/main/kotlin/com/hexated/StremioC.kt
index 4d972d31..b6137816 100644
--- a/StremioX/src/main/kotlin/com/hexated/StremioC.kt
+++ b/StremioX/src/main/kotlin/com/hexated/StremioC.kt
@@ -10,24 +10,23 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import java.net.URI
-
-private const val TRACKER_LIST_URL =
-    "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt"
 
 class StremioC : MainAPI() {
     override var mainUrl = "https://stremio.github.io/stremio-static-addon-example"
     override var name = "StremioC"
     override val supportedTypes = setOf(TvType.Others)
     override val hasMainPage = true
-    private val cinemataUrl = "https://v3-cinemeta.strem.io"
 
-    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse? {
+    companion object {
+        private const val cinemataUrl = "https://v3-cinemeta.strem.io"
+        private const val TRACKER_LIST_URL = "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt"
+    }
+
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
         mainUrl = mainUrl.fixSourceUrl()
-        val res = tryParseJson<Manifest>(request("${mainUrl}/manifest.json").body.string()) ?: return null
+        val res = app.get("${mainUrl}/manifest.json").parsedSafe<Manifest>()
         val lists = mutableListOf<HomePageList>()
-        res.catalogs.apmap { catalog ->
+        res?.catalogs?.apmap { catalog ->
             catalog.toHomePageList(this).let {
                 if (it.list.isNotEmpty()) lists.add(it)
             }
@@ -38,11 +37,11 @@ class StremioC : MainAPI() {
         )
     }
 
-    override suspend fun search(query: String): List<SearchResponse>? {
+    override suspend fun search(query: String): List<SearchResponse> {
         mainUrl = mainUrl.fixSourceUrl()
-        val res = tryParseJson<Manifest>(request("${mainUrl}/manifest.json").body.string()) ?: return null
+        val res = app.get("${mainUrl}/manifest.json").parsedSafe<Manifest>()
         val list = mutableListOf<SearchResponse>()
-        res.catalogs.apmap { catalog ->
+        res?.catalogs?.apmap { catalog ->
             list.addAll(catalog.search(query, this))
         }
         return list.distinct()
@@ -64,10 +63,13 @@ class StremioC : MainAPI() {
         callback: (ExtractorLink) -> Unit
     ): Boolean {
         val loadData = parseJson<LoadData>(data)
-        val request = request("${mainUrl}/stream/${loadData.type}/${loadData.id}.json")
-        if (request.code.isSuccessful()) {
-            val res = tryParseJson<StreamsResponse>(request.body.string()) ?: return false
-            res.streams.forEach { stream ->
+        val request = app.get(
+            "${mainUrl}/stream/${loadData.type}/${loadData.id}.json",
+            interceptor = interceptor
+        )
+        if (request.isSuccessful) {
+            val res = request.parsedSafe<StreamsResponse>()
+            res?.streams?.forEach { stream ->
                 stream.runCallback(subtitleCallback, callback)
             }
         } else {
@@ -103,15 +105,14 @@ class StremioC : MainAPI() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val sites =
-            AcraApplication.getKey<Array<CustomSite>>(USER_PROVIDER_API)?.toMutableList()
-                ?: mutableListOf()
+        val sites = AcraApplication.getKey<Array<CustomSite>>(USER_PROVIDER_API)?.toMutableList()
+            ?: mutableListOf()
         sites.filter { it.parentJavaClass == "StremioX" }.apmap { site ->
-            val request = request("${site.url.fixSourceUrl()}/stream/${type}/${id}.json").body.string()
-            val res =
-                tryParseJson<StreamsResponse>(request)
-                    ?: return@apmap
-            res.streams.forEach { stream ->
+            val res = app.get(
+                "${site.url.fixSourceUrl()}/stream/${type}/${id}.json",
+                interceptor = interceptor
+            ).parsedSafe<StreamsResponse>()
+            res?.streams?.forEach { stream ->
                 stream.runCallback(subtitleCallback, callback)
             }
         }
@@ -151,11 +152,11 @@ class StremioC : MainAPI() {
         suspend fun search(query: String, provider: StremioC): List<SearchResponse> {
             val entries = mutableListOf<SearchResponse>()
             types.forEach { type ->
-                val json = request("${provider.mainUrl}/catalog/${type}/${id}/search=${query}.json").body.string()
-                val res =
-                    tryParseJson<CatalogResponse>(json)
-                        ?: return@forEach
-                res.metas?.forEach { entry ->
+                val res = app.get(
+                    "${provider.mainUrl}/catalog/${type}/${id}/search=${query}.json",
+                    interceptor = interceptor
+                ).parsedSafe<CatalogResponse>()
+                res?.metas?.forEach { entry ->
                     entries.add(entry.toSearchResponse(provider))
                 }
             }
@@ -165,11 +166,11 @@ class StremioC : MainAPI() {
         suspend fun toHomePageList(provider: StremioC): HomePageList {
             val entries = mutableListOf<SearchResponse>()
             types.forEach { type ->
-                val json = request("${provider.mainUrl}/catalog/${type}/${id}.json").body.string()
-                val res =
-                    tryParseJson<CatalogResponse>(json)
-                        ?: return@forEach
-                res.metas?.forEach { entry ->
+                val res = app.get(
+                    "${provider.mainUrl}/catalog/${type}/${id}.json",
+                    interceptor = interceptor
+                ).parsedSafe<CatalogResponse>()
+                res?.metas?.forEach { entry ->
                     entries.add(entry.toSearchResponse(provider))
                 }
             }
@@ -186,6 +187,7 @@ class StremioC : MainAPI() {
         val source: String?,
         val type: String?
     )
+
     private data class CatalogEntry(
         @JsonProperty("name") val name: String,
         @JsonProperty("id") val id: String,
@@ -226,7 +228,7 @@ class StremioC : MainAPI() {
                     year = yearNum?.toIntOrNull()
                     tags = genre ?: genres
                     addActors(cast)
-                    addTrailer(trailersSources?.map { "https://www.youtube.com/watch?v=${it.source}" }?.randomOrNull())
+                    addTrailer(trailersSources?.map { "https://www.youtube.com/watch?v=${it.source}" })
                     addImdbId(imdbId)
                 }
             } else {
@@ -245,7 +247,8 @@ class StremioC : MainAPI() {
                     year = yearNum?.toIntOrNull()
                     tags = genre ?: genres
                     addActors(cast)
-                    addTrailer(trailersSources?.map { "https://www.youtube.com/watch?v=${it.source}" }?.randomOrNull())
+                    addTrailer(trailersSources?.map { "https://www.youtube.com/watch?v=${it.source}" }
+                        ?.randomOrNull())
                     addImdbId(imdbId)
                 }
             }
@@ -285,13 +288,14 @@ class StremioC : MainAPI() {
     )
 
     private data class ProxyHeaders(
-        val request: Map<String,String>?,
+        val request: Map<String, String>?,
     )
 
     private data class BehaviorHints(
         val proxyHeaders: ProxyHeaders?,
-        val headers: Map<String,String>?,
+        val headers: Map<String, String>?,
     )
+
     private data class Stream(
         val name: String?,
         val title: String?,
@@ -312,12 +316,13 @@ class StremioC : MainAPI() {
                 callback.invoke(
                     ExtractorLink(
                         name ?: "",
-                        fixRDSourceName(name, title),
+                        fixSourceName(name, title),
                         url,
                         "",
-                        getQualityFromName(description),
-                        headers = behaviorHints?.proxyHeaders?.request ?: behaviorHints?.headers ?: mapOf(),
-                        isM3u8 = URI(url).path.endsWith(".m3u8")
+                        getQuality(listOf(description,title,name)),
+                        headers = behaviorHints?.proxyHeaders?.request ?: behaviorHints?.headers
+                        ?: mapOf(),
+                        type = INFER_TYPE
                     )
                 )
                 subtitles.map { sub ->
diff --git a/StremioX/src/main/kotlin/com/hexated/StremioX.kt b/StremioX/src/main/kotlin/com/hexated/StremioX.kt
index 314e124f..995479fa 100644
--- a/StremioX/src/main/kotlin/com/hexated/StremioX.kt
+++ b/StremioX/src/main/kotlin/com/hexated/StremioX.kt
@@ -10,26 +10,21 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import java.net.URI
 import java.util.ArrayList
 import kotlin.math.roundToInt
 import com.lagradost.cloudstream3.metaproviders.TmdbProvider
 
-open class StremioX : TmdbProvider() {
+class StremioX : TmdbProvider() {
     override var mainUrl = "https://torrentio.strem.fun"
     override var name = "StremioX"
     override val hasMainPage = true
     override val hasQuickSearch = true
-    override val supportedTypes = setOf(
-        TvType.Others,
-    )
+    override val supportedTypes = setOf(TvType.Others)
 
     companion object {
-        const val TRACKER_LIST_URL =
-            "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt"
+        const val TRACKER_LIST_URL = "https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_best.txt"
         private const val tmdbAPI = "https://api.themoviedb.org/3"
-        private val apiKey =
-            base64DecodeAPI("ZTM=NTg=MjM=MjM=ODc=MzI=OGQ=MmE=Nzk=Nzk=ZjI=NTA=NDY=NDA=MzA=YjA=") // PLEASE DON'T STEAL
+        private const val apiKey = BuildConfig.TMDB_API
 
         fun getType(t: String?): TvType {
             return when (t) {
@@ -44,11 +39,6 @@ open class StremioX : TmdbProvider() {
                 else -> ShowStatus.Completed
             }
         }
-
-        private fun base64DecodeAPI(api: String): String {
-            return api.chunked(4).map { base64Decode(it) }.reversed().joinToString("")
-        }
-
     }
 
     override val mainPage = mainPageOf(
@@ -159,7 +149,7 @@ open class StremioX : TmdbProvider() {
                                 eps.seasonNumber,
                                 eps.episodeNumber
                             ).toJson(),
-                            name = eps.name + if (isUpcoming(eps.airDate)) " - [UPCOMING]" else "",
+                            name = eps.name + if (isUpcoming(eps.airDate)) " • [UPCOMING]" else "",
                             season = eps.seasonNumber,
                             episode = eps.episodeNumber,
                             posterUrl = getImageUrl(eps.stillPath),
@@ -177,7 +167,7 @@ open class StremioX : TmdbProvider() {
                 this.backgroundPosterUrl = bgPoster
                 this.year = year
                 this.plot = res.overview
-                this.tags = if (isAnime) keywords else genres
+                this.tags =  keywords.takeIf { !it.isNullOrEmpty() } ?: genres
                 this.rating = rating
                 this.showStatus = getStatus(res.status)
                 this.recommendations = recommendations
@@ -200,7 +190,7 @@ open class StremioX : TmdbProvider() {
                 this.year = year
                 this.plot = res.overview
                 this.duration = res.runtime
-                this.tags = if (isAnime) keywords else genres
+                this.tags = keywords.takeIf { !it.isNullOrEmpty() } ?: genres
                 this.rating = rating
                 this.recommendations = recommendations
                 this.actors = actors
@@ -243,13 +233,13 @@ open class StremioX : TmdbProvider() {
         callback: (ExtractorLink) -> Unit
     ) {
         val fixMainUrl = mainUrl.fixSourceUrl()
-        val url = if(season == null) {
+        val url = if (season == null) {
             "$fixMainUrl/stream/movie/$imdbId.json"
         } else {
             "$fixMainUrl/stream/series/$imdbId:$season:$episode.json"
         }
-        val res = AppUtils.tryParseJson<StreamsResponse>(request(url).body.string()) ?: return
-        res.streams.forEach { stream ->
+        val res = app.get(url, interceptor = interceptor).parsedSafe<StreamsResponse>()
+        res?.streams?.forEach { stream ->
             stream.runCallback(subtitleCallback, callback)
         }
     }
@@ -262,12 +252,12 @@ open class StremioX : TmdbProvider() {
     )
 
     private data class ProxyHeaders(
-        val request: Map<String,String>?,
+        val request: Map<String, String>?,
     )
 
     private data class BehaviorHints(
         val proxyHeaders: ProxyHeaders?,
-        val headers: Map<String,String>?,
+        val headers: Map<String, String>?,
     )
 
     private data class Stream(
@@ -290,12 +280,13 @@ open class StremioX : TmdbProvider() {
                 callback.invoke(
                     ExtractorLink(
                         name ?: "",
-                        fixRDSourceName(name, title),
+                        fixSourceName(name, title),
                         url,
                         "",
-                        getQualityFromName(description),
-                        headers = behaviorHints?.proxyHeaders?.request ?: behaviorHints?.headers ?: mapOf(),
-                        isM3u8 = URI(url).path.endsWith(".m3u8")
+                        getQuality(listOf(description,title,name)),
+                        headers = behaviorHints?.proxyHeaders?.request ?: behaviorHints?.headers
+                        ?: mapOf(),
+                        type = INFER_TYPE
                     )
                 )
                 subtitles.map { sub ->
diff --git a/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt b/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
index 367114bd..57e8b9ae 100644
--- a/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
+++ b/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
@@ -3,10 +3,9 @@ package com.hexated
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.base64Encode
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 
-const val openSubAPI = "https://opensubtitles.strem.io/stremio/v1"
+const val openSubAPI = "https://opensubtitles-v3.strem.io"
 const val watchSomuchAPI = "https://watchsomuch.tv"
 
 object SubsExtractors {
@@ -16,22 +15,20 @@ object SubsExtractors {
         episode: Int? = null,
         subtitleCallback: (SubtitleFile) -> Unit,
     ) {
-        val id = if(season == null) {
-            imdbId
+        val slug = if(season == null) {
+            "movie/$imdbId"
         } else {
-            "$imdbId $season $episode"
+            "series/$imdbId:$season:$episode"
         }
-        val data = base64Encode("""{"id":1,"jsonrpc":"2.0","method":"subtitles.find","params":[null,{"query":{"itemHash":"$id"}}]}""".toByteArray())
-        app.get("${openSubAPI}/q.json?b=$data").parsedSafe<OsResult>()?.result?.all?.map { sub ->
+        app.get("${openSubAPI}/subtitles/$slug.json").parsedSafe<OsResult>()?.subtitles?.map { sub ->
             subtitleCallback.invoke(
                 SubtitleFile(
                     SubtitleHelper.fromThreeLettersToLanguage(sub.lang ?: "") ?: sub.lang
-                    ?: "",
+                    ?: return@map,
                     sub.url ?: return@map
                 )
             )
         }
-
     }
 
     suspend fun invokeWatchsomuch(
@@ -81,12 +78,8 @@ object SubsExtractors {
         @JsonProperty("lang") val lang: String? = null,
     )
 
-    data class OsAll(
-        @JsonProperty("all") val all: ArrayList<OsSubtitles>? = arrayListOf(),
-    )
-
     data class OsResult(
-        @JsonProperty("result") val result: OsAll? = null,
+        @JsonProperty("subtitles") val subtitles: ArrayList<OsSubtitles>? = arrayListOf(),
     )
 
     data class WatchsomuchTorrents(
diff --git a/StremioX/src/main/kotlin/com/hexated/Utils.kt b/StremioX/src/main/kotlin/com/hexated/Utils.kt
index 30b676de..6640cbc4 100644
--- a/StremioX/src/main/kotlin/com/hexated/Utils.kt
+++ b/StremioX/src/main/kotlin/com/hexated/Utils.kt
@@ -1,53 +1,50 @@
 package com.hexated
 
-import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.nicehttp.Requests.Companion.await
-import okhttp3.OkHttpClient
-import okhttp3.Request
+import com.lagradost.cloudstream3.utils.getQualityFromName
+import okhttp3.Interceptor
 import okhttp3.Response
 import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 
-const val defaultTimeOut = 30L
-suspend fun request(
-    url: String,
-    allowRedirects: Boolean = true,
-    timeout: Long = defaultTimeOut
-): Response {
-    val client = OkHttpClient().newBuilder()
-        .connectTimeout(timeout, TimeUnit.SECONDS)
-        .readTimeout(timeout, TimeUnit.SECONDS)
-        .writeTimeout(timeout, TimeUnit.SECONDS)
-        .followRedirects(allowRedirects)
-        .followSslRedirects(allowRedirects)
-        .build()
+val interceptor = TimeOutInterceptor()
 
-    val request: Request = Request.Builder()
-        .url(url)
-        .build()
-    return client.newCall(request).await()
-}
-
-fun Int.isSuccessful() : Boolean {
-    return this in 200..299
+class TimeOutInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val call = chain
+            .withConnectTimeout(60, TimeUnit.SECONDS)
+            .withReadTimeout(60, TimeUnit.SECONDS)
+            .withWriteTimeout(60, TimeUnit.SECONDS)
+            .request()
+            .newBuilder()
+            .build()
+        return chain.proceed(call)
+    }
 }
 
 fun String.fixSourceUrl(): String {
     return this.replace("/manifest.json", "").replace("stremio://", "https://")
 }
 
-fun fixRDSourceName(name: String?, title: String?): String {
+fun fixSourceName(name: String?, title: String?): String {
     return when {
         name?.contains("[RD+]", true) == true -> "[RD+] $title"
-        name?.contains("[RD download]", true) == true -> "[RD] $title"
+        name?.contains("[RD download]", true) == true -> "[RD download] $title"
         !name.isNullOrEmpty() && !title.isNullOrEmpty() -> "$name $title"
         else -> title ?: name ?: ""
     }
 }
 
+fun getQuality(qualities: List<String?>): Int {
+    fun String.getQuality(): String? {
+        return Regex("(\\d{3,4}[pP])").find(this)?.groupValues?.getOrNull(1)
+    }
+    val quality = qualities.firstNotNullOfOrNull { it?.getQuality() }
+    return getQualityFromName(quality)
+}
+
 fun getEpisodeSlug(
     season: Int? = null,
     episode: Int? = null,

From aaf7413dfe214eb628f02185640b59671f720a19 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 16:11:30 +0700
Subject: [PATCH 077/125] fix

---
 StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt b/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
index 57e8b9ae..122a7225 100644
--- a/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
+++ b/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
@@ -20,7 +20,7 @@ object SubsExtractors {
         } else {
             "series/$imdbId:$season:$episode"
         }
-        app.get("${openSubAPI}/subtitles/$slug.json").parsedSafe<OsResult>()?.subtitles?.map { sub ->
+        app.get("${openSubAPI}/subtitles/$slug.json", interceptor = interceptor).parsedSafe<OsResult>()?.subtitles?.map { sub ->
             subtitleCallback.invoke(
                 SubtitleFile(
                     SubtitleHelper.fromThreeLettersToLanguage(sub.lang ?: "") ?: sub.lang

From 7253111d3e11eef825e7efa55d3a87b0e2ee8aaa Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 17:04:44 +0700
Subject: [PATCH 078/125] Moflix: update detail page

---
 Moflix/build.gradle.kts                      |  2 +-
 Moflix/src/main/kotlin/com/hexated/Moflix.kt | 22 +++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Moflix/build.gradle.kts b/Moflix/build.gradle.kts
index e0197813..cc650970 100644
--- a/Moflix/build.gradle.kts
+++ b/Moflix/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/Moflix/src/main/kotlin/com/hexated/Moflix.kt b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
index 385eb0aa..247950d3 100644
--- a/Moflix/src/main/kotlin/com/hexated/Moflix.kt
+++ b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
@@ -8,6 +8,7 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import org.jsoup.Jsoup
 import kotlin.math.roundToInt
 
 class Moflix : MainAPI() {
@@ -72,10 +73,11 @@ class Moflix : MainAPI() {
 
     override suspend fun load(url: String): LoadResponse {
         val res = app.get(
-            "$mainUrl/api/v1/titles/${url.removePrefix("$mainUrl/")}?loader=titlePage",
+            "$mainUrl/api/v1/titles/${url.fixId()}?loader=titlePage",
             referer = "$mainUrl/"
         ).parsedSafe<Responses>()
 
+        val uri = Jsoup.parse(res?.seo.toString()).selectFirst("link[rel=canonical]")?.attr("href")
         val id = res?.title?.id
         val title = res?.title?.name ?: ""
         val poster = res?.title?.poster
@@ -83,6 +85,8 @@ class Moflix : MainAPI() {
         val tags = res?.title?.keywords?.mapNotNull { it.displayName }
         val year = res?.title?.year
         val isSeries = res?.title?.isSeries
+        val certification = res?.title?.certification
+        val duration = res?.title?.runtime
         val type = getType(isSeries)
         val description = res?.title?.description
         val trailers = res?.title?.videos?.filter { it.category.equals("trailer", true) }
@@ -123,7 +127,7 @@ class Moflix : MainAPI() {
                     }
                 }
             }?.flatten() ?: emptyList()
-            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
+            newTvSeriesLoadResponse(title, uri ?: url, TvType.TvSeries, episodes) {
                 this.posterUrl = poster
                 this.backgroundPosterUrl = backdrop
                 this.year = year
@@ -132,7 +136,9 @@ class Moflix : MainAPI() {
                 this.tags = tags
                 this.rating = rating
                 this.actors = actors
+                this.duration = duration
                 this.recommendations = recommendations
+                this.contentRating = certification
                 addTrailer(trailers)
                 addImdbId(res?.title?.imdbId)
                 addTMDbId(res?.title?.tmdbId)
@@ -142,7 +148,7 @@ class Moflix : MainAPI() {
 
             newMovieLoadResponse(
                 title,
-                url,
+                uri ?: url,
                 TvType.Movie,
                 LoadData(isSeries = isSeries, urls = urls)
             ) {
@@ -154,7 +160,9 @@ class Moflix : MainAPI() {
                 this.tags = tags
                 this.rating = rating
                 this.actors = actors
+                this.duration = duration
                 this.recommendations = recommendations
+                this.contentRating = certification
                 addTrailer(trailers)
                 addImdbId(res?.title?.imdbId)
                 addTMDbId(res?.title?.tmdbId)
@@ -193,6 +201,12 @@ class Moflix : MainAPI() {
         return true
     }
 
+    private fun String.fixId(): String {
+        val chunk = "/titles/"
+        return if (this.contains(chunk)) this.substringAfter(chunk)
+            .substringBefore("/") else this.substringAfterLast("/")
+    }
+
     private suspend fun loadCustomExtractor(
         url: String,
         referer: String? = null,
@@ -233,6 +247,7 @@ class Moflix : MainAPI() {
     data class Responses(
         @JsonProperty("pagination") val pagination: Pagination? = null,
         @JsonProperty("title") val title: Title? = null,
+        @JsonProperty("seo") val seo: String? = null,
         @JsonProperty("credits") val credits: Credits? = null,
         @JsonProperty("seasons") val seasons: Seasons? = null,
         @JsonProperty("episodes") val episodes: Episodes? = null,
@@ -305,6 +320,7 @@ class Moflix : MainAPI() {
         @JsonProperty("name") val name: String? = null,
         @JsonProperty("release_date") val releaseDate: String? = null,
         @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
         @JsonProperty("poster") val poster: String? = null,
         @JsonProperty("backdrop") val backdrop: String? = null,
         @JsonProperty("description") val description: String? = null,

From 740c47223a2820ba4c7d4ed4666090bd6df97b99 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:05:49 +0700
Subject: [PATCH 079/125] Nimegami: fix search

---
 Nimegami/build.gradle.kts                        |  2 +-
 Nimegami/src/main/kotlin/com/hexated/Nimegami.kt | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Nimegami/build.gradle.kts b/Nimegami/build.gradle.kts
index 02118155..9febe32e 100644
--- a/Nimegami/build.gradle.kts
+++ b/Nimegami/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 8
+version = 9
 
 
 cloudstream {
diff --git a/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt b/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
index 00655f71..88b16a36 100644
--- a/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
@@ -76,14 +76,18 @@ class Nimegami : MainAPI() {
             this.posterUrl = posterUrl
             addSub(episode)
         }
-
     }
 
     override suspend fun search(query: String): List<SearchResponse> {
-        return app.get("$mainUrl/?s=$query&post_type=post").document.select("div.archive article")
-            .mapNotNull {
-                it.toSearchResult()
-            }
+        val searchResponse = mutableListOf<SearchResponse>()
+        for (i in 1..2) {
+            val res = app.get("$mainUrl/page/$i/?s=gintama&post_type=post").document.select("div.archive article")
+                .mapNotNull {
+                    it.toSearchResult()
+                }
+            searchResponse.addAll(res)
+        }
+        return searchResponse
     }
 
     override suspend fun load(url: String): LoadResponse {

From 1a341e6cf1bf41f05fce70c5b97ac4a5976ad9c1 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 21:07:26 +0700
Subject: [PATCH 080/125] fix #532

---
 Movierulzhd/build.gradle.kts                         | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index a53635d6..d664810f 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 57
+version = 58
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt b/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt
index 9baa9220..11dd68d3 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Animesaga.kt
@@ -5,7 +5,7 @@ import com.lagradost.cloudstream3.mainPageOf
 
 class Animesaga : Movierulzhd() {
 
-    override var mainUrl = "https://www.animesaga.in"
+    override var mainUrl = "https://anplay.in"
     override var name = "Animesaga"
     override val supportedTypes = setOf(
         TvType.Anime,

From 0465f91c71b4e64c24968872a265deac9301f6f1 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 17 Jan 2024 04:20:08 +0700
Subject: [PATCH 081/125] move superstream

---
 .github/workflows/build.yml                   |   8 +
 .../main/kotlin/com/hexated/SoraExtractor.kt  |   4 +-
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |  13 -
 .../src/main/kotlin/com/hexated/StremioC.kt   |   8 +-
 .../src/main/kotlin/com/hexated/StremioX.kt   |   2 +-
 .../main/kotlin/com/hexated/SubsExtractors.kt |   4 +-
 StremioX/src/main/kotlin/com/hexated/Utils.kt |  15 -
 Superstream/build.gradle.kts                  |  42 +
 Superstream/src/main/AndroidManifest.xml      |   2 +
 .../src/main/kotlin/com/hexated/Extractors.kt | 242 ++++++
 .../main/kotlin/com/hexated/Superstream.kt    | 818 ++++++++++++++++++
 .../kotlin/com/hexated/SuperstreamPlugin.kt   |  14 +
 12 files changed, 1135 insertions(+), 37 deletions(-)
 create mode 100644 Superstream/build.gradle.kts
 create mode 100644 Superstream/src/main/AndroidManifest.xml
 create mode 100644 Superstream/src/main/kotlin/com/hexated/Extractors.kt
 create mode 100644 Superstream/src/main/kotlin/com/hexated/Superstream.kt
 create mode 100644 Superstream/src/main/kotlin/com/hexated/SuperstreamPlugin.kt

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5e17d0d..4e558ec6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,6 +55,10 @@ jobs:
           SFMOVIES_API: ${{ secrets.SFMOVIES_API }}
           CINEMATV_API: ${{ secrets.CINEMATV_API }}
           OMOVIES_API: ${{ secrets.OMOVIES_API }}
+          SUPERSTREAM_FIRST_API: ${{ secrets.SUPERSTREAM_FIRST_API }}
+          SUPERSTREAM_SECOND_API: ${{ secrets.SUPERSTREAM_SECOND_API }}
+          SUPERSTREAM_THIRD_API: ${{ secrets.SUPERSTREAM_THIRD_API }}
+          SUPERSTREAM_FOURTH_API: ${{ secrets.SUPERSTREAM_FOURTH_API }}
         run: |
           cd $GITHUB_WORKSPACE/src
           echo TMDB_API=$TMDB_API >> local.properties
@@ -70,6 +74,10 @@ jobs:
           echo SFMOVIES_API=$SFMOVIES_API >> local.properties
           echo CINEMATV_API=$CINEMATV_API >> local.properties
           echo OMOVIES_API=$OMOVIES_API >> local.properties
+          echo SUPERSTREAM_FIRST_API=$SUPERSTREAM_FIRST_API >> local.properties
+          echo SUPERSTREAM_SECOND_API=$SUPERSTREAM_SECOND_API >> local.properties
+          echo SUPERSTREAM_THIRD_API=$SUPERSTREAM_THIRD_API >> local.properties
+          echo SUPERSTREAM_FOURTH_API=$SUPERSTREAM_FOURTH_API >> local.properties
 
       - name: Build Plugins
         run: |
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 9823c0c2..8cdb4848 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1834,7 +1834,7 @@ object SoraExtractor : SoraStream() {
             data = mapOf(
                 "index" to "0",
                 "mid" to "$id",
-                "wsk" to "f6ea6cde-e42b-4c26-98d3-b4fe48cdd4fb",
+                "wsk" to "30fb68aa-1c71-4b8c-b5d4-4ca9222cfb45",
                 "lid" to "",
                 "liu" to ""
             ),
@@ -2053,7 +2053,7 @@ object SoraExtractor : SoraStream() {
             "$dahmerMoviesAPI/tvs/${title?.replace(":", " -")}/Season $season/"
         }
 
-        val request = app.get(url, interceptor = TimeOutInterceptor())
+        val request = app.get(url, timeout = 60L)
         if (!request.isSuccessful) return
         val paths = request.document.select("a").map {
             it.text() to it.attr("href")
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index e85277a1..6c7fde38 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -1286,19 +1286,6 @@ private enum class Symbol(val decimalValue: Int) {
     }
 }
 
-class TimeOutInterceptor : Interceptor {
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val call = chain
-            .withConnectTimeout(60, TimeUnit.SECONDS)
-            .withReadTimeout(60, TimeUnit.SECONDS)
-            .withWriteTimeout(60, TimeUnit.SECONDS)
-            .request()
-            .newBuilder()
-            .build()
-        return chain.proceed(call)
-    }
-}
-
 // steal from https://github.com/aniyomiorg/aniyomi-extensions/blob/master/src/en/aniwave/src/eu/kanade/tachiyomi/animeextension/en/nineanime/AniwaveUtils.kt
 // credits to @samfundev
 object AniwaveUtils {
diff --git a/StremioX/src/main/kotlin/com/hexated/StremioC.kt b/StremioX/src/main/kotlin/com/hexated/StremioC.kt
index b6137816..b4871b26 100644
--- a/StremioX/src/main/kotlin/com/hexated/StremioC.kt
+++ b/StremioX/src/main/kotlin/com/hexated/StremioC.kt
@@ -65,7 +65,7 @@ class StremioC : MainAPI() {
         val loadData = parseJson<LoadData>(data)
         val request = app.get(
             "${mainUrl}/stream/${loadData.type}/${loadData.id}.json",
-            interceptor = interceptor
+            timeout = 120L
         )
         if (request.isSuccessful) {
             val res = request.parsedSafe<StreamsResponse>()
@@ -110,7 +110,7 @@ class StremioC : MainAPI() {
         sites.filter { it.parentJavaClass == "StremioX" }.apmap { site ->
             val res = app.get(
                 "${site.url.fixSourceUrl()}/stream/${type}/${id}.json",
-                interceptor = interceptor
+                timeout = 120L
             ).parsedSafe<StreamsResponse>()
             res?.streams?.forEach { stream ->
                 stream.runCallback(subtitleCallback, callback)
@@ -154,7 +154,7 @@ class StremioC : MainAPI() {
             types.forEach { type ->
                 val res = app.get(
                     "${provider.mainUrl}/catalog/${type}/${id}/search=${query}.json",
-                    interceptor = interceptor
+                    timeout = 120L
                 ).parsedSafe<CatalogResponse>()
                 res?.metas?.forEach { entry ->
                     entries.add(entry.toSearchResponse(provider))
@@ -168,7 +168,7 @@ class StremioC : MainAPI() {
             types.forEach { type ->
                 val res = app.get(
                     "${provider.mainUrl}/catalog/${type}/${id}.json",
-                    interceptor = interceptor
+                    timeout = 120L
                 ).parsedSafe<CatalogResponse>()
                 res?.metas?.forEach { entry ->
                     entries.add(entry.toSearchResponse(provider))
diff --git a/StremioX/src/main/kotlin/com/hexated/StremioX.kt b/StremioX/src/main/kotlin/com/hexated/StremioX.kt
index 995479fa..44d98f47 100644
--- a/StremioX/src/main/kotlin/com/hexated/StremioX.kt
+++ b/StremioX/src/main/kotlin/com/hexated/StremioX.kt
@@ -238,7 +238,7 @@ class StremioX : TmdbProvider() {
         } else {
             "$fixMainUrl/stream/series/$imdbId:$season:$episode.json"
         }
-        val res = app.get(url, interceptor = interceptor).parsedSafe<StreamsResponse>()
+        val res = app.get(url, timeout = 120L).parsedSafe<StreamsResponse>()
         res?.streams?.forEach { stream ->
             stream.runCallback(subtitleCallback, callback)
         }
diff --git a/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt b/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
index 122a7225..0af2d9fd 100644
--- a/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
+++ b/StremioX/src/main/kotlin/com/hexated/SubsExtractors.kt
@@ -20,7 +20,7 @@ object SubsExtractors {
         } else {
             "series/$imdbId:$season:$episode"
         }
-        app.get("${openSubAPI}/subtitles/$slug.json", interceptor = interceptor).parsedSafe<OsResult>()?.subtitles?.map { sub ->
+        app.get("${openSubAPI}/subtitles/$slug.json", timeout = 120L).parsedSafe<OsResult>()?.subtitles?.map { sub ->
             subtitleCallback.invoke(
                 SubtitleFile(
                     SubtitleHelper.fromThreeLettersToLanguage(sub.lang ?: "") ?: sub.lang
@@ -42,7 +42,7 @@ object SubsExtractors {
             "${watchSomuchAPI}/Watch/ajMovieTorrents.aspx", data = mapOf(
                 "index" to "0",
                 "mid" to "$id",
-                "wsk" to "f6ea6cde-e42b-4c26-98d3-b4fe48cdd4fb",
+                "wsk" to "30fb68aa-1c71-4b8c-b5d4-4ca9222cfb45",
                 "lid" to "",
                 "liu" to ""
             ), headers = mapOf("X-Requested-With" to "XMLHttpRequest")
diff --git a/StremioX/src/main/kotlin/com/hexated/Utils.kt b/StremioX/src/main/kotlin/com/hexated/Utils.kt
index 6640cbc4..51feea3f 100644
--- a/StremioX/src/main/kotlin/com/hexated/Utils.kt
+++ b/StremioX/src/main/kotlin/com/hexated/Utils.kt
@@ -9,21 +9,6 @@ import java.text.SimpleDateFormat
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 
-val interceptor = TimeOutInterceptor()
-
-class TimeOutInterceptor : Interceptor {
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val call = chain
-            .withConnectTimeout(60, TimeUnit.SECONDS)
-            .withReadTimeout(60, TimeUnit.SECONDS)
-            .withWriteTimeout(60, TimeUnit.SECONDS)
-            .request()
-            .newBuilder()
-            .build()
-        return chain.proceed(call)
-    }
-}
-
 fun String.fixSourceUrl(): String {
     return this.replace("/manifest.json", "").replace("stremio://", "https://")
 }
diff --git a/Superstream/build.gradle.kts b/Superstream/build.gradle.kts
new file mode 100644
index 00000000..6109c0eb
--- /dev/null
+++ b/Superstream/build.gradle.kts
@@ -0,0 +1,42 @@
+import org.jetbrains.kotlin.konan.properties.Properties
+
+// use an integer for version numbers
+version = 1
+
+android {
+    defaultConfig {
+        val properties = Properties()
+        properties.load(project.rootProject.file("local.properties").inputStream())
+
+        buildConfigField("String", "SUPERSTREAM_FIRST_API", "\"${properties.getProperty("SUPERSTREAM_FIRST_API")}\"")
+        buildConfigField("String", "SUPERSTREAM_SECOND_API", "\"${properties.getProperty("SUPERSTREAM_SECOND_API")}\"")
+        buildConfigField("String", "SUPERSTREAM_THIRD_API", "\"${properties.getProperty("SUPERSTREAM_THIRD_API")}\"")
+        buildConfigField("String", "SUPERSTREAM_FOURTH_API", "\"${properties.getProperty("SUPERSTREAM_FOURTH_API")}\"")
+    }
+}
+
+cloudstream {
+    language = "en"
+    // All of these properties are optional, you can safely remove them
+
+    // description = "Lorem Ipsum"
+    authors = listOf("Blatzar")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "AsianDrama",
+        "Anime",
+        "TvSeries",
+        "Movie",
+    )
+
+
+    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1196694385061003334/icon.png"
+}
\ No newline at end of file
diff --git a/Superstream/src/main/AndroidManifest.xml b/Superstream/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..c98063f8
--- /dev/null
+++ b/Superstream/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.hexated"/>
\ No newline at end of file
diff --git a/Superstream/src/main/kotlin/com/hexated/Extractors.kt b/Superstream/src/main/kotlin/com/hexated/Extractors.kt
new file mode 100644
index 00000000..73a21ff6
--- /dev/null
+++ b/Superstream/src/main/kotlin/com/hexated/Extractors.kt
@@ -0,0 +1,242 @@
+package com.hexated
+
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
+
+object Extractors : Superstream() {
+
+    suspend fun invokeInternalSource(
+        id: Int? = null,
+        type: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
+        fun LinkList.toExtractorLink(): ExtractorLink? {
+            if (this.path.isNullOrBlank()) return null
+            return ExtractorLink(
+                "Internal",
+                "Internal [${this.size}]",
+                this.path.replace("\\/", ""),
+                "",
+                getQualityFromName(this.quality),
+            )
+        }
+
+        // No childmode when getting links
+        // New api does not return video links :(
+        val query = if (type == ResponseTypes.Movies.value) {
+            """{"childmode":"0","uid":"","app_version":"11.5","appid":"$appId","module":"Movie_downloadurl_v3","channel":"Website","mid":"$id","lang":"","expired_date":"${getExpiryDate()}","platform":"android","oss":"1","group":""}"""
+        } else {
+            """{"childmode":"0","app_version":"11.5","module":"TV_downloadurl_v3","channel":"Website","episode":"$episode","expired_date":"${getExpiryDate()}","platform":"android","tid":"$id","oss":"1","uid":"","appid":"$appId","season":"$season","lang":"en","group":""}"""
+        }
+
+        val linkData = queryApiParsed<LinkDataProp>(query, false)
+        linkData.data?.list?.forEach {
+            callback.invoke(it.toExtractorLink() ?: return@forEach)
+        }
+
+        // Should really run this query for every link :(
+        val fid = linkData.data?.list?.firstOrNull { it.fid != null }?.fid
+
+        val subtitleQuery = if (type == ResponseTypes.Movies.value) {
+            """{"childmode":"0","fid":"$fid","uid":"","app_version":"11.5","appid":"$appId","module":"Movie_srt_list_v2","channel":"Website","mid":"$id","lang":"en","expired_date":"${getExpiryDate()}","platform":"android"}"""
+        } else {
+            """{"childmode":"0","fid":"$fid","app_version":"11.5","module":"TV_srt_list_v2","channel":"Website","episode":"$episode","expired_date":"${getExpiryDate()}","platform":"android","tid":"$id","uid":"","appid":"$appId","season":"$season","lang":"en"}"""
+        }
+
+        val subtitles = queryApiParsed<SubtitleDataProp>(subtitleQuery).data
+        subtitles?.list?.forEach { subs ->
+            val sub = subs.subtitles.maxByOrNull { it.support_total ?: 0 }
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    sub?.language ?: sub?.lang ?: return@forEach,
+                    sub?.filePath ?: return@forEach
+                )
+            )
+        }
+    }
+
+    suspend fun invokeExternalSource(
+        mediaId: Int? = null,
+        type: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+    ) {
+        val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
+        val shareKey = app.get(
+            "$fourthAPI/index/share_link?id=${mediaId}&type=$type"
+        ).parsedSafe<ExternalResponse>()?.data?.link?.substringAfterLast("/")
+
+        val headers = mapOf("Accept-Language" to "en")
+        val shareRes = app.get(
+            "$thirdAPI/file/file_share_list?share_key=${shareKey ?: return}",
+            headers = headers
+        ).parsedSafe<ExternalResponse>()?.data
+
+        val fids = if (season == null) {
+            shareRes?.file_list
+        } else {
+            val parentId =
+                shareRes?.file_list?.find { it.file_name.equals("season $season", true) }?.fid
+            app.get(
+                "$thirdAPI/file/file_share_list?share_key=$shareKey&parent_id=$parentId&page=1",
+                headers = headers
+            ).parsedSafe<ExternalResponse>()?.data?.file_list?.filter {
+                it.file_name?.contains(
+                    "s${seasonSlug}e${episodeSlug}",
+                    true
+                ) == true
+            }
+        }
+
+        fids?.apmapIndexed { index, fileList ->
+            val player = app.get("$thirdAPI/file/player?fid=${fileList.fid}&share_key=$shareKey").text
+            val video = """"(https.*?m3u8.*?)"""".toRegex().find(player)?.groupValues?.get(1)
+            callback.invoke(
+                ExtractorLink(
+                    "External",
+                    "External [Server ${index + 1}]",
+                    video?.replace("\\/", "/") ?: return@apmapIndexed,
+                    "$thirdAPI/",
+                    getIndexQuality(fileList.file_name),
+                    isM3u8 = true
+                )
+            )
+        }
+    }
+
+    suspend fun invokeWatchsomuch(
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+    ) {
+        val id = imdbId?.removePrefix("tt")
+        val epsId = app.post(
+            "$watchSomuchAPI/Watch/ajMovieTorrents.aspx",
+            data = mapOf(
+                "index" to "0",
+                "mid" to "$id",
+                "wsk" to "30fb68aa-1c71-4b8c-b5d4-4ca9222cfb45",
+                "lid" to "",
+                "liu" to ""
+            ), headers = mapOf("X-Requested-With" to "XMLHttpRequest")
+        ).parsedSafe<WatchsomuchResponses>()?.movie?.torrents?.let { eps ->
+            if (season == null) {
+                eps.firstOrNull()?.id
+            } else {
+                eps.find { it.episode == episode && it.season == season }?.id
+            }
+        } ?: return
+
+        val (seasonSlug, episodeSlug) = getEpisodeSlug(
+            season,
+            episode
+        )
+
+        val subUrl = if (season == null) {
+            "$watchSomuchAPI/Watch/ajMovieSubtitles.aspx?mid=$id&tid=$epsId&part="
+        } else {
+            "$watchSomuchAPI/Watch/ajMovieSubtitles.aspx?mid=$id&tid=$epsId&part=S${seasonSlug}E${episodeSlug}"
+        }
+
+        app.get(subUrl)
+            .parsedSafe<WatchsomuchSubResponses>()?.subtitles
+            ?.map { sub ->
+                subtitleCallback.invoke(
+                    SubtitleFile(
+                        sub.label ?: "",
+                        fixUrl(sub.url ?: return@map null, watchSomuchAPI)
+                    )
+                )
+            }
+
+
+    }
+
+    suspend fun invokeOpenSubs(
+        imdbId: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+    ) {
+        val slug = if(season == null) {
+            "movie/$imdbId"
+        } else {
+            "series/$imdbId:$season:$episode"
+        }
+        app.get("${openSubAPI}/subtitles/$slug.json", timeout = 120L).parsedSafe<OsResult>()?.subtitles?.map { sub ->
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    SubtitleHelper.fromThreeLettersToLanguage(sub.lang ?: "") ?: sub.lang
+                    ?: return@map,
+                    sub.url ?: return@map
+                )
+            )
+        }
+    }
+
+    suspend fun invokeVidsrcto(
+        imdbId: String?,
+        season: Int?,
+        episode: Int?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+    ) {
+        val url = if (season == null) {
+            "$vidsrctoAPI/embed/movie/$imdbId"
+        } else {
+            "$vidsrctoAPI/embed/tv/$imdbId/$season/$episode"
+        }
+
+        val mediaId = app.get(url).document.selectFirst("ul.episodes li a")?.attr("data-id") ?: return
+        val subtitles = app.get("$vidsrctoAPI/ajax/embed/episode/$mediaId/subtitles").text
+        AppUtils.tryParseJson<List<VidsrcSubtitles>>(subtitles)?.map {
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    it.label ?: "",
+                    it.file ?: return@map
+                )
+            )
+        }
+
+    }
+
+    private fun fixUrl(url: String, domain: String): String {
+        if (url.startsWith("http")) {
+            return url
+        }
+        if (url.isEmpty()) {
+            return ""
+        }
+
+        val startsWithNoHttp = url.startsWith("//")
+        if (startsWithNoHttp) {
+            return "https:$url"
+        } else {
+            if (url.startsWith('/')) {
+                return domain + url
+            }
+            return "$domain/$url"
+        }
+    }
+
+    private fun getIndexQuality(str: String?): Int {
+        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
+            ?: Qualities.Unknown.value
+    }
+
+    private fun getEpisodeSlug(
+        season: Int? = null,
+        episode: Int? = null,
+    ): Pair<String, String> {
+        return if (season == null && episode == null) {
+            "" to ""
+        } else {
+            (if (season!! < 10) "0$season" else "$season") to (if (episode!! < 10) "0$episode" else "$episode")
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Superstream/src/main/kotlin/com/hexated/Superstream.kt b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
new file mode 100644
index 00000000..525e3607
--- /dev/null
+++ b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
@@ -0,0 +1,818 @@
+package com.hexated
+
+import android.util.Base64
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.hexated.Extractors.invokeExternalSource
+import com.hexated.Extractors.invokeInternalSource
+import com.hexated.Extractors.invokeOpenSubs
+import com.hexated.Extractors.invokeVidsrcto
+import com.hexated.Extractors.invokeWatchsomuch
+import com.hexated.Superstream.CipherUtils.getVerify
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.APIHolder.capitalize
+import com.lagradost.cloudstream3.APIHolder.unixTime
+import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.nicehttp.NiceResponse
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import javax.crypto.Cipher
+import javax.crypto.Cipher.DECRYPT_MODE
+import javax.crypto.Cipher.ENCRYPT_MODE
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+import kotlin.math.roundToInt
+
+open class Superstream : MainAPI() {
+    private val timeout = 60L
+    override var name = "SuperStream"
+    override val hasMainPage = true
+    override val hasChromecastSupport = true
+    override val supportedTypes = setOf(
+        TvType.Movie,
+        TvType.TvSeries,
+        TvType.Anime,
+        TvType.AnimeMovie,
+    )
+
+    enum class ResponseTypes(val value: Int) {
+        Series(2),
+        Movies(1);
+
+        fun toTvType(): TvType {
+            return if (this == Series) TvType.TvSeries else TvType.Movie
+        }
+
+        companion object {
+            fun getResponseType(value: Int?): ResponseTypes {
+                return values().firstOrNull { it.value == value } ?: Movies
+            }
+        }
+    }
+
+    override val instantLinkLoading = true
+
+    private val interceptor = UserAgentInterceptor()
+
+    private val headers = mapOf(
+        "Platform" to "android",
+        "Accept" to "charset=utf-8",
+    )
+
+    private class UserAgentInterceptor : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): Response {
+            return chain.proceed(
+                chain.request()
+                    .newBuilder()
+                    .removeHeader("user-agent")
+                    .build()
+            )
+        }
+    }
+
+    // Random 32 length string
+    private fun randomToken(): String {
+        return (0..31).joinToString("") {
+            (('0'..'9') + ('a'..'f')).random().toString()
+        }
+    }
+
+    private val token = randomToken()
+
+    private object CipherUtils {
+        private const val ALGORITHM = "DESede"
+        private const val TRANSFORMATION = "DESede/CBC/PKCS5Padding"
+        fun encrypt(str: String, key: String, iv: String): String? {
+            return try {
+                val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
+                val bArr = ByteArray(24)
+                val bytes: ByteArray = key.toByteArray()
+                var length = if (bytes.size <= 24) bytes.size else 24
+                System.arraycopy(bytes, 0, bArr, 0, length)
+                while (length < 24) {
+                    bArr[length] = 0
+                    length++
+                }
+                cipher.init(
+                    ENCRYPT_MODE,
+                    SecretKeySpec(bArr, ALGORITHM),
+                    IvParameterSpec(iv.toByteArray())
+                )
+
+                String(Base64.encode(cipher.doFinal(str.toByteArray()), 2), StandardCharsets.UTF_8)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                null
+            }
+        }
+
+        // Useful for deobfuscation
+        fun decrypt(str: String, key: String, iv: String): String? {
+            return try {
+                val cipher: Cipher = Cipher.getInstance(TRANSFORMATION)
+                val bArr = ByteArray(24)
+                val bytes: ByteArray = key.toByteArray()
+                var length = if (bytes.size <= 24) bytes.size else 24
+                System.arraycopy(bytes, 0, bArr, 0, length)
+                while (length < 24) {
+                    bArr[length] = 0
+                    length++
+                }
+                cipher.init(
+                    DECRYPT_MODE,
+                    SecretKeySpec(bArr, ALGORITHM),
+                    IvParameterSpec(iv.toByteArray())
+                )
+                val inputStr = Base64.decode(str.toByteArray(), Base64.DEFAULT)
+                cipher.doFinal(inputStr).decodeToString()
+            } catch (e: Exception) {
+                e.printStackTrace()
+                null
+            }
+        }
+
+        fun md5(str: String): String? {
+            return MD5Util.md5(str)?.let { HexDump.toHexString(it).lowercase() }
+        }
+
+        fun getVerify(str: String?, str2: String, str3: String): String? {
+            if (str != null) {
+                return md5(md5(str2) + str3 + str)
+            }
+            return null
+        }
+    }
+
+    private object HexDump {
+        private val HEX_DIGITS = charArrayOf(
+            '0',
+            '1',
+            '2',
+            '3',
+            '4',
+            '5',
+            '6',
+            '7',
+            '8',
+            '9',
+            'A',
+            'B',
+            'C',
+            'D',
+            'E',
+            'F'
+        )
+
+        @JvmOverloads
+        fun toHexString(bArr: ByteArray, i: Int = 0, i2: Int = bArr.size): String {
+            val cArr = CharArray(i2 * 2)
+            var i3 = 0
+            for (i4 in i until i + i2) {
+                val b = bArr[i4].toInt()
+                val i5 = i3 + 1
+                val cArr2 = HEX_DIGITS
+                cArr[i3] = cArr2[b ushr 4 and 15]
+                i3 = i5 + 1
+                cArr[i5] = cArr2[b and 15]
+            }
+            return String(cArr)
+        }
+    }
+
+    private object MD5Util {
+        fun md5(str: String): ByteArray? {
+            return md5(str.toByteArray())
+        }
+
+        fun md5(bArr: ByteArray?): ByteArray? {
+            return try {
+                val digest = MessageDigest.getInstance("MD5")
+                digest.update(bArr ?: return null)
+                digest.digest()
+            } catch (e: NoSuchAlgorithmException) {
+                e.printStackTrace()
+                null
+            }
+        }
+    }
+
+    suspend fun queryApi(query: String, useAlternativeApi: Boolean): NiceResponse {
+        val encryptedQuery = CipherUtils.encrypt(query, key, iv)!!
+        val appKeyHash = CipherUtils.md5(appKey)!!
+        val newBody =
+            """{"app_key":"$appKeyHash","verify":"${
+                getVerify(
+                    encryptedQuery,
+                    appKey,
+                    key
+                )
+            }","encrypt_data":"$encryptedQuery"}"""
+        val base64Body = String(Base64.encode(newBody.toByteArray(), Base64.DEFAULT))
+
+        val data = mapOf(
+            "data" to base64Body,
+            "appid" to "27",
+            "platform" to "android",
+            "version" to appVersionCode,
+            // Probably best to randomize this
+            "medium" to "Website&token$token"
+        )
+
+        val url = if (useAlternativeApi) secondAPI else firstAPI
+        return app.post(
+            url,
+            headers = headers,
+            data = data,
+            timeout = timeout,
+            interceptor = interceptor
+        )
+    }
+
+    suspend inline fun <reified T : Any> queryApiParsed(
+        query: String,
+        useAlternativeApi: Boolean = true
+    ): T {
+        return queryApi(query, useAlternativeApi).parsed()
+    }
+
+    fun getExpiryDate(): Long {
+        // Current time + 12 hours
+        return unixTime + 60 * 60 * 12
+    }
+
+    private data class PostJSON(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("poster") val poster: String? = null,
+        @JsonProperty("poster_2") val poster2: String? = null,
+        @JsonProperty("box_type") val boxType: Int? = null,
+        @JsonProperty("imdb_rating") val imdbRating: String? = null,
+        @JsonProperty("quality_tag") val quality_tag: String? = null,
+    )
+
+    private data class ListJSON(
+        @JsonProperty("code") val code: Int? = null,
+        @JsonProperty("type") val type: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("box_type") val boxType: Int? = null,
+        @JsonProperty("list") val list: ArrayList<PostJSON> = arrayListOf(),
+    )
+
+    private data class DataJSON(
+        @JsonProperty("data") val data: ArrayList<ListJSON> = arrayListOf()
+    )
+
+    // We do not want content scanners to notice this scraping going on so we've hidden all constants
+    // The source has its origins in China so I added some extra security with banned words
+    // Mayhaps a tiny bit unethical, but this source is just too good :)
+    // If you are copying this code please use precautions so they do not change their api.
+
+    // Free Tibet, The Tienanmen Square protests of 1989
+    private val iv = base64Decode("d0VpcGhUbiE=")
+    private val key = base64Decode("MTIzZDZjZWRmNjI2ZHk1NDIzM2FhMXc2")
+
+    private val firstAPI = BuildConfig.SUPERSTREAM_FIRST_API
+
+    // Another url because the first one sucks at searching
+    // This one was revealed to me in a dream
+    private val secondAPI = BuildConfig.SUPERSTREAM_SECOND_API
+
+    val thirdAPI = BuildConfig.SUPERSTREAM_THIRD_API
+    val fourthAPI = BuildConfig.SUPERSTREAM_FOURTH_API
+
+    val watchSomuchAPI = "https://watchsomuch.tv"
+    val openSubAPI = "https://opensubtitles-v3.strem.io"
+    val vidsrctoAPI = "https://vidsrc.to"
+
+    private val appKey = base64Decode("bW92aWVib3g=")
+    val appId = base64Decode("Y29tLnRkby5zaG93Ym94")
+    private val appIdSecond = base64Decode("Y29tLm1vdmllYm94cHJvLmFuZHJvaWQ=")
+    private val appVersion = "11.5"
+    private val appVersionCode = "129"
+
+    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+        val hideNsfw = if (settingsForProvider.enableAdult) 0 else 1
+        val data = queryApiParsed<DataJSON>(
+            """{"childmode":"$hideNsfw","app_version":"$appVersion","appid":"$appIdSecond","module":"Home_list_type_v5","channel":"Website","page":"$page","lang":"en","type":"all","pagelimit":"10","expired_date":"${getExpiryDate()}","platform":"android"}
+            """.trimIndent()
+        )
+
+        // Cut off the first row (featured)
+        val pages = data.data.let { it.subList(minOf(it.size, 1), it.size) }
+            .mapNotNull {
+                var name = it.name
+                if (name.isNullOrEmpty()) name = "Featured"
+                val postList = it.list.mapNotNull second@{ post ->
+                    val type = if (post.boxType == 1) TvType.Movie else TvType.TvSeries
+                    newMovieSearchResponse(
+                        name = post.title ?: return@second null,
+                        url = LoadData(post.id ?: return@mapNotNull null, post.boxType).toJson(),
+                        type = type,
+                        fix = false
+                    ) {
+                        posterUrl = post.poster ?: post.poster2
+                        quality = getQualityFromString(post.quality_tag ?: "")
+                    }
+                }
+                if (postList.isEmpty()) return@mapNotNull null
+                HomePageList(name, postList)
+            }
+        return HomePageResponse(pages, hasNext = !pages.any { it.list.isEmpty() })
+    }
+
+    private data class Data(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("mid") val mid: Int? = null,
+        @JsonProperty("box_type") val boxType: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("poster_org") val posterOrg: String? = null,
+        @JsonProperty("poster") val poster: String? = null,
+        @JsonProperty("cats") val cats: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("imdb_rating") val imdbRating: String? = null,
+        @JsonProperty("quality_tag") val qualityTag: String? = null,
+    ) {
+        fun toSearchResponse(api: MainAPI): MovieSearchResponse? {
+            return api.newMovieSearchResponse(
+                this.title ?: "",
+                LoadData(
+                    this.id ?: this.mid ?: return null,
+                    this.boxType ?: ResponseTypes.Movies.value
+                ).toJson(),
+                ResponseTypes.getResponseType(this.boxType).toTvType(),
+                false
+            ) {
+                posterUrl = this@Data.posterOrg ?: this@Data.poster
+                year = this@Data.year
+                quality = getQualityFromString(this@Data.qualityTag?.replace("-", "") ?: "")
+            }
+        }
+    }
+
+    private data class MainDataList(
+        @JsonProperty("list") val list: ArrayList<Data> = arrayListOf()
+    )
+
+    private data class MainData(
+        @JsonProperty("data") val data: MainDataList
+    )
+
+    override suspend fun search(query: String): List<SearchResponse> {
+        val hideNsfw = if (settingsForProvider.enableAdult) 0 else 1
+        val apiQuery =
+            // Originally 8 pagelimit
+            """{"childmode":"$hideNsfw","app_version":"$appVersion","appid":"$appIdSecond","module":"Search4","channel":"Website","page":"1","lang":"en","type":"all","keyword":"$query","pagelimit":"20","expired_date":"${getExpiryDate()}","platform":"android"}"""
+        val searchResponse = queryApiParsed<MainData>(apiQuery, true).data.list.mapNotNull {
+            it.toSearchResponse(this)
+        }
+        return searchResponse
+    }
+
+    private data class LoadData(
+        val id: Int,
+        val type: Int?
+    )
+
+    private data class MovieData(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("director") val director: String? = null,
+        @JsonProperty("writer") val writer: String? = null,
+        @JsonProperty("actors") val actors: String? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
+        @JsonProperty("poster") val poster: String? = null,
+        @JsonProperty("description") val description: String? = null,
+        @JsonProperty("cats") val cats: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("imdb_rating") val imdbRating: String? = null,
+        @JsonProperty("trailer") val trailer: String? = null,
+        @JsonProperty("released") val released: String? = null,
+        @JsonProperty("content_rating") val contentRating: String? = null,
+        @JsonProperty("tmdb_id") val tmdbId: Int? = null,
+        @JsonProperty("tomato_meter") val tomatoMeter: Int? = null,
+        @JsonProperty("poster_org") val posterOrg: String? = null,
+        @JsonProperty("trailer_url") val trailerUrl: String? = null,
+        @JsonProperty("imdb_link") val imdbLink: String? = null,
+        @JsonProperty("box_type") val boxType: Int? = null,
+        @JsonProperty("recommend") val recommend: List<Data> = listOf(),
+    )
+
+    private data class MovieDataProp(
+        @JsonProperty("data") val data: MovieData? = MovieData()
+    )
+
+
+    private data class SeriesDataProp(
+        @JsonProperty("code") val code: Int? = null,
+        @JsonProperty("msg") val msg: String? = null,
+        @JsonProperty("data") val data: SeriesData? = SeriesData()
+    )
+
+    private data class SeriesSeasonProp(
+        @JsonProperty("code") val code: Int? = null,
+        @JsonProperty("msg") val msg: String? = null,
+        @JsonProperty("data") val data: ArrayList<SeriesEpisode>? = arrayListOf()
+    )
+//    data class PlayProgress (
+//
+//  @JsonProperty("over"      ) val over     : Int? = null,
+//  @JsonProperty("seconds"   ) val seconds  : Int? = null,
+//  @JsonProperty("mp4_id"    ) val mp4Id    : Int? = null,
+//  @JsonProperty("last_time" ) val lastTime : Int? = null
+//
+//)
+
+    private data class SeriesEpisode(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("tid") val tid: Int? = null,
+        @JsonProperty("mb_id") val mbId: Int? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("imdb_id_status") val imdbIdStatus: Int? = null,
+        @JsonProperty("srt_status") val srtStatus: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
+        @JsonProperty("state") val state: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("thumbs") val thumbs: String? = null,
+        @JsonProperty("thumbs_bak") val thumbsBak: String? = null,
+        @JsonProperty("thumbs_original") val thumbsOriginal: String? = null,
+        @JsonProperty("poster_imdb") val posterImdb: Int? = null,
+        @JsonProperty("synopsis") val synopsis: String? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
+        @JsonProperty("view") val view: Int? = null,
+        @JsonProperty("download") val download: Int? = null,
+        @JsonProperty("source_file") val sourceFile: Int? = null,
+        @JsonProperty("code_file") val codeFile: Int? = null,
+        @JsonProperty("add_time") val addTime: Int? = null,
+        @JsonProperty("update_time") val updateTime: Int? = null,
+        @JsonProperty("released") val released: String? = null,
+        @JsonProperty("released_timestamp") val releasedTimestamp: Long? = null,
+        @JsonProperty("audio_lang") val audioLang: String? = null,
+        @JsonProperty("quality_tag") val qualityTag: String? = null,
+        @JsonProperty("3d") val _3d: Int? = null,
+        @JsonProperty("remark") val remark: String? = null,
+        @JsonProperty("pending") val pending: String? = null,
+        @JsonProperty("imdb_rating") val imdbRating: String? = null,
+        @JsonProperty("display") val display: Int? = null,
+        @JsonProperty("sync") val sync: Int? = null,
+        @JsonProperty("tomato_meter") val tomatoMeter: Int? = null,
+        @JsonProperty("tomato_meter_count") val tomatoMeterCount: Int? = null,
+        @JsonProperty("tomato_audience") val tomatoAudience: Int? = null,
+        @JsonProperty("tomato_audience_count") val tomatoAudienceCount: Int? = null,
+        @JsonProperty("thumbs_min") val thumbsMin: String? = null,
+        @JsonProperty("thumbs_org") val thumbsOrg: String? = null,
+        @JsonProperty("imdb_link") val imdbLink: String? = null,
+//        @JsonProperty("quality_tags") val qualityTags: ArrayList<String> = arrayListOf(),
+//  @JsonProperty("play_progress"         ) val playProgress        : PlayProgress?     = PlayProgress()
+
+    )
+
+    private data class SeriesLanguage(
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("lang") val lang: String? = null
+    )
+
+    private data class SeriesData(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("mb_id") val mbId: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("display") val display: Int? = null,
+        @JsonProperty("state") val state: Int? = null,
+        @JsonProperty("vip_only") val vipOnly: Int? = null,
+        @JsonProperty("code_file") val codeFile: Int? = null,
+        @JsonProperty("director") val director: String? = null,
+        @JsonProperty("writer") val writer: String? = null,
+        @JsonProperty("actors") val actors: String? = null,
+        @JsonProperty("add_time") val addTime: Int? = null,
+        @JsonProperty("poster") val poster: String? = null,
+        @JsonProperty("poster_imdb") val posterImdb: Int? = null,
+        @JsonProperty("banner_mini") val bannerMini: String? = null,
+        @JsonProperty("description") val description: String? = null,
+        @JsonProperty("imdb_id") val imdbId: String? = null,
+        @JsonProperty("cats") val cats: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("collect") val collect: Int? = null,
+        @JsonProperty("view") val view: Int? = null,
+        @JsonProperty("download") val download: Int? = null,
+        @JsonProperty("update_time") val updateTime: String? = null,
+        @JsonProperty("released") val released: String? = null,
+        @JsonProperty("released_timestamp") val releasedTimestamp: Int? = null,
+        @JsonProperty("episode_released") val episodeReleased: String? = null,
+        @JsonProperty("episode_released_timestamp") val episodeReleasedTimestamp: Int? = null,
+        @JsonProperty("max_season") val maxSeason: Int? = null,
+        @JsonProperty("max_episode") val maxEpisode: Int? = null,
+        @JsonProperty("remark") val remark: String? = null,
+        @JsonProperty("imdb_rating") val imdbRating: String? = null,
+        @JsonProperty("content_rating") val contentRating: String? = null,
+        @JsonProperty("tmdb_id") val tmdbId: Int? = null,
+        @JsonProperty("tomato_url") val tomatoUrl: String? = null,
+        @JsonProperty("tomato_meter") val tomatoMeter: Int? = null,
+        @JsonProperty("tomato_meter_count") val tomatoMeterCount: Int? = null,
+        @JsonProperty("tomato_meter_state") val tomatoMeterState: String? = null,
+        @JsonProperty("reelgood_url") val reelgoodUrl: String? = null,
+        @JsonProperty("audience_score") val audienceScore: Int? = null,
+        @JsonProperty("audience_score_count") val audienceScoreCount: Int? = null,
+        @JsonProperty("no_tomato_url") val noTomatoUrl: Int? = null,
+        @JsonProperty("order_year") val orderYear: Int? = null,
+        @JsonProperty("episodate_id") val episodateId: String? = null,
+        @JsonProperty("weights_day") val weightsDay: Double? = null,
+        @JsonProperty("poster_min") val posterMin: String? = null,
+        @JsonProperty("poster_org") val posterOrg: String? = null,
+        @JsonProperty("banner_mini_min") val bannerMiniMin: String? = null,
+        @JsonProperty("banner_mini_org") val bannerMiniOrg: String? = null,
+        @JsonProperty("trailer_url") val trailerUrl: String? = null,
+        @JsonProperty("years") val years: ArrayList<Int> = arrayListOf(),
+        @JsonProperty("season") val season: ArrayList<Int> = arrayListOf(),
+        @JsonProperty("history") val history: ArrayList<String> = arrayListOf(),
+        @JsonProperty("imdb_link") val imdbLink: String? = null,
+        @JsonProperty("episode") val episode: ArrayList<SeriesEpisode> = arrayListOf(),
+//        @JsonProperty("is_collect") val isCollect: Int? = null,
+        @JsonProperty("language") val language: ArrayList<SeriesLanguage> = arrayListOf(),
+        @JsonProperty("box_type") val boxType: Int? = null,
+        @JsonProperty("year_year") val yearYear: String? = null,
+        @JsonProperty("season_episode") val seasonEpisode: String? = null
+    )
+
+
+    override suspend fun load(url: String): LoadResponse {
+        val loadData = parseJson<LoadData>(url)
+        // val module = if(type === "TvType.Movie") "Movie_detail" else "*tv series module*"
+
+        val isMovie = loadData.type == ResponseTypes.Movies.value
+        val hideNsfw = if (settingsForProvider.enableAdult) 0 else 1
+        if (isMovie) { // 1 = Movie
+            val apiQuery =
+                """{"childmode":"$hideNsfw","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"Movie_detail","channel":"Website","mid":"${loadData.id}","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","oss":"","group":""}"""
+            val data = (queryApiParsed<MovieDataProp>(apiQuery)).data
+                ?: throw RuntimeException("API error")
+
+            return newMovieLoadResponse(
+                data.title ?: "",
+                url,
+                TvType.Movie,
+                LinkData(
+                    data.id ?: throw RuntimeException("No movie ID"),
+                    ResponseTypes.Movies.value,
+                    null,
+                    null,
+                    data.id,
+                    data.imdbId
+                ),
+            ) {
+                this.recommendations =
+                    data.recommend.mapNotNull { it.toSearchResponse(this@Superstream) }
+                this.posterUrl = data.posterOrg ?: data.poster
+                this.year = data.year
+                this.plot = data.description
+                this.tags = data.cats?.split(",")?.map { it.capitalize() }
+                this.rating = data.imdbRating?.split("/")?.get(0)?.toIntOrNull()
+                addTrailer(data.trailerUrl)
+                this.addImdbId(data.imdbId)
+            }
+        } else { // 2 Series
+            val apiQuery =
+                """{"childmode":"$hideNsfw","uid":"","app_version":"$appVersion","appid":"$appIdSecond","module":"TV_detail_1","display_all":"1","channel":"Website","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","tid":"${loadData.id}"}"""
+            val data = (queryApiParsed<SeriesDataProp>(apiQuery)).data
+                ?: throw RuntimeException("API error")
+
+            val episodes = data.season.mapNotNull {
+                val seasonQuery =
+                    """{"childmode":"$hideNsfw","app_version":"$appVersion","year":"0","appid":"$appIdSecond","module":"TV_episode","display_all":"1","channel":"Website","season":"$it","lang":"en","expired_date":"${getExpiryDate()}","platform":"android","tid":"${loadData.id}"}"""
+                (queryApiParsed<SeriesSeasonProp>(seasonQuery)).data
+            }.flatten()
+
+            return newTvSeriesLoadResponse(
+                data.title ?: "",
+                url,
+                TvType.TvSeries,
+                episodes.mapNotNull {
+                    Episode(
+                        LinkData(
+                            it.tid ?: it.id ?: return@mapNotNull null,
+                            ResponseTypes.Series.value,
+                            it.season,
+                            it.episode,
+                            data.id,
+                            data.imdbId
+                        ).toJson(),
+                        it.title,
+                        it.season,
+                        it.episode,
+                        it.thumbs ?: it.thumbsBak ?: it.thumbsMin ?: it.thumbsOriginal
+                        ?: it.thumbsOrg,
+                        it.imdbRating?.toDoubleOrNull()?.times(10)?.roundToInt(),
+                        it.synopsis,
+                        it.releasedTimestamp
+                    )
+                }
+            ) {
+                this.year = data.year
+                this.plot = data.description
+                this.posterUrl = data.posterOrg ?: data.poster
+                this.rating = data.imdbRating?.split("/")?.get(0)?.toIntOrNull()
+                this.tags = data.cats?.split(",")?.map { it.capitalize() }
+                this.addImdbId(data.imdbId)
+            }
+        }
+    }
+
+
+    private data class LinkData(
+        val id: Int,
+        val type: Int,
+        val season: Int?,
+        val episode: Int?,
+        val mediaId: Int?,
+        val imdbId: String?,
+    )
+
+
+    data class LinkDataProp(
+        @JsonProperty("code") val code: Int? = null,
+        @JsonProperty("msg") val msg: String? = null,
+        @JsonProperty("data") val data: ParsedLinkData? = ParsedLinkData()
+    )
+
+    data class LinkList(
+        @JsonProperty("path") val path: String? = null,
+        @JsonProperty("quality") val quality: String? = null,
+        @JsonProperty("real_quality") val realQuality: String? = null,
+        @JsonProperty("format") val format: String? = null,
+        @JsonProperty("size") val size: String? = null,
+        @JsonProperty("size_bytes") val sizeBytes: Long? = null,
+        @JsonProperty("count") val count: Int? = null,
+        @JsonProperty("dateline") val dateline: Long? = null,
+        @JsonProperty("fid") val fid: Int? = null,
+        @JsonProperty("mmfid") val mmfid: Int? = null,
+        @JsonProperty("h265") val h265: Int? = null,
+        @JsonProperty("hdr") val hdr: Int? = null,
+        @JsonProperty("filename") val filename: String? = null,
+        @JsonProperty("original") val original: Int? = null,
+        @JsonProperty("colorbit") val colorbit: Int? = null,
+        @JsonProperty("success") val success: Int? = null,
+        @JsonProperty("timeout") val timeout: Int? = null,
+        @JsonProperty("vip_link") val vipLink: Int? = null,
+        @JsonProperty("fps") val fps: Int? = null,
+        @JsonProperty("bitstream") val bitstream: String? = null,
+        @JsonProperty("width") val width: Int? = null,
+        @JsonProperty("height") val height: Int? = null
+    )
+
+    data class ParsedLinkData(
+        @JsonProperty("seconds") val seconds: Int? = null,
+        @JsonProperty("quality") val quality: ArrayList<String> = arrayListOf(),
+        @JsonProperty("list") val list: ArrayList<LinkList> = arrayListOf()
+    )
+
+    data class SubtitleDataProp(
+        @JsonProperty("code") val code: Int? = null,
+        @JsonProperty("msg") val msg: String? = null,
+        @JsonProperty("data") val data: PrivateSubtitleData? = PrivateSubtitleData()
+    )
+
+    data class Subtitles(
+        @JsonProperty("sid") val sid: Int? = null,
+        @JsonProperty("mid") val mid: String? = null,
+        @JsonProperty("file_path") val filePath: String? = null,
+        @JsonProperty("lang") val lang: String? = null,
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("delay") val delay: Int? = null,
+        @JsonProperty("point") val point: String? = null,
+        @JsonProperty("order") val order: Int? = null,
+        @JsonProperty("support_total") val support_total: Int? = null,
+        @JsonProperty("admin_order") val adminOrder: Int? = null,
+        @JsonProperty("myselect") val myselect: Int? = null,
+        @JsonProperty("add_time") val addTime: Long? = null,
+        @JsonProperty("count") val count: Int? = null
+    )
+
+    data class SubtitleList(
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("subtitles") val subtitles: ArrayList<Subtitles> = arrayListOf()
+    )
+
+    data class PrivateSubtitleData(
+        @JsonProperty("select") val select: ArrayList<String> = arrayListOf(),
+        @JsonProperty("list") val list: ArrayList<SubtitleList> = arrayListOf()
+    )
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ): Boolean {
+
+        val parsed = parseJson<LinkData>(data)
+
+        argamap(
+            {
+                invokeVidsrcto(
+                    parsed.imdbId,
+                    parsed.season,
+                    parsed.episode,
+                    subtitleCallback
+                )
+            },
+            {
+                invokeExternalSource(
+                    parsed.mediaId,
+                    parsed.type,
+                    parsed.season,
+                    parsed.episode,
+                    callback
+                )
+            },
+            {
+                invokeInternalSource(
+                    parsed.id,
+                    parsed.type,
+                    parsed.season,
+                    parsed.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
+            {
+                invokeOpenSubs(
+                    parsed.imdbId,
+                    parsed.season,
+                    parsed.episode,
+                    subtitleCallback
+                )
+            },
+            {
+                invokeWatchsomuch(
+                    parsed.imdbId,
+                    parsed.season,
+                    parsed.episode,
+                    subtitleCallback
+                )
+            }
+        )
+
+        return true
+    }
+
+    data class ExternalResponse(
+        @JsonProperty("data") val data: Data? = null,
+    ) {
+        data class Data(
+            @JsonProperty("link") val link: String? = null,
+            @JsonProperty("file_list") val file_list: ArrayList<FileList>? = arrayListOf(),
+        ) {
+            data class FileList(
+                @JsonProperty("fid") val fid: Long? = null,
+                @JsonProperty("file_name") val file_name: String? = null,
+                @JsonProperty("oss_fid") val oss_fid: Long? = null,
+            )
+        }
+    }
+
+    data class WatchsomuchTorrents(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("movieId") val movieId: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
+    )
+
+    data class WatchsomuchMovies(
+        @JsonProperty("torrents") val torrents: ArrayList<WatchsomuchTorrents>? = arrayListOf(),
+    )
+
+    data class WatchsomuchResponses(
+        @JsonProperty("movie") val movie: WatchsomuchMovies? = null,
+    )
+
+    data class WatchsomuchSubtitles(
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("label") val label: String? = null,
+    )
+
+    data class WatchsomuchSubResponses(
+        @JsonProperty("subtitles") val subtitles: ArrayList<WatchsomuchSubtitles>? = arrayListOf(),
+    )
+
+    data class OsSubtitles(
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("lang") val lang: String? = null,
+    )
+
+    data class OsResult(
+        @JsonProperty("subtitles") val subtitles: ArrayList<OsSubtitles>? = arrayListOf(),
+    )
+
+    data class VidsrcSubtitles(
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("file") val file: String? = null,
+    )
+
+}
+
diff --git a/Superstream/src/main/kotlin/com/hexated/SuperstreamPlugin.kt b/Superstream/src/main/kotlin/com/hexated/SuperstreamPlugin.kt
new file mode 100644
index 00000000..099210fe
--- /dev/null
+++ b/Superstream/src/main/kotlin/com/hexated/SuperstreamPlugin.kt
@@ -0,0 +1,14 @@
+
+package com.hexated
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+
+@CloudstreamPlugin
+class SuperstreamPlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(Superstream())
+    }
+}
\ No newline at end of file

From 11075c0c7da5f8e426f7d08a5b23da2a5bb3a3a3 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 17 Jan 2024 12:04:00 +0700
Subject: [PATCH 082/125] fix #533, fix #534

---
 Movierulzhd/build.gradle.kts                                    | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Extractors.kt           | 2 +-
 OploverzProvider/build.gradle.kts                               | 2 +-
 .../src/main/kotlin/com/hexated/OploverzProvider.kt             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index d664810f..456a2524 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 58
+version = 59
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Extractors.kt b/Movierulzhd/src/main/kotlin/com/hexated/Extractors.kt
index c3a84b83..3daf620d 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Extractors.kt
@@ -68,5 +68,5 @@ open class Akamaicdn : ExtractorApi() {
 
 class AnimesagaStream : Chillx() {
     override val name = "AnimesagaStream"
-    override val mainUrl = "https://stream.animesaga.in"
+    override val mainUrl = "https://stream.anplay.in"
 }
diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts
index 80a9aded..c847f3ae 100644
--- a/OploverzProvider/build.gradle.kts
+++ b/OploverzProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 26
+version = 27
 
 
 cloudstream {
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
index fba9c4ba..c2505aa9 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class OploverzProvider : MainAPI() {
-    override var mainUrl = "https://oploverz.win"
+    override var mainUrl = "https://oploverz.cool"
     override var name = "Oploverz"
     override val hasMainPage = true
     override var lang = "id"

From c35f0bad57874a6920369359cc962b86969709d5 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:20:26 +0700
Subject: [PATCH 083/125] fix

---
 Minioppai/build.gradle.kts                    |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt | 35 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Minioppai/build.gradle.kts b/Minioppai/build.gradle.kts
index cb83145d..08ef2a02 100644
--- a/Minioppai/build.gradle.kts
+++ b/Minioppai/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 10
+version = 11
 
 
 cloudstream {
diff --git a/Minioppai/src/main/kotlin/com/hexated/Extractors.kt b/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
index d919bc5c..02582a4e 100644
--- a/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
@@ -7,6 +7,7 @@ import com.lagradost.cloudstream3.fixTitle
 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.fixUrl
 import com.lagradost.cloudstream3.utils.getAndUnpack
 import com.lagradost.cloudstream3.utils.getQualityFromName
@@ -32,41 +33,39 @@ open class Streampai : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val res = app.get(url, referer = referer).text
-        val data = getAndUnpack(res)
+        val res = app.get(url, referer = referer).document
+        val data = res.selectFirst("script:containsData(player =)")?.data() ?: return
 
-        val sources = data.substringAfter("sources:[").substringBefore("]").replace("\'", "\"")
-        val tracks = data.substringAfter("\"tracks\":[").substringBefore("]")
+        val sources = data.substringAfter("sources: [").substringBefore("]").replace("\'", "\"")
+            .addMarks("src")
+            .addMarks("type")
+            .addMarks("size")
+            .replace("\'", "\"")
 
         tryParseJson<List<Responses>>("[$sources]")?.forEach {
             callback.invoke(
                 ExtractorLink(
                     this.name,
                     this.name,
-                    fixUrl(it.file),
+                    fixUrl(it.src),
                     url,
-                    getQualityFromName(it.label),
+                    it.size ?: Qualities.Unknown.value,
                     headers = mapOf(
                         "Range" to "bytes=0-",
-                    )
-                )
-            )
-        }
-
-        tryParseJson<List<Responses>>("[$tracks]")?.forEach {
-            subtitleCallback.invoke(
-                SubtitleFile(
-                    fixTitle(it.label ?: ""),
-                    fixUrl(it.file),
+                    ),
                 )
             )
         }
     }
 
+    private fun String.addMarks(str: String): String {
+        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
+    }
+
     data class Responses(
-        @JsonProperty("file") val file: String,
+        @JsonProperty("src") val src: String,
         @JsonProperty("type") val type: String?,
-        @JsonProperty("label") val label: String?
+        @JsonProperty("size") val size: Int?
     )
 
 }
\ No newline at end of file

From 32a8516dc01423d52281659e0aa10e8830097fe9 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 17 Jan 2024 17:01:09 +0700
Subject: [PATCH 084/125] nimegami: fix search

---
 Nimegami/build.gradle.kts                        | 2 +-
 Nimegami/src/main/kotlin/com/hexated/Nimegami.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Nimegami/build.gradle.kts b/Nimegami/build.gradle.kts
index 9febe32e..e1c3af2e 100644
--- a/Nimegami/build.gradle.kts
+++ b/Nimegami/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 9
+version = 10
 
 
 cloudstream {
diff --git a/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt b/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
index 88b16a36..8c8079cf 100644
--- a/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/Nimegami.kt
@@ -81,7 +81,7 @@ class Nimegami : MainAPI() {
     override suspend fun search(query: String): List<SearchResponse> {
         val searchResponse = mutableListOf<SearchResponse>()
         for (i in 1..2) {
-            val res = app.get("$mainUrl/page/$i/?s=gintama&post_type=post").document.select("div.archive article")
+            val res = app.get("$mainUrl/page/$i/?s=$query&post_type=post").document.select("div.archive article")
                 .mapNotNull {
                     it.toSearchResult()
                 }

From ec7b24052bf45f533c7a3eb9274d1190f516bd88 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 17 Jan 2024 19:51:51 +0700
Subject: [PATCH 085/125] update

---
 .../src/main/kotlin/com/hexated/Extractors.kt    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Minioppai/src/main/kotlin/com/hexated/Extractors.kt b/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
index 02582a4e..3b8b8470 100644
--- a/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Minioppai/src/main/kotlin/com/hexated/Extractors.kt
@@ -36,12 +36,16 @@ open class Streampai : ExtractorApi() {
         val res = app.get(url, referer = referer).document
         val data = res.selectFirst("script:containsData(player =)")?.data() ?: return
 
-        val sources = data.substringAfter("sources: [").substringBefore("]").replace("\'", "\"")
+        val sources = data.substringAfter("sources: [").substringBefore("]")
             .addMarks("src")
             .addMarks("type")
             .addMarks("size")
             .replace("\'", "\"")
 
+        val tracks = data.substringAfter("tracks: [").substringBefore("]")
+            .replace("\'", "\"")
+
+
         tryParseJson<List<Responses>>("[$sources]")?.forEach {
             callback.invoke(
                 ExtractorLink(
@@ -56,6 +60,15 @@ open class Streampai : ExtractorApi() {
                 )
             )
         }
+
+        tryParseJson<List<Responses>>("[$tracks]")?.forEach {
+            subtitleCallback.invoke(
+                SubtitleFile(
+                    fixTitle(it.label ?: return@forEach),
+                    fixUrl(it.src)
+                )
+            )
+        }
     }
 
     private fun String.addMarks(str: String): String {
@@ -65,6 +78,7 @@ open class Streampai : ExtractorApi() {
     data class Responses(
         @JsonProperty("src") val src: String,
         @JsonProperty("type") val type: String?,
+        @JsonProperty("label") val label: String?,
         @JsonProperty("size") val size: Int?
     )
 

From ad6afcf702fad0939f254acd4aeeedcd4cf546c9 Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:22:17 +0530
Subject: [PATCH 086/125] change domain (#537)

---
 Movierulzhd/build.gradle.kts                           | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt    | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index 456a2524..71cc3ee9 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 59
+version = 60
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
index 8bad009b..da04e09a 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
@@ -12,7 +12,7 @@ import org.jsoup.Jsoup
 
 class Hdmovie2 : Movierulzhd() {
 
-    override var mainUrl = "https://hdmovie2.ist"
+    override var mainUrl = "https://hdmovie2.kim"
     override var name = "Hdmovie2"
     override val mainPage = mainPageOf(
         "trending" to "Trending",
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
index d2e786e2..11ceac40 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
@@ -11,7 +11,7 @@ import java.net.URI
 
 open class Movierulzhd : MainAPI() {
 
-    override var mainUrl = "https://movierulzhd.fit"
+    override var mainUrl = "https://movierulzhd.dog"
     var directUrl = ""
     override var name = "Movierulzhd"
     override val hasMainPage = true

From d80ec53b091161a20aeed4074658eb772f56d120 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 21 Jan 2024 19:39:02 +0700
Subject: [PATCH 087/125] sora: disabled mMovies

---
 Gomov/build.gradle.kts                        |  2 +-
 Gomov/src/main/kotlin/com/hexated/Gomov.kt    |  2 +-
 Gomov/src/main/kotlin/com/hexated/Ngefilm.kt  |  2 +-
 .../src/main/kotlin/com/hexated/Pusatfilm.kt  |  2 +-
 LayarKacaProvider/build.gradle.kts            |  2 +-
 .../kotlin/com/hexated/LayarKacaProvider.kt   |  4 +-
 .../src/main/kotlin/com/hexated/Extractors.kt | 38 ----------------
 .../com/hexated/OploverzProviderPlugin.kt     |  1 -
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 45 +++++++++++++++++++
 .../src/main/kotlin/com/hexated/SoraParser.kt | 17 +++++++
 .../src/main/kotlin/com/hexated/SoraStream.kt |  7 ++-
 .../main/kotlin/com/hexated/SoraStreamLite.kt | 10 +++--
 .../main/kotlin/com/hexated/Superstream.kt    |  2 -
 build.gradle.kts                              |  2 +-
 15 files changed, 84 insertions(+), 54 deletions(-)

diff --git a/Gomov/build.gradle.kts b/Gomov/build.gradle.kts
index d4cc776c..b9ed7bbb 100644
--- a/Gomov/build.gradle.kts
+++ b/Gomov/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 30
+version = 31
 
 android {
     defaultConfig {
diff --git a/Gomov/src/main/kotlin/com/hexated/Gomov.kt b/Gomov/src/main/kotlin/com/hexated/Gomov.kt
index b3eadaf1..908f2b62 100644
--- a/Gomov/src/main/kotlin/com/hexated/Gomov.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Gomov.kt
@@ -10,7 +10,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 open class Gomov : MainAPI() {
-    override var mainUrl = "https://gomov.bio"
+    override var mainUrl = "https://gomov.co"
     private var directUrl: String? = null
     override var name = "Gomov"
     override val hasMainPage = true
diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
index a54a5003..9ae96908 100644
--- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Ngefilm : Gomov() {
-    override var mainUrl = "https://tv3.ngefilm21.homes"
+    override var mainUrl = "https://tv4.ngefilm21.homes"
     override var name = "Ngefilm"
     override val mainPage = mainPageOf(
         "/page/%d/?s&search=advanced&post_type=movie&index&orderby&genre&movieyear&country&quality=" to "Movies Terbaru",
diff --git a/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt b/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
index e6053bf6..02709fbc 100644
--- a/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Pusatfilm.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.TvSeriesLoadResponse
 import com.lagradost.cloudstream3.*
 
 class Pusatfilm : Gomov() {
-    override var mainUrl = "https://pusatfilm21.vip"
+    override var mainUrl = "https://pf21.vip"
     override var name = "Pusatfilm"
     override val mainPage = mainPageOf(
         "film-terbaru/page/%d/" to "Film Terbaru",
diff --git a/LayarKacaProvider/build.gradle.kts b/LayarKacaProvider/build.gradle.kts
index 17b5bf69..2b098a66 100644
--- a/LayarKacaProvider/build.gradle.kts
+++ b/LayarKacaProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 19
+version = 20
 
 
 cloudstream {
diff --git a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
index 05b9dcd0..60321ed5 100644
--- a/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
+++ b/LayarKacaProvider/src/main/kotlin/com/hexated/LayarKacaProvider.kt
@@ -8,8 +8,8 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class LayarKacaProvider : MainAPI() {
-    override var mainUrl = "https://tv7.lk21official.wiki"
-    private var seriesUrl = "https://tv9.nontondrama.click"
+    override var mainUrl = "https://tv10.lk21official.wiki"
+    private var seriesUrl = "https://tv11.nontondrama.click"
     override var name = "LayarKaca"
     override val hasMainPage = true
     override var lang = "id"
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt b/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt
index 02a8f86d..dc673cb2 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/Extractors.kt
@@ -27,10 +27,7 @@ open class Qiwi : ExtractorApi() {
                 "$mainUrl/",
                 getIndexQuality(title),
                 headers = mapOf(
-                    "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
                     "Range" to "bytes=0-",
-                    "Sec-Fetch-Dest" to "video",
-                    "Sec-Fetch-Mode" to "no-cors",
                 )
             )
         )
@@ -42,39 +39,4 @@ open class Qiwi : ExtractorApi() {
             ?: Qualities.Unknown.value
     }
 
-}
-
-open class Mediafire : ExtractorApi() {
-    override val name = "Mediafire"
-    override val mainUrl = "https://www.mediafire.com"
-    override val requiresReferer = true
-
-    override suspend fun getUrl(
-            url: String,
-            referer: String?,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
-    ) {
-        val res = app.get(url, referer = referer).document
-        val title = res.select("div.dl-btn-label").text()
-        val video = res.selectFirst("a#downloadButton")?.attr("href")
-
-        callback.invoke(
-                ExtractorLink(
-                        this.name,
-                        this.name,
-                        video ?: return,
-                        "",
-                        getQuality(title),
-                        INFER_TYPE
-                )
-        )
-
-    }
-
-    private fun getQuality(str: String?): Int {
-        return Regex("(\\d{3,4})[pP]").find(str ?: "")?.groupValues?.getOrNull(1)?.toIntOrNull()
-                ?: Qualities.Unknown.value
-    }
-
 }
\ No newline at end of file
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt
index a635a694..ba7c0b85 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProviderPlugin.kt
@@ -11,6 +11,5 @@ class OploverzProviderPlugin: Plugin() {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(OploverzProvider())
         registerExtractorAPI(Qiwi())
-        registerExtractorAPI(Mediafire())
     }
 }
\ No newline at end of file
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 12d64480..3136cc81 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 218
+version = 219
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 8cdb4848..fc246a74 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1821,6 +1821,51 @@ object SoraExtractor : SoraStream() {
 
     }
 
+    suspend fun invokeMoflix(
+        tmdbId: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val id = (if(season == null) {
+            "tmdb|movie|$tmdbId"
+        } else {
+            "tmdb|series|$tmdbId"
+        }).let { base64Encode(it.toByteArray()) }
+
+        val loaderUrl = "$moflixAPI/api/v1/titles/$id?loader=titlePage"
+        val url = if(season == null) {
+            loaderUrl
+        } else {
+            val mediaId = app.get(loaderUrl, referer = "$moflixAPI/").parsedSafe<MoflixResponse>()?.title?.id
+            "$moflixAPI/api/v1/titles/$mediaId/seasons/$season/episodes/$episode?loader=episodePage"
+        }
+
+        val res = app.get(url, referer = "$moflixAPI/").parsedSafe<MoflixResponse>()
+        (res?.episode ?: res?.title)?.videos?.filter { it.category.equals("full", true) }?.apmap { iframe ->
+            val response = app.get(iframe.src ?: return@apmap, referer = "$moflixAPI/")
+            val host = getBaseUrl(iframe.src)
+            val doc = response.document.selectFirst("script:containsData(sources:)")?.data()
+            val script = if (doc.isNullOrEmpty()) {
+                getAndUnpack(response.text)
+            } else {
+                doc
+            }
+            val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return@apmap)?.groupValues?.getOrNull(1)
+            callback.invoke(
+                ExtractorLink(
+                    "Moflix",
+                    "Moflix [${iframe.name}]",
+                    m3u8 ?: return@apmap,
+                    "$host/",
+                    iframe.quality?.filter { it.isDigit() }?.toIntOrNull() ?: Qualities.Unknown.value,
+                    INFER_TYPE
+                )
+            )
+        }
+
+    }
+
     //TODO only subs
     suspend fun invokeWatchsomuch(
         imdbId: String? = null,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index fd388fbc..57d1a5d7 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -47,6 +47,23 @@ data class AniwaveServer(
     }
 }
 
+data class MoflixResponse(
+    @JsonProperty("title") val title: Episode? = null,
+    @JsonProperty("episode") val episode: Episode? = null,
+) {
+    data class Episode(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("videos") val videos: ArrayList<Videos>? = arrayListOf(),
+    ) {
+        data class Videos(
+            @JsonProperty("name") val name: String? = null,
+            @JsonProperty("category") val category: String? = null,
+            @JsonProperty("src") val src: String? = null,
+            @JsonProperty("quality") val quality: String? = null,
+        )
+    }
+}
+
 data class AniMedia(
     @JsonProperty("id") var id: Int? = null,
     @JsonProperty("idMal") var idMal: Int? = null
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 9fdb1441..aaadba69 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -44,6 +44,7 @@ import com.hexated.SoraExtractor.invokeVegamovies
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeMMovies
+import com.hexated.SoraExtractor.invokeMoflix
 import com.hexated.SoraExtractor.invokeOmovies
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
@@ -119,6 +120,7 @@ open class SoraStream : TmdbProvider() {
         const val aoneroomAPI = "https://api3.aoneroom.com"
         const val mMoviesAPI = "https://multimovies.uno"
         const val watchCartoonAPI = "https://www1.watchcartoononline.bz"
+        const val moflixAPI = "https://moflix-stream.xyz"
 
         const val fdMoviesAPI = "https://freedrivemovie.com"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
@@ -721,8 +723,11 @@ open class SoraStream : TmdbProvider() {
                         ?: res.year, res.season, res.episode, callback
                 )
             },
+//            {
+//                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+//            },
             {
-                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+                invokeMoflix(res.id, res.season, res.episode, callback)
             },
         )
 
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 8bd35537..13666051 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -30,6 +30,7 @@ import com.hexated.SoraExtractor.invokeVidSrc
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeMMovies
+import com.hexated.SoraExtractor.invokeMoflix
 import com.hexated.SoraExtractor.invokeOmovies
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
@@ -52,6 +53,9 @@ class SoraStreamLite : SoraStream() {
         val res = AppUtils.parseJson<LinkData>(data)
 
         argamap(
+            {
+                invokeMoflix(res.id, res.season, res.episode, callback)
+            },
             {
                 if (!res.isAnime) invokeWatchsomuch(
                     res.imdbId,
@@ -328,9 +332,9 @@ class SoraStreamLite : SoraStream() {
                         ?: res.year, res.season, res.episode, callback
                 )
             },
-            {
-                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
-            },
+//            {
+//                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
+//            },
         )
 
         return true
diff --git a/Superstream/src/main/kotlin/com/hexated/Superstream.kt b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
index 525e3607..2e63a684 100644
--- a/Superstream/src/main/kotlin/com/hexated/Superstream.kt
+++ b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
@@ -623,7 +623,6 @@ open class Superstream : MainAPI() {
         }
     }
 
-
     private data class LinkData(
         val id: Int,
         val type: Int,
@@ -633,7 +632,6 @@ open class Superstream : MainAPI() {
         val imdbId: String?,
     )
 
-
     data class LinkDataProp(
         @JsonProperty("code") val code: Int? = null,
         @JsonProperty("msg") val msg: String? = null,
diff --git a/build.gradle.kts b/build.gradle.kts
index f0d0f5c1..6e28f8fa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,7 +77,7 @@ subprojects {
         // https://github.com/recloudstream/cloudstream/blob/master/app/build.gradle
 
         implementation(kotlin("stdlib")) // adds standard kotlin features, like listOf, mapOf etc
-        implementation("com.github.Blatzar:NiceHttp:0.4.4") // http library
+        implementation("com.github.Blatzar:NiceHttp:0.4.5") // http library
         implementation("org.jsoup:jsoup:1.17.2") // html parser
         implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
         implementation("io.karn:khttp-android:0.1.2")

From 23c51e191fc72dabdc59baf54dec5787a75d6582 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Sun, 21 Jan 2024 20:08:22 +0700
Subject: [PATCH 088/125] fix

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 1 +
 SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index fc246a74..a13270f9 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1852,6 +1852,7 @@ object SoraExtractor : SoraStream() {
                 doc
             }
             val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return@apmap)?.groupValues?.getOrNull(1)
+            if(m3u8?.haveDub("$host/") == false) return@apmap
             callback.invoke(
                 ExtractorLink(
                     "Moflix",
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 6c7fde38..9e52fc36 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -800,6 +800,10 @@ suspend fun getCrunchyrollIdFromMalSync(aniId: String?): String? {
         ?: regex.find("$crunchyroll")?.groupValues?.getOrNull(1)
 }
 
+suspend fun String.haveDub(referer: String) : Boolean {
+    return app.get(this,referer=referer).text.contains("TYPE=AUDIO")
+}
+
 suspend fun convertTmdbToAnimeId(
     title: String?,
     date: String?,

From 1d492348ac0cc943bbc83d241958b81126674bea Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 22 Jan 2024 00:36:28 +0700
Subject: [PATCH 089/125] kuramanime: Child's Play

---
 KuramanimeProvider/build.gradle.kts                      | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt     | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/KuramanimeProvider/build.gradle.kts b/KuramanimeProvider/build.gradle.kts
index 7d620269..ecac4a69 100644
--- a/KuramanimeProvider/build.gradle.kts
+++ b/KuramanimeProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 36
+version = 37
 
 
 cloudstream {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index aaadba69..c4e713bf 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -727,7 +727,7 @@ open class SoraStream : TmdbProvider() {
 //                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
 //            },
             {
-                invokeMoflix(res.id, res.season, res.episode, callback)
+                if (!res.isAnime) invokeMoflix(res.id, res.season, res.episode, callback)
             },
         )
 
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 13666051..e38f4da7 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -54,7 +54,7 @@ class SoraStreamLite : SoraStream() {
 
         argamap(
             {
-                invokeMoflix(res.id, res.season, res.episode, callback)
+                if (!res.isAnime) invokeMoflix(res.id, res.season, res.episode, callback)
             },
             {
                 if (!res.isAnime) invokeWatchsomuch(

From 7415d651b92e3b01a80f33e33eec1ce61c0cbbf1 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 22 Jan 2024 03:34:03 +0700
Subject: [PATCH 090/125] <TAKO>

---
 KuramanimeProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KuramanimeProvider/build.gradle.kts b/KuramanimeProvider/build.gradle.kts
index ecac4a69..34bbe881 100644
--- a/KuramanimeProvider/build.gradle.kts
+++ b/KuramanimeProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 37
+version = 38
 
 
 cloudstream {

From 19cb214818f69b423c6d48ca28252ea65662c0ba Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 22 Jan 2024 06:11:17 +0700
Subject: [PATCH 091/125] =?UTF-8?q?=F0=9F=98=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 KuramanimeProvider/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KuramanimeProvider/build.gradle.kts b/KuramanimeProvider/build.gradle.kts
index 34bbe881..ae77707b 100644
--- a/KuramanimeProvider/build.gradle.kts
+++ b/KuramanimeProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 38
+version = 39
 
 
 cloudstream {

From 590ccaac14fe1dffd34eae919ee244af79cd778c Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Mon, 22 Jan 2024 19:50:41 +0700
Subject: [PATCH 092/125] fix #544, close #545

---
 Movierulzhd/build.gradle.kts                           | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index 71cc3ee9..a160c2b4 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 60
+version = 61
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
index 11ceac40..d1dd6ce4 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
@@ -11,7 +11,7 @@ import java.net.URI
 
 open class Movierulzhd : MainAPI() {
 
-    override var mainUrl = "https://movierulzhd.dog"
+    override var mainUrl = "https://movierulzhd.party"
     var directUrl = ""
     override var name = "Movierulzhd"
     override val hasMainPage = true

From 92a0b490d7c6c17a1804defc7f22444b5eb2b0f7 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:39:40 +0700
Subject: [PATCH 093/125] fix

---
 Superstream/build.gradle.kts                  |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt | 33 +++++++++++++------
 .../main/kotlin/com/hexated/Superstream.kt    |  5 +++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Superstream/build.gradle.kts b/Superstream/build.gradle.kts
index 6109c0eb..a51ee0af 100644
--- a/Superstream/build.gradle.kts
+++ b/Superstream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 1
+version = 2
 
 android {
     defaultConfig {
diff --git a/Superstream/src/main/kotlin/com/hexated/Extractors.kt b/Superstream/src/main/kotlin/com/hexated/Extractors.kt
index 73a21ff6..e6fd7605 100644
--- a/Superstream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Superstream/src/main/kotlin/com/hexated/Extractors.kt
@@ -1,7 +1,9 @@
 package com.hexated
 
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.cloudstream3.utils.*
+import java.net.URL
 
 object Extractors : Superstream() {
 
@@ -94,17 +96,28 @@ object Extractors : Superstream() {
 
         fids?.apmapIndexed { index, fileList ->
             val player = app.get("$thirdAPI/file/player?fid=${fileList.fid}&share_key=$shareKey").text
-            val video = """"(https.*?m3u8.*?)"""".toRegex().find(player)?.groupValues?.get(1)
-            callback.invoke(
-                ExtractorLink(
-                    "External",
-                    "External [Server ${index + 1}]",
-                    video?.replace("\\/", "/") ?: return@apmapIndexed,
-                    "$thirdAPI/",
-                    getIndexQuality(fileList.file_name),
-                    isM3u8 = true
+            val hls = """"(https.*?m3u8.*?)"""".toRegex().find(player)?.groupValues?.get(1)
+            val mp4 = "sources\\s*=\\s*(.*);".toRegex().find(player)?.groupValues?.get(1)?.let {
+                AppUtils.tryParseJson<List<ExternalSources>>(it)?.first()
+            }
+            listOf(
+                mp4?.file to mp4?.label,
+                hls to fileList.file_name
+            ).map {
+                val path = normalSafeApiCall { URL(it.first).path }.let { p ->
+                    if(p?.endsWith(".m3u8") == true) "HLS" else "MP4"
+                }
+                callback.invoke(
+                    ExtractorLink(
+                        "External $path",
+                        "External $path [Server ${index + 1}]",
+                        it.first?.replace("\\/", "/") ?: return@apmapIndexed,
+                        "$thirdAPI/",
+                        getIndexQuality(it.second),
+                        type = INFER_TYPE,
+                    )
                 )
-            )
+            }
         }
     }
 
diff --git a/Superstream/src/main/kotlin/com/hexated/Superstream.kt b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
index 2e63a684..24acd381 100644
--- a/Superstream/src/main/kotlin/com/hexated/Superstream.kt
+++ b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
@@ -774,6 +774,11 @@ open class Superstream : MainAPI() {
         }
     }
 
+    data class ExternalSources(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+    )
+
     data class WatchsomuchTorrents(
         @JsonProperty("id") val id: Int? = null,
         @JsonProperty("movieId") val movieId: Int? = null,

From a340c9ebec4cbe412aebae202407679ae3e558bc Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 25 Jan 2024 06:03:02 +0700
Subject: [PATCH 094/125] sora: disable SfMovies & fix CinemaTv

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 59 ++++++-------------
 .../src/main/kotlin/com/hexated/SoraParser.kt | 30 +++++++---
 .../src/main/kotlin/com/hexated/SoraStream.kt | 12 ++--
 .../main/kotlin/com/hexated/SoraStreamLite.kt | 12 ++--
 5 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 3136cc81..f5e85a9f 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 219
+version = 220
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index a13270f9..04d92787 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2337,43 +2337,23 @@ object SoraExtractor : SoraStream() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val id = imdbId?.removePrefix("tt")
-        val slug = title.createSlug()
-        val url = if (season == null) {
-            "$cinemaTvAPI/movies/play/$id-$slug-$year"
+        val media = app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "shows"}?filters[q]=$title")
+            .parsedSafe<CinemaTvResponse>()?.items?.find {
+                it.imdb_id?.removePrefix("tt")
+                    .equals(imdbId?.removePrefix("tt")) || (it.title.equals(
+                    title,
+                    true
+                ) && it.year == year)
+            } ?: return
+
+        val mediaId = if (season == null) {
+            media.id_movie
         } else {
-            "$cinemaTvAPI/shows/play/$id-$slug-$year"
-        }
+            app.get("$cinemaTvAPI/v1/shows?expand=episodes&id=${media.id_show}")
+                .parsedSafe<CinemaTvResponse>()?.episodes?.find { it.episode == episode && it.season == season }?.id
+        } ?: return
 
-        val session =
-            "PHPSESSID=ngr4cudjrimdnhkth30ssohs0n; _csrf=a6ffd7bb7654083fce6df528225a238d0e85aa1fb885dc7638c1259ec1ba0d5ca%3A2%3A%7Bi%3A0%3Bs%3A5%3A%22_csrf%22%3Bi%3A1%3Bs%3A32%3A%22mTTLiDLjxohs-CpKk0bjRH3HdYMB9uBV%22%3B%7D; _ga=GA1.1.1195498587.1701871187; _ga_VZD7HJ3WK6=GS1.1.$unixTime.4.0.1.$unixTime.0.0.0"
-
-        val headers = mapOf(
-            "Cookie" to session,
-            "x-requested-with" to "com.wwcinematv",
-        )
-
-        val doc = app.get(url, headers = headers).document
-        val script = doc.selectFirst("script:containsData(hash:)")?.data()
-        val hash = Regex("hash:\\s*['\"](\\S+)['\"]").find(script ?: return)?.groupValues?.get(1)
-        val expires = Regex("expires:\\s*(\\d+)").find(script)?.groupValues?.get(1)
-        val episodeId = (if (season == null) {
-            """id_movie:\s*(\d+)"""
-        } else {
-            """episode:\s*['"]$episode['"],[\n\s]+id_episode:\s*(\d+),[\n\s]+season:\s*['"]$season['"]"""
-        }).let { it.toRegex().find(script)?.groupValues?.get(1) }
-
-        val videoUrl = if (season == null) {
-            "$cinemaTvAPI/api/v1/security/movie-access?id_movie=$episodeId&hash=$hash&expires=$expires"
-        } else {
-            "$cinemaTvAPI/api/v1/security/episode-access?id_episode=$episodeId&hash=$hash&expires=$expires"
-        }
-
-        val sources = app.get(
-            videoUrl,
-            referer = url,
-            headers = mapOf("X-Requested-With" to "XMLHttpRequest")
-        ).parsedSafe<CinemaTvResponse>()
+        val sources = app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "episodes"}/view?expand=streams,subtitles&id=$mediaId").parsedSafe<CinemaTvResponse>()
 
         sources?.streams?.mapKeys { source ->
             callback.invoke(
@@ -2381,19 +2361,18 @@ object SoraExtractor : SoraStream() {
                     "CinemaTv",
                     "CinemaTv",
                     source.value,
-                    "$cinemaTvAPI/",
+                    "",
                     getQualityFromName(source.key),
                     true
                 )
             )
         }
 
-        sources?.subtitles?.map { sub ->
-            val file = sub.file.toString()
+        sources?.subtitles?.map {
             subtitleCallback.invoke(
                 SubtitleFile(
-                    sub.language ?: return@map,
-                    if (file.startsWith("[")) return@map else fixUrl(file, cinemaTvAPI),
+                    it.language ?: return@map,
+                    fixUrl(it.url ?: return@map, cinemaTvAPI)
                 )
             )
         }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 57d1a5d7..199833bf 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -191,15 +191,31 @@ data class JikanResponse(
     @JsonProperty("data") val data: JikanData? = null,
 )
 
-data class CinemaTvSubtitles(
-    @JsonProperty("language") val language: String? = null,
-    @JsonProperty("file") val file: Any? = null,
-)
-
 data class CinemaTvResponse(
+    @JsonProperty("items") val items: ArrayList<Items>? = arrayListOf(),
+    @JsonProperty("episodes") val episodes: ArrayList<Episodes>? = arrayListOf(),
     @JsonProperty("streams") val streams: HashMap<String, String>? = null,
-    @JsonProperty("subtitles") val subtitles: ArrayList<CinemaTvSubtitles>? = arrayListOf(),
-)
+    @JsonProperty("subtitles") val subtitles: ArrayList<Subtitles>? = arrayListOf(),
+    ) {
+    data class Items(
+        @JsonProperty("id_movie") val id_movie: Int? = null,
+        @JsonProperty("id_show") val id_show: Int? = null,
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("imdb_id") val imdb_id: String? = null,
+    )
+
+    data class Episodes(
+        @JsonProperty("id") val id: Int? = null,
+        @JsonProperty("season") val season: Int? = null,
+        @JsonProperty("episode") val episode: Int? = null,
+    )
+
+    data class Subtitles(
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("url") val url: String? = null,
+    )
+}
 
 data class VidsrctoResult(
     @JsonProperty("id") val id: String? = null,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index c4e713bf..ce4508ff 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -717,12 +717,12 @@ open class SoraStream : TmdbProvider() {
                     callback
                 )
             },
-            {
-                if (!res.isAnime) invokeSFMovies(
-                    res.id, res.title, res.airedYear
-                        ?: res.year, res.season, res.episode, callback
-                )
-            },
+//            {
+//                if (!res.isAnime) invokeSFMovies(
+//                    res.id, res.title, res.airedYear
+//                        ?: res.year, res.season, res.episode, callback
+//                )
+//            },
 //            {
 //                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
 //            },
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index e38f4da7..b4f38a3d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -326,12 +326,12 @@ class SoraStreamLite : SoraStream() {
                     callback
                 )
             },
-            {
-                if (!res.isAnime) invokeSFMovies(
-                    res.id, res.title, res.airedYear
-                        ?: res.year, res.season, res.episode, callback
-                )
-            },
+//            {
+//                if (!res.isAnime) invokeSFMovies(
+//                    res.id, res.title, res.airedYear
+//                        ?: res.year, res.season, res.episode, callback
+//                )
+//            },
 //            {
 //                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
 //            },

From c79ec79607eb336b360db83314d902b02042b61e Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:58:26 +0700
Subject: [PATCH 095/125] fix

---
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 04d92787..2e7de9c1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2194,8 +2194,7 @@ object SoraExtractor : SoraStream() {
         val savedCookies = mapOf(
             base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
         )
-        val req = app.get("$api/search/$query")
-        val doc = req.document
+        val doc = app.get("$api/search/$query").document
         val media = doc.select("div.$mediaSelector").map {
             Triple(it.attr("data-filmName"), it.attr("data-year"), it.select("a").attr("href"))
         }.let { el ->
@@ -2223,40 +2222,35 @@ object SoraExtractor : SoraStream() {
                 ?.attr("href")
         } ?: return
 
-        val users = if (season == null) {
-            media.third.substringAfterLast("/") to "0"
-        } else {
-            media.third.substringAfterLast("/") to iframe.substringAfterLast("/")
-                .substringBefore("-")
-        }
         val res = app.get(fixUrl(iframe, api), verify = false)
-        delay(2000)
-        val serverUrl = res.document.selectFirst("script:containsData(pushState)")?.data()?.let {
-            """,\s*'([^']+)""".toRegex().find(it)?.groupValues?.get(1)
-        } ?: return
         val cookies = savedCookies + res.cookies
+
         val url = res.document.select("meta[property=og:url]").attr("content")
         val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         val qualities = intArrayOf(2160, 1440, 1080, 720, 480, 360)
+
+        val (serverId, episodeId) = if(season == null) {
+            url.substringAfterLast("/") to "0"
+        } else {
+            url.substringBeforeLast("/").substringAfterLast("/") to url.substringAfterLast("/").substringBefore("-")
+        }
         val serverRes = app.get(
-            "$api/user/servers/${users.first}?ep=${users.second}",
+            "$api/user/servers/$serverId?ep=$episodeId",
             cookies = cookies,
             referer = url,
             headers = headers
         )
-        val unpack = getAndUnpack(serverRes.text)
-        val key = unpack.substringAfter("(key=").substringBefore(")")
-        val key2 = unpack.substringAfter("<\"").substringBefore("\".")
-        serverRes.document.select("ul li").amap { el ->
+        val serverDoc = serverRes.document
+        serverDoc.select("ul li").apmap { el ->
             val server = el.attr("data-value")
             val encryptedData = app.get(
-                "${fixUrl(serverUrl, api)}?server=$server&_=$unixTimeMS",
+                "$url?server=$server&_=$unixTimeMS",
                 cookies = cookies,
                 referer = url,
                 headers = headers
             ).text
-            val links = encryptedData.decrypt(key) ?: encryptedData.decrypt(key2) ?: return@amap
-            links.forEach { video ->
+            val links = encryptedData.decrypt(base64Decode("MTEx"))
+            links?.forEach { video ->
                 qualities.filter { it <= video.max.toInt() }.forEach {
                     callback(
                         ExtractorLink(

From de332e6b9c34cc1de99d3c6f57949144021e6818 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 25 Jan 2024 07:59:46 +0700
Subject: [PATCH 096/125] fix

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 2e7de9c1..26b3d960 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2164,7 +2164,7 @@ object SoraExtractor : SoraStream() {
             episode,
             callback,
             BuildConfig.OMOVIES_API,
-            "Omovies",
+            "Ghostx",
             base64Decode("X3NtUWFtQlFzRVRi"),
             base64Decode("X3NCV2NxYlRCTWFU")
         )

From 042954c4ed190ceb9f0f6128b871722e2f130d78 Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Thu, 25 Jan 2024 08:33:20 +0700
Subject: [PATCH 097/125] fix

---
 .github/workflows/build.yml                              | 2 +-
 SoraStream/build.gradle.kts                              | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt  | 5 ++---
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt     | 6 ++----
 SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt | 6 ++----
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e558ec6..b7fa6b04 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
           echo ZSHOW_API=$ZSHOW_API >> local.properties
           echo SFMOVIES_API=$SFMOVIES_API >> local.properties
           echo CINEMATV_API=$CINEMATV_API >> local.properties
-          echo OMOVIES_API=$OMOVIES_API >> local.properties
+          echo GHOSTX_API=$GHOSTX_API >> local.properties
           echo SUPERSTREAM_FIRST_API=$SUPERSTREAM_FIRST_API >> local.properties
           echo SUPERSTREAM_SECOND_API=$SUPERSTREAM_SECOND_API >> local.properties
           echo SUPERSTREAM_THIRD_API=$SUPERSTREAM_THIRD_API >> local.properties
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index f5e85a9f..41837eab 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -9,7 +9,7 @@ android {
         properties.load(project.rootProject.file("local.properties").inputStream())
 
         buildConfigField("String", "TMDB_API", "\"${properties.getProperty("TMDB_API")}\"")
-        buildConfigField("String", "OMOVIES_API", "\"${properties.getProperty("OMOVIES_API")}\"")
+        buildConfigField("String", "GHOSTX_API", "\"${properties.getProperty("GHOSTX_API")}\"")
         buildConfigField("String", "CINEMATV_API", "\"${properties.getProperty("CINEMATV_API")}\"")
         buildConfigField("String", "SFMOVIES_API", "\"${properties.getProperty("SFMOVIES_API")}\"")
         buildConfigField("String", "ZSHOW_API", "\"${properties.getProperty("ZSHOW_API")}\"")
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 26b3d960..6a0422a7 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1,7 +1,6 @@
 package com.hexated
 
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
@@ -2150,7 +2149,7 @@ object SoraExtractor : SoraStream() {
 
     }
 
-    suspend fun invokeOmovies(
+    suspend fun invokeGhostx(
         title: String? = null,
         year: Int? = null,
         season: Int? = null,
@@ -2163,7 +2162,7 @@ object SoraExtractor : SoraStream() {
             season,
             episode,
             callback,
-            BuildConfig.OMOVIES_API,
+            BuildConfig.GHOSTX_API,
             "Ghostx",
             base64Decode("X3NtUWFtQlFzRVRi"),
             base64Decode("X3NCV2NxYlRCTWFU")
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index ce4508ff..045ad668 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -36,16 +36,14 @@ import com.hexated.SoraExtractor.invokeEmovies
 import com.hexated.SoraExtractor.invokeHdmovies4u
 import com.hexated.SoraExtractor.invokeMultimovies
 import com.hexated.SoraExtractor.invokeNetmovies
-import com.hexated.SoraExtractor.invokeSFMovies
 import com.hexated.SoraExtractor.invokeShowflix
 import com.hexated.SoraExtractor.invokeTvMovies
 import com.hexated.SoraExtractor.invokeUhdmovies
 import com.hexated.SoraExtractor.invokeVegamovies
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
-import com.hexated.SoraExtractor.invokeMMovies
 import com.hexated.SoraExtractor.invokeMoflix
-import com.hexated.SoraExtractor.invokeOmovies
+import com.hexated.SoraExtractor.invokeGhostx
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
@@ -468,7 +466,7 @@ open class SoraStream : TmdbProvider() {
                 )
             },
             {
-                if (!res.isAnime) invokeOmovies(
+                if (!res.isAnime) invokeGhostx(
                     res.title,
                     res.year,
                     res.season,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index b4f38a3d..ace55c04 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -24,14 +24,12 @@ import com.hexated.SoraExtractor.invokeDumpStream
 import com.hexated.SoraExtractor.invokeEmovies
 import com.hexated.SoraExtractor.invokeMultimovies
 import com.hexated.SoraExtractor.invokeNetmovies
-import com.hexated.SoraExtractor.invokeSFMovies
 import com.hexated.SoraExtractor.invokeShowflix
 import com.hexated.SoraExtractor.invokeVidSrc
 import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
-import com.hexated.SoraExtractor.invokeMMovies
 import com.hexated.SoraExtractor.invokeMoflix
-import com.hexated.SoraExtractor.invokeOmovies
+import com.hexated.SoraExtractor.invokeGhostx
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
@@ -141,7 +139,7 @@ class SoraStreamLite : SoraStream() {
                 )
             },
             {
-                if (!res.isAnime) invokeOmovies(
+                if (!res.isAnime) invokeGhostx(
                     res.title,
                     res.year,
                     res.season,

From 8a31e3acb00232303d9133316d7e399c5747e107 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 14:56:40 +0700
Subject: [PATCH 098/125] sora: fix few sources

---
 .../src/main/kotlin/com/hexated/Extractors.kt |   6 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 141 +++++-------------
 .../src/main/kotlin/com/hexated/SoraParser.kt |   9 --
 .../src/main/kotlin/com/hexated/SoraStream.kt |  16 +-
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  16 +-
 .../kotlin/com/hexated/SoraStreamPlugin.kt    |   2 +-
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |  83 ++++-------
 7 files changed, 69 insertions(+), 204 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index b11a7d31..8026449c 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -436,9 +436,9 @@ class Streamwish : Filesim() {
     override var mainUrl = "https://streamwish.to"
 }
 
-class Wishfast : Filesim() {
-    override val name = "Wishfast"
-    override var mainUrl = "https://wishfast.top"
+class UqloadsXyz : Filesim() {
+    override val name = "Uqloads"
+    override var mainUrl = "https://uqloads.xyz"
 }
 
 class FilelionsTo : Filesim() {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 6a0422a7..b19d9a1d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -124,8 +124,8 @@ object SoraExtractor : SoraStream() {
             httpsify(srcrcp),
             referer = iframedoc
         ).document.selectFirst("script:containsData(Playerjs)")?.data()
-        val video = script?.substringAfter("file:\"#2")?.substringBefore("\"")
-            ?.replace(Regex("/.*?=?="), "")?.let { base64Decode(it) }
+        val video = script?.substringAfter("file:\"#9")?.substringBefore("\"")
+            ?.replace(Regex("/@#@\\S+?=?="), "")?.let { base64Decode(it) }
 
         callback.invoke(
             ExtractorLink(
@@ -135,66 +135,6 @@ object SoraExtractor : SoraStream() {
         )
     }
 
-    suspend fun invokeDbgo(
-        id: String? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-
-        val iframeDbgo: String?
-        val script = if (season == null) {
-            val doc = app.get("$dbgoAPI/imdb.php?id=$id").document
-            iframeDbgo = doc.select("div.myvideo iframe").attr("src")
-            app.get(iframeDbgo, referer = "$dbgoAPI/").document.select("script")
-                .find { it.data().contains("CDNplayerConfig =") }?.data()
-        } else {
-            val doc = app.get("$dbgoAPI/tv-imdb.php?id=$id&s=$season").document
-            iframeDbgo = doc.select("div.myvideo iframe").attr("src")
-            val token = app.get(
-                iframeDbgo,
-                referer = "$dbgoAPI/"
-            ).document.selectFirst("select#translator-name option")?.attr("data-token")
-            app.get("https://voidboost.net/serial/$token/iframe?s=$season&e=$episode&h=dbgo.fun").document.select(
-                "script"
-            ).find { it.data().contains("CDNplayerConfig =") }?.data()
-        } ?: return
-
-        val source =
-            Regex("['|\"]file['|\"]:\\s['|\"](#\\S+?)['|\"]").find(script)?.groupValues?.get(1)
-                ?: return
-        val subtitle =
-            Regex("['|\"]subtitle['|\"]:\\s['|\"](\\S+?)['|\"]").find(script)?.groupValues?.get(1)
-
-        val ref = getBaseUrl(iframeDbgo)
-        decryptStreamUrl(source).split(",").map { links ->
-            val quality = Regex("\\[(\\d*p.*?)]").find(links)?.groupValues?.getOrNull(1)?.trim()
-                ?: return@map null
-            links.replace("[$quality]", "").split(" or ").map { it.trim() }.map { link ->
-                val name = if (link.contains(".m3u8")) "Dbgo (Main)" else "Dbgo (Backup)"
-                callback.invoke(
-                    ExtractorLink(
-                        name,
-                        name,
-                        link,
-                        "$ref/",
-                        getQuality(quality),
-                        isM3u8 = link.contains(".m3u8"),
-                        headers = mapOf("Origin" to ref)
-                    )
-                )
-            }
-        }
-
-        subtitle?.split(",")?.map { sub ->
-            val language = Regex("\\[(.*)]").find(sub)?.groupValues?.getOrNull(1) ?: return@map null
-            val link = sub.replace("[$language]", "").trim()
-            subtitleCallback.invoke(SubtitleFile(getDbgoLanguage(language), link))
-        }
-
-    }
-
     suspend fun invokeDreamfilm(
         title: String? = null,
         season: Int? = null,
@@ -1787,21 +1727,21 @@ object SoraExtractor : SoraStream() {
     }
 
     suspend fun invokeSmashyStream(
-        imdbId: String? = null,
+        tmdbId: Int? = null,
         season: Int? = null,
         episode: Int? = null,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
         val url = if (season == null) {
-            "$smashyStreamAPI/playere.php?imdb=$imdbId"
+            "$smashyStreamAPI/playere.php?tmdb=$tmdbId"
         } else {
-            "$smashyStreamAPI/playere.php?imdb=$imdbId&season=$season&episode=$episode"
+            "$smashyStreamAPI/playere.php?tmdb=$tmdbId&season=$season&episode=$episode"
         }
 
         app.get(
             url,
-            referer = "https://smashystream.com/"
+            referer = "https://smashystream.xyz/"
         ).document.select("div#_default-servers a.server").map {
             it.attr("data-url") to it.text()
         }.apmap {
@@ -1809,11 +1749,9 @@ object SoraExtractor : SoraStream() {
                 "Player F" -> {
                     invokeSmashyFfix(it.second, it.first, url, subtitleCallback, callback)
                 }
-
-                "Player D (Hindi)" -> {
-                    invokeSmashyD(it.first, url, callback)
+                "Player SU" -> {
+                    invokeSmashySu(it.second, it.first, url, subtitleCallback, callback)
                 }
-
                 else -> return@apmap
             }
         }
@@ -2145,7 +2083,7 @@ object SoraExtractor : SoraStream() {
             ?: return
         val ref = getBaseUrl(framesrc)
         val id = framesrc.substringAfter("id=").substringBefore("&")
-        loadExtractor("https://wishfast.top/e/$id", "$ref/", subtitleCallback, callback)
+        loadExtractor("https://uqloads.xyz/e/$id", "$ref/", subtitleCallback, callback)
 
     }
 
@@ -2181,7 +2119,7 @@ object SoraExtractor : SoraStream() {
         episodeSelector: String,
     ) {
         fun String.decrypt(key: String): List<GpressSources>? {
-            return tryParseJson<List<GpressSources>>(base64Decode(this).decodePrimewireXor(key))
+            return tryParseJson<List<GpressSources>>(base64Decode(this).xorDecrypt(key))
         }
 
         val slug = getEpisodeSlug(season, episode)
@@ -2193,7 +2131,10 @@ object SoraExtractor : SoraStream() {
         val savedCookies = mapOf(
             base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
         )
-        val doc = app.get("$api/search/$query").document
+
+        var res = app.get("$api/search/$query")
+        val cookies = savedCookies + res.cookies
+        val doc = res.document
         val media = doc.select("div.$mediaSelector").map {
             Triple(it.attr("data-filmName"), it.attr("data-year"), it.select("a").attr("href"))
         }.let { el ->
@@ -2216,31 +2157,29 @@ object SoraExtractor : SoraStream() {
         val iframe = if (season == null) {
             media.third
         } else {
-            val res = app.get(fixUrl(media.third, api))
-            res.document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")
+            app.get(fixUrl(media.third, api), cookies = cookies)
+                .document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")
                 ?.attr("href")
-        } ?: return
-
-        val res = app.get(fixUrl(iframe, api), verify = false)
-        val cookies = savedCookies + res.cookies
+        }
 
+        res = app.get(fixUrl(iframe ?: return, api), cookies = cookies)
         val url = res.document.select("meta[property=og:url]").attr("content")
         val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         val qualities = intArrayOf(2160, 1440, 1080, 720, 480, 360)
 
-        val (serverId, episodeId) = if(season == null) {
+        val (serverId, episodeId) = if (season == null) {
             url.substringAfterLast("/") to "0"
         } else {
-            url.substringBeforeLast("/").substringAfterLast("/") to url.substringAfterLast("/").substringBefore("-")
+            url.substringBeforeLast("/").substringAfterLast("/") to url.substringAfterLast("/")
+                .substringBefore("-")
         }
         val serverRes = app.get(
             "$api/user/servers/$serverId?ep=$episodeId",
             cookies = cookies,
             referer = url,
             headers = headers
-        )
-        val serverDoc = serverRes.document
-        serverDoc.select("ul li").apmap { el ->
+        ).document
+        serverRes.select("ul li").apmap { el ->
             val server = el.attr("data-value")
             val encryptedData = app.get(
                 "$url?server=$server&_=$unixTimeMS",
@@ -2428,37 +2367,25 @@ object SoraExtractor : SoraStream() {
     suspend fun invokeRidomovies(
         tmdbId: Int? = null,
         imdbId: String? = null,
-        title: String? = null,
         season: Int? = null,
         episode: Int? = null,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val slug = if (season == null) {
-            app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
-                .parsedSafe<RidoSearch>()?.data?.items?.find {
-                    it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
-                }?.slug
-        } else {
-            app.get("$ridomoviesAPI/tv/${title.createSlug()}/season-$season/episode-$episode").text.substringAfterLast(
-                """postid\":\""""
-            ).substringBefore("""\"""")
-        } ?: return
-        val url = if (season == null) {
-            "$ridomoviesAPI/core/api/movies/$slug/videos"
-        } else {
-            "$ridomoviesAPI/core/api/episodes/$slug/videos"
-        }
+        val mediaSlug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId").parsedSafe<RidoSearch>()?.data?.items?.find {
+            it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
+        }?.slug ?: return
+
+        val id = season?.let {
+            val episodeUrl = "$ridomoviesAPI/tv/$mediaSlug/season-$it/episode-$episode"
+            app.get(episodeUrl).text.substringAfterLast("""postid\":\"""").substringBefore("""\""")
+        } ?: mediaSlug
+
+        val url = "$ridomoviesAPI/core/api/${if (season == null) "movies" else "episodes"}/$id/videos"
         app.get(url).parsedSafe<RidoResponses>()?.data?.apmap { link ->
             val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
             if (iframe.startsWith("https://closeload.top")) {
-                val unpacked =
-                    getAndUnpack(
-                        app.get(
-                            iframe,
-                            referer = "$ridomoviesAPI/"
-                        ).text
-                    )
+                val unpacked = getAndUnpack(app.get(iframe, referer = "$ridomoviesAPI/").text)
                 val video = Regex("=\"(aHR.*?)\";").find(unpacked)?.groupValues?.get(1)
                 callback.invoke(
                     ExtractorLink(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index 199833bf..b09fa747 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -460,15 +460,6 @@ data class SmashySources(
     @JsonProperty("subtitleUrls") var subtitleUrls: String? = null,
 )
 
-data class SmashyDSources(
-    @JsonProperty("sourceUrls") var sourceUrls: ArrayList<SmashyDSourcesUrls>? = arrayListOf(),
-)
-
-data class SmashyDSourcesUrls(
-    @JsonProperty("file") var file: String? = null,
-    @JsonProperty("title") var title: String? = null,
-)
-
 data class AoneroomResponse(
     @JsonProperty("data") val data: Data? = null,
 ) {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 045ad668..8d3033c4 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -6,7 +6,6 @@ import com.hexated.SoraExtractor.invokeAllMovieland
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
 import com.hexated.SoraExtractor.invokeBollyMaza
-import com.hexated.SoraExtractor.invokeDbgo
 import com.hexated.SoraExtractor.invokeFilmxy
 import com.hexated.SoraExtractor.invokeKimcartoon
 import com.hexated.SoraExtractor.invokeVidSrc
@@ -384,9 +383,6 @@ open class SoraStream : TmdbProvider() {
             {
                 invokeVidSrc(res.id, res.season, res.episode, callback)
             },
-            {
-                invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-            },
             {
                 if (!res.isAnime) invokeAoneroom(
                     res.title, res.airedYear
@@ -547,7 +543,7 @@ open class SoraStream : TmdbProvider() {
             },
             {
                 if (!res.isAnime) invokeSmashyStream(
-                    res.imdbId,
+                    res.id,
                     res.season,
                     res.episode,
                     subtitleCallback,
@@ -587,7 +583,6 @@ open class SoraStream : TmdbProvider() {
                 if (!res.isAnime) invokeRidomovies(
                     res.id,
                     res.imdbId,
-                    res.title,
                     res.season,
                     res.episode,
                     subtitleCallback,
@@ -715,15 +710,6 @@ open class SoraStream : TmdbProvider() {
                     callback
                 )
             },
-//            {
-//                if (!res.isAnime) invokeSFMovies(
-//                    res.id, res.title, res.airedYear
-//                        ?: res.year, res.season, res.episode, callback
-//                )
-//            },
-//            {
-//                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
-//            },
             {
                 if (!res.isAnime) invokeMoflix(res.id, res.season, res.episode, callback)
             },
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index ace55c04..9c09c047 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -4,7 +4,6 @@ import com.hexated.SoraExtractor.invoke2embed
 import com.hexated.SoraExtractor.invokeAllMovieland
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
-import com.hexated.SoraExtractor.invokeDbgo
 import com.hexated.SoraExtractor.invokeDoomovies
 import com.hexated.SoraExtractor.invokeDramaday
 import com.hexated.SoraExtractor.invokeDreamfilm
@@ -95,9 +94,6 @@ class SoraStreamLite : SoraStream() {
             {
                 invokeVidSrc(res.id, res.season, res.episode, callback)
             },
-            {
-                invokeDbgo(res.imdbId, res.season, res.episode, subtitleCallback, callback)
-            },
             {
                 if (!res.isAnime && res.isCartoon) invokeWatchCartoon(
                     res.title,
@@ -158,7 +154,7 @@ class SoraStreamLite : SoraStream() {
             },
             {
                 if (!res.isAnime) invokeSmashyStream(
-                    res.imdbId,
+                    res.id,
                     res.season,
                     res.episode,
                     subtitleCallback,
@@ -228,7 +224,6 @@ class SoraStreamLite : SoraStream() {
                 if (!res.isAnime) invokeRidomovies(
                     res.id,
                     res.imdbId,
-                    res.title,
                     res.season,
                     res.episode,
                     subtitleCallback,
@@ -324,15 +319,6 @@ class SoraStreamLite : SoraStream() {
                     callback
                 )
             },
-//            {
-//                if (!res.isAnime) invokeSFMovies(
-//                    res.id, res.title, res.airedYear
-//                        ?: res.year, res.season, res.episode, callback
-//                )
-//            },
-//            {
-//                invokeMMovies(res.title, res.season, res.episode, subtitleCallback, callback)
-//            },
         )
 
         return true
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
index abc461c1..32957fd2 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
@@ -25,7 +25,7 @@ class SoraStreamPlugin: Plugin() {
         registerExtractorAPI(Streamwish())
         registerExtractorAPI(FilelionsTo())
         registerExtractorAPI(Embedwish())
-        registerExtractorAPI(Wishfast())
+        registerExtractorAPI(UqloadsXyz())
         registerExtractorAPI(Uploadever())
         registerExtractorAPI(Netembed())
         registerExtractorAPI(Flaswish())
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 9e52fc36..3b1921db 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -18,17 +18,12 @@ import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.nicehttp.NiceResponse
 import com.lagradost.nicehttp.RequestBodyTypes
-import com.lagradost.nicehttp.Requests.Companion.await
 import com.lagradost.nicehttp.requestCreator
 import kotlinx.coroutines.delay
 import okhttp3.FormBody
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
 import org.jsoup.nodes.Document
 import java.math.BigInteger
 import java.net.*
@@ -38,7 +33,6 @@ import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 import java.text.SimpleDateFormat
 import java.util.*
-import java.util.concurrent.TimeUnit
 import javax.crypto.Cipher
 import javax.crypto.spec.GCMParameterSpec
 import javax.crypto.spec.IvParameterSpec
@@ -427,19 +421,39 @@ suspend fun invokeSmashyFfix(
 
 }
 
-suspend fun invokeSmashyD(
+suspend fun invokeSmashySu(
+    name: String,
     url: String,
     ref: String,
+    subtitleCallback: (SubtitleFile) -> Unit,
     callback: (ExtractorLink) -> Unit,
 ) {
     val json = app.get(url, referer = ref, headers = mapOf("X-Requested-With" to "XMLHttpRequest"))
-        .parsedSafe<SmashyDSources>()
-    json?.sourceUrls?.apmap {
-        M3u8Helper.generateM3u8(
-            "Smashy [Player D ${it.title}]",
-            it.file ?: return@apmap,
-            ""
-        ).forEach(callback)
+        .parsedSafe<SmashySources>()
+    json?.sourceUrls?.firstOrNull()?.removeSuffix(",")?.split(",")?.forEach { links ->
+        val quality = Regex("\\[(\\S+)]").find(links)?.groupValues?.getOrNull(1) ?: return@forEach
+        val trimmedLink = links.removePrefix("[$quality]").trim()
+        callback.invoke(
+            ExtractorLink(
+                "Smashy [$name]",
+                "Smashy [$name]",
+                trimmedLink,
+                "",
+                quality.toIntOrNull() ?: Qualities.Unknown.value,
+                INFER_TYPE
+            )
+        )
+    }
+
+    json?.subtitleUrls?.removeSuffix(",")?.split(",")?.forEach { sub ->
+        val lang = "\\[(.*)]".toRegex().find(sub)?.groupValues?.get(1)
+        val subUrl = sub.replace("[$lang]", "").trim()
+        subtitleCallback.invoke(
+            SubtitleFile(
+                lang ?: return@forEach,
+                subUrl
+            )
+        )
     }
 
 }
@@ -1038,7 +1052,7 @@ fun decodeIndexJson(json: String): String {
     return base64Decode(slug.substring(0, slug.length - 20))
 }
 
-fun String.decodePrimewireXor(key: String): String {
+fun String.xorDecrypt(key: String): String {
     val sb = StringBuilder()
     var i = 0
     while (i < this.length) {
@@ -1152,14 +1166,6 @@ fun getVipLanguage(str: String): String {
     }
 }
 
-fun getDbgoLanguage(str: String): String {
-    return when (str) {
-        "Русский" -> "Russian"
-        "Українська" -> "Ukrainian"
-        else -> str
-    }
-}
-
 fun fixCrunchyrollLang(language: String?): String? {
     return SubtitleHelper.fromTwoLettersToLanguage(language ?: return null)
         ?: SubtitleHelper.fromTwoLettersToLanguage(language.substringBefore("-"))
@@ -1216,37 +1222,6 @@ fun base64DecodeAPI(api: String): String {
     return api.chunked(4).map { base64Decode(it) }.reversed().joinToString("")
 }
 
-fun decryptStreamUrl(data: String): String {
-
-    fun getTrash(arr: List<String>, item: Int): List<String> {
-        val trash = ArrayList<List<String>>()
-        for (i in 1..item) {
-            trash.add(arr)
-        }
-        return trash.reduce { acc, list ->
-            val temp = ArrayList<String>()
-            acc.forEach { ac ->
-                list.forEach { li ->
-                    temp.add(ac.plus(li))
-                }
-            }
-            return@reduce temp
-        }
-    }
-
-    val trashList = listOf("@", "#", "!", "^", "$")
-    val trashSet = getTrash(trashList, 2) + getTrash(trashList, 3)
-    var trashString = data.replace("#2", "").split("//_//").joinToString("")
-
-    trashSet.forEach {
-        val temp = base64Encode(it.toByteArray())
-        trashString = trashString.replace(temp, "")
-    }
-
-    return base64Decode(trashString)
-
-}
-
 fun fixUrl(url: String, domain: String): String {
     if (url.startsWith("http")) {
         return url

From 9248417aeba3385b1306010ae76d928640778443 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:57:35 +0700
Subject: [PATCH 099/125] Superstream: small fix

---
 Superstream/build.gradle.kts                  |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt | 72 ++++++++-----------
 .../main/kotlin/com/hexated/Superstream.kt    |  2 +
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/Superstream/build.gradle.kts b/Superstream/build.gradle.kts
index a51ee0af..2bf7d8a9 100644
--- a/Superstream/build.gradle.kts
+++ b/Superstream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 2
+version = 3
 
 android {
     defaultConfig {
diff --git a/Superstream/src/main/kotlin/com/hexated/Extractors.kt b/Superstream/src/main/kotlin/com/hexated/Extractors.kt
index e6fd7605..1d0fd0e3 100644
--- a/Superstream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Superstream/src/main/kotlin/com/hexated/Extractors.kt
@@ -68,55 +68,43 @@ object Extractors : Superstream() {
         callback: (ExtractorLink) -> Unit,
     ) {
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-        val shareKey = app.get(
-            "$fourthAPI/index/share_link?id=${mediaId}&type=$type"
-        ).parsedSafe<ExternalResponse>()?.data?.link?.substringAfterLast("/")
+        val shareKey = app.get("$fourthAPI/index/share_link?id=${mediaId}&type=$type")
+            .parsedSafe<ExternalResponse>()?.data?.link?.substringAfterLast("/") ?: return
 
         val headers = mapOf("Accept-Language" to "en")
-        val shareRes = app.get(
-            "$thirdAPI/file/file_share_list?share_key=${shareKey ?: return}",
-            headers = headers
-        ).parsedSafe<ExternalResponse>()?.data
+        val shareRes = app.get("$thirdAPI/file/file_share_list?share_key=$shareKey", headers = headers)
+            .parsedSafe<ExternalResponse>()?.data ?: return
 
         val fids = if (season == null) {
-            shareRes?.file_list
+            shareRes.file_list
         } else {
-            val parentId =
-                shareRes?.file_list?.find { it.file_name.equals("season $season", true) }?.fid
-            app.get(
-                "$thirdAPI/file/file_share_list?share_key=$shareKey&parent_id=$parentId&page=1",
-                headers = headers
-            ).parsedSafe<ExternalResponse>()?.data?.file_list?.filter {
-                it.file_name?.contains(
-                    "s${seasonSlug}e${episodeSlug}",
-                    true
-                ) == true
-            }
-        }
-
-        fids?.apmapIndexed { index, fileList ->
-            val player = app.get("$thirdAPI/file/player?fid=${fileList.fid}&share_key=$shareKey").text
-            val hls = """"(https.*?m3u8.*?)"""".toRegex().find(player)?.groupValues?.get(1)
-            val mp4 = "sources\\s*=\\s*(.*);".toRegex().find(player)?.groupValues?.get(1)?.let {
-                AppUtils.tryParseJson<List<ExternalSources>>(it)?.first()
-            }
-            listOf(
-                mp4?.file to mp4?.label,
-                hls to fileList.file_name
-            ).map {
-                val path = normalSafeApiCall { URL(it.first).path }.let { p ->
-                    if(p?.endsWith(".m3u8") == true) "HLS" else "MP4"
+            val parentId = shareRes.file_list?.find { it.file_name.equals("season $season", true) }?.fid
+            app.get("$thirdAPI/file/file_share_list?share_key=$shareKey&parent_id=$parentId&page=1", headers = headers)
+                .parsedSafe<ExternalResponse>()?.data?.file_list?.filter {
+                    it.file_name?.contains("s${seasonSlug}e${episodeSlug}", true) == true
                 }
-                callback.invoke(
-                    ExtractorLink(
-                        "External $path",
-                        "External $path [Server ${index + 1}]",
-                        it.first?.replace("\\/", "/") ?: return@apmapIndexed,
-                        "$thirdAPI/",
-                        getIndexQuality(it.second),
-                        type = INFER_TYPE,
+        } ?: return
+
+        fids.apmapIndexed { index, fileList ->
+            val player = app.get("$thirdAPI/file/player?fid=${fileList.fid}&share_key=$shareKey").text
+            val sources = "sources\\s*=\\s*(.*);".toRegex().find(player)?.groupValues?.get(1)
+            val qualities = "quality_list\\s*=\\s*(.*);".toRegex().find(player)?.groupValues?.get(1)
+            listOf(sources, qualities).forEach {
+                AppUtils.tryParseJson<ArrayList<ExternalSources>>(it)?.forEach org@{ source ->
+                    val format = if (source.type == "video/mp4") ExtractorLinkType.VIDEO else ExtractorLinkType.M3U8
+                    val label = if (format == ExtractorLinkType.M3U8) "Hls" else "Mp4"
+                    if(!(source.label == "AUTO" || format == ExtractorLinkType.VIDEO)) return@org
+                    callback.invoke(
+                        ExtractorLink(
+                            "External",
+                            "External $label [Server ${index + 1}]",
+                            (source.m3u8_url ?: source.file)?.replace("\\/", "/") ?: return@org,
+                            "",
+                            getIndexQuality(if (format == ExtractorLinkType.M3U8) fileList.file_name else source.label),
+                            type = format,
+                        )
                     )
-                )
+                }
             }
         }
     }
diff --git a/Superstream/src/main/kotlin/com/hexated/Superstream.kt b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
index 24acd381..bd971a67 100644
--- a/Superstream/src/main/kotlin/com/hexated/Superstream.kt
+++ b/Superstream/src/main/kotlin/com/hexated/Superstream.kt
@@ -775,8 +775,10 @@ open class Superstream : MainAPI() {
     }
 
     data class ExternalSources(
+        @JsonProperty("m3u8_url") val m3u8_url: String? = null,
         @JsonProperty("file") val file: String? = null,
         @JsonProperty("label") val label: String? = null,
+        @JsonProperty("type") val type: String? = null,
     )
 
     data class WatchsomuchTorrents(

From 128e4d90b081804c0ee118b0a0b65190955124b2 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 18:28:54 +0700
Subject: [PATCH 100/125] fix

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7fa6b04..6a9cc822 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,7 +54,7 @@ jobs:
           ZSHOW_API: ${{ secrets.ZSHOW_API }}
           SFMOVIES_API: ${{ secrets.SFMOVIES_API }}
           CINEMATV_API: ${{ secrets.CINEMATV_API }}
-          OMOVIES_API: ${{ secrets.OMOVIES_API }}
+          GHOSTX_API: ${{ secrets.GHOSTX_API }}
           SUPERSTREAM_FIRST_API: ${{ secrets.SUPERSTREAM_FIRST_API }}
           SUPERSTREAM_SECOND_API: ${{ secrets.SUPERSTREAM_SECOND_API }}
           SUPERSTREAM_THIRD_API: ${{ secrets.SUPERSTREAM_THIRD_API }}

From da8defa79512624187046dd28f8431df29462bc2 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 18:40:14 +0700
Subject: [PATCH 101/125] fix

---
 SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 3b1921db..ed5e5a36 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -439,7 +439,7 @@ suspend fun invokeSmashySu(
                 "Smashy [$name]",
                 trimmedLink,
                 "",
-                quality.toIntOrNull() ?: Qualities.Unknown.value,
+                getQualityFromName(quality),
                 INFER_TYPE
             )
         )

From d039139237aaf44d8eb1a76c270a37760e76c379 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 18:46:52 +0700
Subject: [PATCH 102/125] fix

---
 .../src/main/kotlin/com/hexated/SoraExtractor.kt    |  3 ++-
 SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index b19d9a1d..b48cc5e1 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1750,8 +1750,9 @@ object SoraExtractor : SoraStream() {
                     invokeSmashyFfix(it.second, it.first, url, subtitleCallback, callback)
                 }
                 "Player SU" -> {
-                    invokeSmashySu(it.second, it.first, url, subtitleCallback, callback)
+                    invokeSmashySu(it.second, it.first, url, callback)
                 }
+
                 else -> return@apmap
             }
         }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index ed5e5a36..6560a0f9 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -425,7 +425,6 @@ suspend fun invokeSmashySu(
     name: String,
     url: String,
     ref: String,
-    subtitleCallback: (SubtitleFile) -> Unit,
     callback: (ExtractorLink) -> Unit,
 ) {
     val json = app.get(url, referer = ref, headers = mapOf("X-Requested-With" to "XMLHttpRequest"))
@@ -444,18 +443,6 @@ suspend fun invokeSmashySu(
             )
         )
     }
-
-    json?.subtitleUrls?.removeSuffix(",")?.split(",")?.forEach { sub ->
-        val lang = "\\[(.*)]".toRegex().find(sub)?.groupValues?.get(1)
-        val subUrl = sub.replace("[$lang]", "").trim()
-        subtitleCallback.invoke(
-            SubtitleFile(
-                lang ?: return@forEach,
-                subUrl
-            )
-        )
-    }
-
 }
 
 suspend fun getDumpIdAndType(title: String?, year: Int?, season: Int?): Pair<String?, Int?> {

From 9130622d4ccf5066e4066f4cc67e275326260ac7 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 19:49:06 +0700
Subject: [PATCH 103/125] update domain

---
 OploverzProvider/build.gradle.kts                               | 2 +-
 .../src/main/kotlin/com/hexated/OploverzProvider.kt             | 2 +-
 RebahinProvider/build.gradle.kts                                | 2 +-
 RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts
index c847f3ae..bc8d4a59 100644
--- a/OploverzProvider/build.gradle.kts
+++ b/OploverzProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 27
+version = 28
 
 
 cloudstream {
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
index c2505aa9..00cd0b41 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class OploverzProvider : MainAPI() {
-    override var mainUrl = "https://oploverz.cool"
+    override var mainUrl = "https://oploverz.bio"
     override var name = "Oploverz"
     override val hasMainPage = true
     override var lang = "id"
diff --git a/RebahinProvider/build.gradle.kts b/RebahinProvider/build.gradle.kts
index 6f308335..0108e9c8 100644
--- a/RebahinProvider/build.gradle.kts
+++ b/RebahinProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 8
+version = 9
 
 
 cloudstream {
diff --git a/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt b/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt
index da0cb643..945e4eca 100644
--- a/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt
+++ b/RebahinProvider/src/main/kotlin/com/hexated/Cgvindo.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.TvType
 
 class Cgvindo : RebahinProvider() {
-    override var mainUrl = "http://198.54.124.245"
+    override var mainUrl = "http://cgvindo.lol"
     override var name = "Cgvindo"
 
 }

From c4de07abb3c00a9e1ab359bef1f6d8ada32fe65f Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 25 Jan 2024 23:09:52 +0700
Subject: [PATCH 104/125] fix #528

---
 TimefourTv/build.gradle.kts                   |   2 +-
 .../src/main/kotlin/com/hexated/TimefourTv.kt | 101 +++++++++---------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index f160d38c..a28f5bbf 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 22
+version = 23
 
 
 cloudstream {
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
index 45f25ec2..53eef45d 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
@@ -4,7 +4,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.Qualities
 import org.jsoup.nodes.Element
 import java.net.URI
 
@@ -14,22 +14,22 @@ class TimefourTv : MainAPI() {
     override val hasDownloadSupport = false
     override val hasMainPage = true
     override val supportedTypes = setOf(
-            TvType.Live
+        TvType.Live
     )
 
     private val homePoster =
-            "https://cdn.discordapp.com/attachments/1109266606292488297/1193060449193840681/Screenshot_2024-01-06_at_12-14-16_Logo_Maker_Used_By_2.3_Million_Startups.png"
+        "https://cdn.discordapp.com/attachments/1109266606292488297/1193060449193840681/Screenshot_2024-01-06_at_12-14-16_Logo_Maker_Used_By_2.3_Million_Startups.png"
     private val detailPoster =
-            "https://cdn.discordapp.com/attachments/1109266606292488297/1193060448929595454/Screenshot_2024-01-06_at_12-13-02_Logo_Maker_Used_By_2.3_Million_Startups.png"
+        "https://cdn.discordapp.com/attachments/1109266606292488297/1193060448929595454/Screenshot_2024-01-06_at_12-13-02_Logo_Maker_Used_By_2.3_Million_Startups.png"
 
     override val mainPage = mainPageOf(
-            "$mainUrl/24-7-channels.php" to "24/7 Channels",
-            "$mainUrl/schedule/schedule-generated.json" to "Schedule Channels"
+        "$mainUrl/24-7-channels.php" to "24/7 Channels",
+        "$mainUrl/schedule/schedule-generated.json" to "Schedule Channels"
     )
 
     override suspend fun getMainPage(
-            page: Int,
-            request: MainPageRequest
+        page: Int,
+        request: MainPageRequest
     ): HomePageResponse {
         val items = mutableListOf<HomePageList>()
         if (request.name == "24/7 Channels") {
@@ -46,11 +46,11 @@ class TimefourTv : MainAPI() {
                 val header = tag.key
                 val channels = tag.value.mapNotNull {
                     LiveSearchResponse(
-                            it.key,
-                            Item(it.key, items = it.value.toJson()).toJson(),
-                            this@TimefourTv.name,
-                            TvType.Live,
-                            posterUrl = homePoster,
+                        it.key,
+                        Item(it.key, items = it.value.toJson()).toJson(),
+                        this@TimefourTv.name,
+                        TvType.Live,
+                        posterUrl = homePoster,
                     )
                 }
                 if (channels.isNotEmpty()) items.add(HomePageList(header, channels, true))
@@ -64,11 +64,11 @@ class TimefourTv : MainAPI() {
         val title = this.select("strong").text()
         val href = fixUrl(this.select("a").attr("href"))
         return LiveSearchResponse(
-                title,
-                Item(title, href).toJson(),
-                this@TimefourTv.name,
-                TvType.Live,
-                posterUrl = homePoster,
+            title,
+            Item(title, href).toJson(),
+            this@TimefourTv.name,
+            TvType.Live,
+            posterUrl = homePoster,
         )
     }
 
@@ -88,18 +88,18 @@ class TimefourTv : MainAPI() {
             val items = AppUtils.parseJson<ArrayList<Items>>(data.items)
             items.mapNotNull { eps ->
                 Episode(
-                        data = eps.channels?.toJson() ?: return@mapNotNull null,
-                        name = "${eps.event} • ${eps.time}",
-                        description = eps.channels.map { it.channel_name }.joinToString(" • "),
-                        posterUrl = detailPoster,
+                    data = eps.channels?.toJson() ?: return@mapNotNull null,
+                    name = "${eps.event} • ${eps.time}",
+                    description = eps.channels.map { it.channel_name }.joinToString(" • "),
+                    posterUrl = detailPoster,
                 )
             }
         }
         return newTvSeriesLoadResponse(
-                data.title ?: "",
-                url,
-                TvType.TvSeries,
-                episodes = episodes
+            data.title ?: "",
+            url,
+            TvType.TvSeries,
+            episodes = episodes
         ) {
             posterUrl = homePoster
         }
@@ -107,29 +107,34 @@ class TimefourTv : MainAPI() {
     }
 
     override suspend fun loadLinks(
-            data: String,
-            isCasting: Boolean,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ): Boolean {
 
         val json = AppUtils.parseJson<ArrayList<Channels>>(data)
 
         json.apmap {
             val iframe = app.get(
-                    fixChannelUrl(
-                            it.channel_id ?: return@apmap
-                    )
+                fixChannelUrl(
+                    it.channel_id ?: return@apmap
+                )
             ).document.selectFirst("iframe#thatframe")?.attr("src")
-                    ?: throw ErrorLoadingException("No Iframe Found")
+                ?: throw ErrorLoadingException("No Iframe Found")
             val host = getBaseUrl(iframe)
             val video = extractVideo(iframe)
 
-            M3u8Helper.generateM3u8(
+            callback.invoke(
+                ExtractorLink(
+                    this.name,
                     it.channel_name ?: return@apmap,
                     video ?: return@apmap,
                     "$host/",
-            ).forEach(callback)
+                    Qualities.Unknown.value,
+                    isM3u8 = true,
+                )
+            )
         }
 
         return true
@@ -138,13 +143,13 @@ class TimefourTv : MainAPI() {
     private suspend fun extractVideo(url: String): String? {
         val res = app.get(url, referer = mainUrl)
         return Regex("""source:['"](\S+.m3u8)['"],""").find(res.text)?.groupValues?.getOrNull(
-                1
+            1
         ) ?: run {
             val scriptData =
-                    res.document.selectFirst("div#player")?.nextElementSibling()?.data()
-                            ?.substringAfterLast("return(")?.substringBefore(".join")
+                res.document.selectFirst("div#player")?.nextElementSibling()?.data()
+                    ?.substringAfterLast("return(")?.substringBefore(".join")
             scriptData?.removeSurrounding("[", "]")?.replace("\"", "")?.split(",")
-                    ?.joinToString("")
+                ?.joinToString("")
         }
     }
 
@@ -163,20 +168,20 @@ class TimefourTv : MainAPI() {
     }
 
     data class Item(
-            val title: String? = null,
-            val url: String? = null,
-            val items: String? = null,
+        val title: String? = null,
+        val url: String? = null,
+        val items: String? = null,
     )
 
     data class Items(
-            val time: String? = null,
-            val event: String? = null,
-            val channels: ArrayList<Channels>? = arrayListOf(),
+        val time: String? = null,
+        val event: String? = null,
+        val channels: ArrayList<Channels>? = arrayListOf(),
     )
 
     data class Channels(
-            val channel_name: String? = null,
-            val channel_id: String? = null,
+        val channel_name: String? = null,
+        val channel_id: String? = null,
     )
 
 }
\ No newline at end of file

From 25ab02c4763c9068767b1de14d81de5822479567 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 26 Jan 2024 02:21:19 +0700
Subject: [PATCH 105/125] Nimegami: added Videogami

---
 Nimegami/build.gradle.kts                     |  2 +-
 .../src/main/kotlin/com/hexated/Extractors.kt | 25 ++++++++++++++-----
 .../main/kotlin/com/hexated/NimegamiPlugin.kt |  1 +
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |  6 ++---
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Nimegami/build.gradle.kts b/Nimegami/build.gradle.kts
index e1c3af2e..29da8e82 100644
--- a/Nimegami/build.gradle.kts
+++ b/Nimegami/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 10
+version = 11
 
 
 cloudstream {
diff --git a/Nimegami/src/main/kotlin/com/hexated/Extractors.kt b/Nimegami/src/main/kotlin/com/hexated/Extractors.kt
index 3452bf15..f67b59d6 100644
--- a/Nimegami/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/Extractors.kt
@@ -1,12 +1,8 @@
 package com.hexated
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.utils.*
 
 open class Mitedrive : ExtractorApi() {
     override val name = "Mitedrive"
@@ -79,4 +75,21 @@ open class Berkasdrive : ExtractorApi() {
 
     }
 
+}
+
+open class Videogami : ExtractorApi() {
+    override val name = "Videogami"
+    override val mainUrl = "https://video.nimegami.id"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val id = base64Decode(url.substringAfter("url=")).substringAfterLast("/")
+        loadExtractor("https://hxfile.co/embed-$id.html", "$mainUrl/", subtitleCallback, callback)
+    }
+
 }
\ No newline at end of file
diff --git a/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt b/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt
index 87802ce3..fe6de7b7 100644
--- a/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt
+++ b/Nimegami/src/main/kotlin/com/hexated/NimegamiPlugin.kt
@@ -12,5 +12,6 @@ class NimegamiPlugin: Plugin() {
         registerMainAPI(Nimegami())
         registerExtractorAPI(Mitedrive())
         registerExtractorAPI(Berkasdrive())
+        registerExtractorAPI(Videogami())
     }
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 6560a0f9..f6b3f13d 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -1065,9 +1065,9 @@ fun vidsrctoDecrypt(text: String): String {
 }
 
 fun String?.createSlug(): String? {
-    return this?.replace(Regex("[^\\w\\s-]"), "")
-        ?.replace(" ", "-")
-        ?.replace(Regex("( – )|( -)|(- )|(--)"), "-")
+    return this?.filter { it.isWhitespace() || it.isLetterOrDigit() }
+        ?.trim()
+        ?.replace("\\s+".toRegex(), "-")
         ?.lowercase()
 }
 

From 2a24701ca1162fe41c546883bf89e558f4cf057c Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 26 Jan 2024 19:03:51 +0700
Subject: [PATCH 106/125] Anichi: removed dead source

---
 Anichi/build.gradle.kts                       |  4 +-
 Anichi/src/main/kotlin/com/hexated/Anichi.kt  | 27 ++------
 .../kotlin/com/hexated/AnichiExtractors.kt    | 61 -------------------
 .../main/kotlin/com/hexated/AnichiParser.kt   | 35 -----------
 4 files changed, 8 insertions(+), 119 deletions(-)

diff --git a/Anichi/build.gradle.kts b/Anichi/build.gradle.kts
index 643809b0..8d4ce77f 100644
--- a/Anichi/build.gradle.kts
+++ b/Anichi/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 9
+version = 10
 
 android {
     defaultConfig {
@@ -38,5 +38,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://media.discordapp.net/attachments/1059306855865782282/1123970193274712096/Anichi.png"
+    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1200409381813100554/Untitled-removebg-preview.png"
 }
\ No newline at end of file
diff --git a/Anichi/src/main/kotlin/com/hexated/Anichi.kt b/Anichi/src/main/kotlin/com/hexated/Anichi.kt
index bbad3ae7..0ddfae48 100644
--- a/Anichi/src/main/kotlin/com/hexated/Anichi.kt
+++ b/Anichi/src/main/kotlin/com/hexated/Anichi.kt
@@ -1,6 +1,5 @@
 package com.hexated
 
-import com.hexated.AnichiExtractors.invokeExternalSources
 import com.hexated.AnichiExtractors.invokeInternalSources
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
@@ -214,25 +213,12 @@ open class Anichi : MainAPI() {
 
         val loadData = parseJson<AnichiLoadData>(data)
 
-        argamap(
-            {
-                invokeInternalSources(
-                    loadData.hash,
-                    loadData.dubStatus,
-                    loadData.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
-            {
-                invokeExternalSources(
-                    loadData.idMal,
-                    loadData.dubStatus,
-                    loadData.episode,
-                    subtitleCallback,
-                    callback
-                )
-            }
+        invokeInternalSources(
+            loadData.hash,
+            loadData.dubStatus,
+            loadData.episode,
+            subtitleCallback,
+            callback
         )
 
         return true
@@ -245,7 +231,6 @@ open class Anichi : MainAPI() {
 
         const val anilistApi = "https://graphql.anilist.co"
         const val jikanApi = "https://api.jikan.moe/v4"
-        const val marinHost = "https://marin.moe"
 
         private const val mainHash = "e42a4466d984b2c0a2cecae5dd13aa68867f634b16ee0f17b380047d14482406"
         private const val popularHash = "31a117653812a2547fd981632e8c99fa8bf8a75c4ef1a77a1567ef1741a7ab9c"
diff --git a/Anichi/src/main/kotlin/com/hexated/AnichiExtractors.kt b/Anichi/src/main/kotlin/com/hexated/AnichiExtractors.kt
index 86d452ed..a41b2c54 100644
--- a/Anichi/src/main/kotlin/com/hexated/AnichiExtractors.kt
+++ b/Anichi/src/main/kotlin/com/hexated/AnichiExtractors.kt
@@ -121,67 +121,6 @@ object AnichiExtractors : Anichi() {
         }
     }
 
-    suspend fun invokeExternalSources(
-        idMal: Int? = null,
-        dubStatus: String,
-        episode: String,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ) {
-        val ids = app.get("https://api.malsync.moe/mal/anime/${idMal ?: return}")
-            .parsedSafe<MALSyncResponses>()?.sites
-
-        if (dubStatus == "sub") invokeMarin(ids?.marin?.keys?.firstOrNull(), episode, callback)
-
-    }
-
-    private suspend fun invokeMarin(
-        id: String? = null,
-        episode: String,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val url = "$marinHost/anime/${id ?: return}/$episode"
-        val cookies = app.get(
-            "$marinHost/anime",
-            headers = mapOf(
-                "Cookie" to "__ddg1_=;__ddg2_=;"
-            ),
-            referer = "$marinHost/anime",
-        ).cookies.let {
-            decode(it["XSRF-TOKEN"].toString()) to decode(it["marin_session"].toString())
-        }
-
-        val json = app.get(
-            url,
-            headers = mapOf(
-                "Accept" to "text/html, application/xhtml+xml",
-                "Cookie" to "__ddg1=;__ddg2_=;XSRF-TOKEN=${cookies.first};marin_session=${cookies.second};",
-                "X-XSRF-TOKEN" to cookies.first
-            ),
-            referer = "$marinHost/anime/$id"
-        ).document.selectFirst("div#app")?.attr("data-page")
-        tryParseJson<MarinResponses>(json)?.props?.video?.data?.mirror?.map { video ->
-            callback.invoke(
-                ExtractorLink(
-                    "Marin",
-                    "Marin",
-                    video.code?.file ?: return@map,
-                    url,
-                    video.code.height ?: Qualities.Unknown.value,
-                    headers = mapOf(
-                        "Accept" to "video/webm,video/ogg,video/*;q=0.9,application/ogg;q=0.7,audio/*;q=0.6,*/*;q=0.5",
-                        "Accept-Language" to "en-US,en;q=0.5",
-                        "Cookie" to "__ddg1=;__ddg2_=; XSRF-TOKEN=${cookies.first}; marin_session=${cookies.second};",
-                        "Connection" to "keep-alive",
-                        "Sec-Fetch-Dest" to "video",
-                        "Sec-Fetch-Mode" to "cors",
-                        "Sec-Fetch-Site" to "cross-site",
-                    )
-                )
-            )
-        }
-    }
-
     private suspend fun invokeGogo(
         link: String,
         subtitleCallback: (SubtitleFile) -> Unit,
diff --git a/Anichi/src/main/kotlin/com/hexated/AnichiParser.kt b/Anichi/src/main/kotlin/com/hexated/AnichiParser.kt
index 6cbe56ec..8b9165eb 100644
--- a/Anichi/src/main/kotlin/com/hexated/AnichiParser.kt
+++ b/Anichi/src/main/kotlin/com/hexated/AnichiParser.kt
@@ -240,7 +240,6 @@ data class PageStatus(
     @JsonProperty("__typename") val _typename: String? = null
 )
 
-
 data class Recommendations(
     @JsonProperty("anyCard") val anyCard: AnyCard? = null,
     @JsonProperty("pageStatus") val pageStatus: PageStatus? = PageStatus(),
@@ -255,38 +254,4 @@ data class QueryPopular(
 
 data class DataPopular(
     @JsonProperty("queryPopular") val queryPopular: QueryPopular? = QueryPopular()
-)
-
-data class MALSyncSites(
-    @JsonProperty("Zoro") val zoro: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
-    @JsonProperty("Marin") val marin: HashMap<String?, HashMap<String, String?>>? = hashMapOf(),
-)
-
-data class MALSyncResponses(
-    @JsonProperty("Sites") val sites: MALSyncSites? = null,
-)
-
-data class MarinCode(
-    @JsonProperty("file") val file: String? = null,
-    @JsonProperty("height") val height: Int? = null,
-)
-
-data class MarinMirror(
-    @JsonProperty("code") val code: MarinCode? = null,
-)
-
-data class MarinData(
-    @JsonProperty("mirror") val mirror: ArrayList<MarinMirror>? = arrayListOf(),
-)
-
-data class MarinVideos(
-    @JsonProperty("data") val data: MarinData? = null,
-)
-
-data class MarinProps(
-    @JsonProperty("video") val video: MarinVideos? = null,
-)
-
-data class MarinResponses(
-    @JsonProperty("props") val props: MarinProps? = null,
 )
\ No newline at end of file

From 264a427a7f73795afb9c6233bdc0bf779c9a96ce Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 26 Jan 2024 20:02:54 +0700
Subject: [PATCH 107/125] fix

---
 Anichi/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Anichi/build.gradle.kts b/Anichi/build.gradle.kts
index 8d4ce77f..4201a7b2 100644
--- a/Anichi/build.gradle.kts
+++ b/Anichi/build.gradle.kts
@@ -38,5 +38,5 @@ cloudstream {
         "OVA",
     )
 
-    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1200409381813100554/Untitled-removebg-preview.png"
+    iconUrl = "https://cdn.discordapp.com/attachments/1109266606292488297/1200425504432472176/Anichi.png"
 }
\ No newline at end of file

From 38416c118c29ab7a069c248debb193cd53fe6898 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Tue, 30 Jan 2024 21:47:49 +0700
Subject: [PATCH 108/125] fix

---
 .../src/main/kotlin/com/hexated/Extractors.kt |  39 +++-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 203 ++++++------------
 .../src/main/kotlin/com/hexated/SoraStream.kt |  32 +--
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  10 +
 .../kotlin/com/hexated/SoraStreamPlugin.kt    |   3 +
 5 files changed, 125 insertions(+), 162 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
index 8026449c..e6c623f4 100644
--- a/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/Extractors.kt
@@ -337,7 +337,7 @@ open class Netembed : ExtractorApi() {
         val script = getAndUnpack(response.text)
         val m3u8 = Regex("((https:|http:)//.*\\.m3u8)").find(script)?.groupValues?.getOrNull(1) ?: return
 
-        M3u8Helper.generateM3u8(this.name, m3u8, "$mainUrl/", ).forEach(callback)
+        M3u8Helper.generateM3u8(this.name, m3u8, "$mainUrl/").forEach(callback)
     }
 }
 
@@ -345,6 +345,7 @@ open class Ridoo : ExtractorApi() {
     override val name = "Ridoo"
     override var mainUrl = "https://ridoo.net"
     override val requiresReferer = true
+    open val defaulQuality = Qualities.P1080.value
 
     override suspend fun getUrl(
         url: String,
@@ -359,13 +360,14 @@ open class Ridoo : ExtractorApi() {
             response.document.selectFirst("script:containsData(sources:)")?.data()
         }
         val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        val quality = "qualityLabels.*\"(\\d{3,4})[pP]\"".toRegex().find(script)?.groupValues?.get(1)
         callback.invoke(
             ExtractorLink(
                 this.name,
                 this.name,
                 m3u8 ?: return,
                 mainUrl,
-                Qualities.P1080.value,
+                quality?.toIntOrNull() ?: defaulQuality,
                 INFER_TYPE
             )
         )
@@ -373,6 +375,24 @@ open class Ridoo : ExtractorApi() {
 
 }
 
+open class Gdmirrorbot : ExtractorApi() {
+    override val name = "Gdmirrorbot"
+    override val mainUrl = "https://gdmirrorbot.nl"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        app.get(url, referer = referer).document.select("ul#videoLinks li").apmap {
+            loadExtractor(it.attr("data-link"), "$mainUrl/", subtitleCallback, callback)
+        }
+    }
+
+}
+
 open class Streamvid : ExtractorApi() {
     override val name = "Streamvid"
     override val mainUrl = "https://streamvid.net"
@@ -431,6 +451,18 @@ open class Embedrise : ExtractorApi() {
 
 }
 
+class FilemoonNl : Ridoo() {
+    override val name = "FilemoonNl"
+    override var mainUrl = "https://filemoon.nl"
+    override val defaulQuality = Qualities.Unknown.value
+}
+
+class Alions : Ridoo() {
+    override val name = "Alions"
+    override var mainUrl = "https://alions.pro"
+    override val defaulQuality = Qualities.Unknown.value
+}
+
 class Streamwish : Filesim() {
     override val name = "Streamwish"
     override var mainUrl = "https://streamwish.to"
@@ -484,9 +516,10 @@ class Embedwish : Filesim() {
     override val name = "Embedwish"
     override var mainUrl = "https://embedwish.com"
 }
-class Flaswish : Filesim() {
+class Flaswish : Ridoo() {
     override val name = "Flaswish"
     override var mainUrl = "https://flaswish.com"
+    override val defaulQuality = Qualities.Unknown.value
 }
 
 class Comedyshow : Jeniusplay() {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index b48cc5e1..eea131ee 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -202,6 +202,29 @@ object SoraExtractor : SoraStream() {
         }
     }
 
+    suspend fun invokeMoviefiction(
+        title: String? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val fixTitle = title?.createSlug()
+        val url = if (season == null) {
+            "$moviefictionAPI/movies/$fixTitle"
+        } else {
+            "$moviefictionAPI/episode/$fixTitle-${season}x${episode}"
+        }
+        val req = app.get(url)
+        val directUrl = getBaseUrl(req.url)
+        req.document.select("ul.bx-lst.aa-tbs li a").apmap {
+            if(!it.select("span.option").text().startsWith("Gdmirrorbot")) return@apmap
+            val iframe = app.get(base64Decode(it.attr("data-src"))).document.selectFirst("iframe")
+                ?.attr("src")
+            loadExtractor(iframe ?: return@apmap, "$directUrl/", subtitleCallback, callback)
+        }
+    }
+
     suspend fun invokeAoneroom(
         title: String? = null,
         year: Int? = null,
@@ -1544,102 +1567,6 @@ object SoraExtractor : SoraStream() {
         }
     }
 
-    suspend fun invokeMoviezAdd(
-        apiUrl: String? = null,
-        api: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        invokeBloginguru(apiUrl, api, title, year, season, episode, callback)
-    }
-
-    suspend fun invokeBollyMaza(
-        apiUrl: String? = null,
-        api: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        invokeBloginguru(apiUrl, api, title, year, season, episode, callback)
-    }
-
-    private suspend fun invokeBloginguru(
-        apiUrl: String? = null,
-        api: String? = null,
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val fixTitle = title?.createSlug()?.replace("-", " ")
-        val doc = app.get("$apiUrl/?s=$fixTitle").document
-
-        val matchMedia = doc.select("article.mh-loop-item").map {
-            it.select("a").attr("href") to it.select("a").text()
-        }.find {
-            if (season == null) {
-                it.second.contains(Regex("(?i)($fixTitle)|($title)")) && it.first.contains("$year")
-            } else {
-                it.second.contains(Regex("(?i)($fixTitle)|($title)")) && it.second.contains(Regex("(?i)(Season\\s?$season)|(S0?$season)"))
-            }
-        }
-
-        val mediaLink = app.get(
-            matchMedia?.first
-                ?: return
-        ).document.selectFirst("a#jake1")?.attr("href")
-        val detailDoc = app.get(mediaLink ?: return).document
-        val media = detailDoc.selectFirst("div.entry-content pre span")?.text()?.split("|")
-            ?.map { it.trim() }
-
-        val iframe = (if (season == null) {
-            media?.mapIndexed { index, name ->
-                detailDoc.select("div.entry-content > h2")[index].selectFirst("a")
-                    ?.attr("href") to name
-            }
-        } else {
-            media?.mapIndexed { index, name ->
-                val linkMedia =
-                    detailDoc.select("div.entry-content > h2")[index].selectFirst("a")?.attr("href")
-                app.get(
-                    linkMedia
-                        ?: return@mapIndexed null
-                ).document.selectFirst("div.entry-content strong:matches((?i)S0?${season}E0?${episode}) a")
-                    ?.attr("href") to name
-            }
-        })?.filter { it?.first?.startsWith("http") == true }
-
-        iframe?.apmap {
-            val iframeDoc = app.get(it?.first ?: return@apmap).document
-            val formUrl = iframeDoc.select("form").attr("action")
-            val formData =
-                iframeDoc.select("form button").associate { v -> v.attr("name") to v.attr("value") }
-
-            val videoUrl = app.post(
-                formUrl,
-                data = formData,
-                referer = it.first
-            ).document.selectFirst("div.d-flex.justify-content-center.flex-wrap a")?.attr("href")
-            val quality =
-                Regex("(\\d{3,4})p").find(it.second)?.groupValues?.getOrNull(1)?.toIntOrNull()
-            val qualityName = it.second.replace("${quality}p", "").trim()
-
-            callback.invoke(
-                ExtractorLink(
-                    "$api", "$api $qualityName", videoUrl
-                        ?: return@apmap, "", quality ?: Qualities.Unknown.value
-                )
-            )
-        }
-
-    }
-
     suspend fun invokeRStream(
         id: Int? = null,
         season: Int? = null,
@@ -1749,6 +1676,7 @@ object SoraExtractor : SoraStream() {
                 "Player F" -> {
                     invokeSmashyFfix(it.second, it.first, url, subtitleCallback, callback)
                 }
+
                 "Player SU" -> {
                     invokeSmashySu(it.second, it.first, url, callback)
                 }
@@ -1765,14 +1693,14 @@ object SoraExtractor : SoraStream() {
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit
     ) {
-        val id = (if(season == null) {
+        val id = (if (season == null) {
             "tmdb|movie|$tmdbId"
         } else {
             "tmdb|series|$tmdbId"
         }).let { base64Encode(it.toByteArray()) }
 
         val loaderUrl = "$moflixAPI/api/v1/titles/$id?loader=titlePage"
-        val url = if(season == null) {
+        val url = if (season == null) {
             loaderUrl
         } else {
             val mediaId = app.get(loaderUrl, referer = "$moflixAPI/").parsedSafe<MoflixResponse>()?.title?.id
@@ -1780,28 +1708,32 @@ object SoraExtractor : SoraStream() {
         }
 
         val res = app.get(url, referer = "$moflixAPI/").parsedSafe<MoflixResponse>()
-        (res?.episode ?: res?.title)?.videos?.filter { it.category.equals("full", true) }?.apmap { iframe ->
-            val response = app.get(iframe.src ?: return@apmap, referer = "$moflixAPI/")
-            val host = getBaseUrl(iframe.src)
-            val doc = response.document.selectFirst("script:containsData(sources:)")?.data()
-            val script = if (doc.isNullOrEmpty()) {
-                getAndUnpack(response.text)
-            } else {
-                doc
-            }
-            val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return@apmap)?.groupValues?.getOrNull(1)
-            if(m3u8?.haveDub("$host/") == false) return@apmap
-            callback.invoke(
-                ExtractorLink(
-                    "Moflix",
-                    "Moflix [${iframe.name}]",
-                    m3u8 ?: return@apmap,
-                    "$host/",
-                    iframe.quality?.filter { it.isDigit() }?.toIntOrNull() ?: Qualities.Unknown.value,
-                    INFER_TYPE
+        (res?.episode ?: res?.title)?.videos?.filter { it.category.equals("full", true) }
+            ?.apmap { iframe ->
+                val response = app.get(iframe.src ?: return@apmap, referer = "$moflixAPI/")
+                val host = getBaseUrl(iframe.src)
+                val doc = response.document.selectFirst("script:containsData(sources:)")?.data()
+                val script = if (doc.isNullOrEmpty()) {
+                    getAndUnpack(response.text)
+                } else {
+                    doc
+                }
+                val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(
+                    script ?: return@apmap
+                )?.groupValues?.getOrNull(1)
+                if (m3u8?.haveDub("$host/") == false) return@apmap
+                callback.invoke(
+                    ExtractorLink(
+                        "Moflix",
+                        "Moflix [${iframe.name}]",
+                        m3u8 ?: return@apmap,
+                        "$host/",
+                        iframe.quality?.filter { it.isDigit() }?.toIntOrNull()
+                            ?: Qualities.Unknown.value,
+                        INFER_TYPE
+                    )
                 )
-            )
-        }
+            }
 
     }
 
@@ -2270,14 +2202,15 @@ object SoraExtractor : SoraStream() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val media = app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "shows"}?filters[q]=$title")
-            .parsedSafe<CinemaTvResponse>()?.items?.find {
-                it.imdb_id?.removePrefix("tt")
-                    .equals(imdbId?.removePrefix("tt")) || (it.title.equals(
-                    title,
-                    true
-                ) && it.year == year)
-            } ?: return
+        val media =
+            app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "shows"}?filters[q]=$title")
+                .parsedSafe<CinemaTvResponse>()?.items?.find {
+                    it.imdb_id?.removePrefix("tt")
+                        .equals(imdbId?.removePrefix("tt")) || (it.title.equals(
+                        title,
+                        true
+                    ) && it.year == year)
+                } ?: return
 
         val mediaId = if (season == null) {
             media.id_movie
@@ -2286,7 +2219,9 @@ object SoraExtractor : SoraStream() {
                 .parsedSafe<CinemaTvResponse>()?.episodes?.find { it.episode == episode && it.season == season }?.id
         } ?: return
 
-        val sources = app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "episodes"}/view?expand=streams,subtitles&id=$mediaId").parsedSafe<CinemaTvResponse>()
+        val sources =
+            app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "episodes"}/view?expand=streams,subtitles&id=$mediaId")
+                .parsedSafe<CinemaTvResponse>()
 
         sources?.streams?.mapKeys { source ->
             callback.invoke(
@@ -2340,11 +2275,13 @@ object SoraExtractor : SoraStream() {
         callback: (ExtractorLink) -> Unit,
         referer: String = "https://bflix.gs/"
     ) {
-        suspend fun String.isSuccess() : Boolean {
+        suspend fun String.isSuccess(): Boolean {
             return app.get(this, referer = referer).isSuccessful
         }
+
         val slug = getEpisodeSlug(season, episode)
-        var url = if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
+        var url =
+            if (season == null) "$nowTvAPI/$tmdbId.mp4" else "$nowTvAPI/tv/$tmdbId/s${season}e${slug.second}.mp4"
         if (!url.isSuccess()) {
             url = if (season == null) {
                 val temp = "$nowTvAPI/$imdbId.mp4"
@@ -2373,7 +2310,8 @@ object SoraExtractor : SoraStream() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val mediaSlug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId").parsedSafe<RidoSearch>()?.data?.items?.find {
+        val mediaSlug = app.get("$ridomoviesAPI/core/api/search?q=$imdbId")
+            .parsedSafe<RidoSearch>()?.data?.items?.find {
             it.contentable?.tmdbId == tmdbId || it.contentable?.imdbId == imdbId
         }?.slug ?: return
 
@@ -2382,7 +2320,8 @@ object SoraExtractor : SoraStream() {
             app.get(episodeUrl).text.substringAfterLast("""postid\":\"""").substringBefore("""\""")
         } ?: mediaSlug
 
-        val url = "$ridomoviesAPI/core/api/${if (season == null) "movies" else "episodes"}/$id/videos"
+        val url =
+            "$ridomoviesAPI/core/api/${if (season == null) "movies" else "episodes"}/$id/videos"
         app.get(url).parsedSafe<RidoResponses>()?.data?.apmap { link ->
             val iframe = Jsoup.parse(link.url ?: return@apmap).select("iframe").attr("data-src")
             if (iframe.startsWith("https://closeload.top")) {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 8d3033c4..8a26c7ad 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -5,7 +5,6 @@ import com.hexated.SoraExtractor.invoke2embed
 import com.hexated.SoraExtractor.invokeAllMovieland
 import com.hexated.SoraExtractor.invokeAnimes
 import com.hexated.SoraExtractor.invokeAoneroom
-import com.hexated.SoraExtractor.invokeBollyMaza
 import com.hexated.SoraExtractor.invokeFilmxy
 import com.hexated.SoraExtractor.invokeKimcartoon
 import com.hexated.SoraExtractor.invokeVidSrc
@@ -24,7 +23,6 @@ import com.hexated.SoraExtractor.invokeGoku
 import com.hexated.SoraExtractor.invokeKisskh
 import com.hexated.SoraExtractor.invokeLing
 import com.hexated.SoraExtractor.invokeM4uhd
-import com.hexated.SoraExtractor.invokeMoviezAdd
 import com.hexated.SoraExtractor.invokeNinetv
 import com.hexated.SoraExtractor.invokeNowTv
 import com.hexated.SoraExtractor.invokeRStream
@@ -43,6 +41,7 @@ import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeMoflix
 import com.hexated.SoraExtractor.invokeGhostx
+import com.hexated.SoraExtractor.invokeMoviefiction
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
@@ -83,7 +82,6 @@ open class SoraStream : TmdbProvider() {
         /** ALL SOURCES */
         const val twoEmbedAPI = "https://www.2embed.cc"
         const val vidSrcAPI = "https://vidsrc.me"
-        const val dbgoAPI = "https://dbgo.fun"
         const val dreamfilmAPI = "https://dreamfilmsw.net"
         const val noverseAPI = "https://www.nollyverse.com"
         const val filmxyAPI = "https://www.filmxy.vip"
@@ -118,6 +116,7 @@ open class SoraStream : TmdbProvider() {
         const val mMoviesAPI = "https://multimovies.uno"
         const val watchCartoonAPI = "https://www1.watchcartoononline.bz"
         const val moflixAPI = "https://moflix-stream.xyz"
+        const val moviefictionAPI = "https://moviefiction.com"
 
         const val fdMoviesAPI = "https://freedrivemovie.com"
         const val uhdmoviesAPI = "https://uhdmovies.zip"
@@ -126,8 +125,6 @@ open class SoraStream : TmdbProvider() {
         const val vegaMoviesAPI = "https://vegamovies.dad"
         const val dotmoviesAPI = "https://dotmovies.rsvp"
         const val tvMoviesAPI = "https://www.tvseriesnmovies.com"
-        const val moviezAddAPI = "https://ww3.moviezaddiction.click"
-        const val bollyMazaAPI = "https://ww3.bollymaza.click"
         const val dahmerMoviesAPI = "https://odd-bird-1319.zwuhygoaqe.workers.dev"
 
         fun getType(t: String?): TvType {
@@ -507,28 +504,6 @@ open class SoraStream : TmdbProvider() {
             {
                 if (!res.isAnime) invokeTvMovies(res.title, res.season, res.episode, callback)
             },
-            {
-                if (!res.isAnime) invokeMoviezAdd(
-                    moviezAddAPI,
-                    "MoviezAdd",
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
-            {
-                if (!res.isAnime && res.isBollywood) invokeBollyMaza(
-                    bollyMazaAPI,
-                    "BollyMaza",
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    callback
-                )
-            },
             {
                 if (!res.isAnime) invokeRStream(res.id, res.season, res.episode, callback)
             },
@@ -713,6 +688,9 @@ open class SoraStream : TmdbProvider() {
             {
                 if (!res.isAnime) invokeMoflix(res.id, res.season, res.episode, callback)
             },
+            {
+                if (!res.isAnime) invokeMoviefiction(res.title, res.season, res.episode, subtitleCallback, callback)
+            },
         )
 
         return true
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 9c09c047..9da5d53b 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -29,6 +29,7 @@ import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeMoflix
 import com.hexated.SoraExtractor.invokeGhostx
+import com.hexated.SoraExtractor.invokeMoviefiction
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
 import com.hexated.SoraExtractor.invokeZshow
@@ -319,6 +320,15 @@ class SoraStreamLite : SoraStream() {
                     callback
                 )
             },
+            {
+                if (!res.isAnime) invokeMoviefiction(
+                    res.title,
+                    res.season,
+                    res.episode,
+                    subtitleCallback,
+                    callback
+                )
+            },
         )
 
         return true
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
index 32957fd2..f0f54b5e 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamPlugin.kt
@@ -33,5 +33,8 @@ class SoraStreamPlugin: Plugin() {
         registerExtractorAPI(Ridoo())
         registerExtractorAPI(Streamvid())
         registerExtractorAPI(Embedrise())
+        registerExtractorAPI(Gdmirrorbot())
+        registerExtractorAPI(FilemoonNl())
+        registerExtractorAPI(Alions())
     }
 }
\ No newline at end of file

From 08ecc642c94a9a90565f843a98c888b3bd088465 Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Tue, 30 Jan 2024 20:18:29 +0530
Subject: [PATCH 109/125] update: mvrlz, hdm2, vega, dot, yo (#560)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* change domain

* update some domains

* forgot yo 💀

* update uhd and oplovers 💀
---
 .../main/kotlin/com/anon/AnimeDekhoProvider.kt  | 17 ++---------------
 Movierulzhd/build.gradle.kts                    |  2 +-
 .../src/main/kotlin/com/hexated/Hdmovie2.kt     |  2 +-
 .../src/main/kotlin/com/hexated/Movierulzhd.kt  |  2 +-
 OploverzProvider/build.gradle.kts               |  2 +-
 .../main/kotlin/com/hexated/OploverzProvider.kt |  2 +-
 SoraStream/build.gradle.kts                     |  2 +-
 .../src/main/kotlin/com/hexated/SoraStream.kt   |  8 ++++----
 YomoviesProvider/build.gradle.kts               |  2 +-
 .../main/kotlin/com/hexated/YomoviesProvider.kt |  2 +-
 10 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
index 995329ba..0f024ddc 100644
--- a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
@@ -1,9 +1,7 @@
 package com.anon
 
 import android.util.Log
-
 import com.fasterxml.jackson.annotation.JsonProperty
-
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.DoodLaExtractor
 import com.lagradost.cloudstream3.utils.*
@@ -12,20 +10,16 @@ import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.Session
 import kotlinx.coroutines.delay
 import org.jsoup.nodes.Element
-
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.nicehttp.requestCreator
-
 import org.jsoup.Jsoup
 import java.util.regex.Pattern
 import okhttp3.Interceptor
 import okhttp3.Response
-
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.nicehttp.RequestBodyTypes
 import okhttp3.RequestBody.Companion.toRequestBody
-
 import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 
 class AnimeDekhoProvider : MainAPI() {
@@ -85,12 +79,10 @@ class AnimeDekhoProvider : MainAPI() {
         val poster  = document?.selectFirst("div.post-thumbnail figure img")?.attr("src") ?: "null"
         val plot  = document?.selectFirst("div.entry-content p")?.text()?.trim() ?: "null"
         val year  = document?.selectFirst("span.year")?.text()?.trim()?.toInt() ?: 1990
-
         var episodes = mutableListOf<Episode>()
 
         val items = document.select("ul.seasons-lst li").mapNotNull {   
             val name = it?.selectFirst("h3.title")?.text() ?: "null"
-            
             val tempstring = it?.selectFirst("a")?.attr("href") ?: "null"
 
             episodes.add( Episode(tempstring, name) )
@@ -106,6 +98,7 @@ class AnimeDekhoProvider : MainAPI() {
                 //this.recommendations = recommendations
             }
         }
+
         else{
             return newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
                 this.posterUrl = poster.toString()
@@ -113,8 +106,7 @@ class AnimeDekhoProvider : MainAPI() {
                 this.year = year
                 //this.recommendations = recommendations
             }
-        }   
-        
+        }
     }
 
     override suspend fun loadLinks(
@@ -142,15 +134,10 @@ class AnimeDekhoProvider : MainAPI() {
         }
 
         //Log.d("TAGNAME", "vidlink $vidlink") //https://vidxstream.xyz/v/H0Rh3ixVLJKk/
-
         val body = app.get(vidlink).text
-
         val master = Regex("""JScript[\w+]?\s*=\s*'([^']+)""").find(body)!!.groupValues?.get(1)
-
         val decrypt = cryptoAESHandler(master ?: return false, "4MmH9EsZrq0WEekn".toByteArray(), false)?.replace("\\", "") ?: "ERROR"
-
         val vidfinal = Regex("""file:\s*\"(https:[^\"]+)\"""").find(decrypt)!!.groupValues?.get(1)
-        
 
         val headers = mapOf(
             "accept" to "*/*",
diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index a160c2b4..5aa5a88e 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 61
+version = 62
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
index da04e09a..9c141a03 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
@@ -12,7 +12,7 @@ import org.jsoup.Jsoup
 
 class Hdmovie2 : Movierulzhd() {
 
-    override var mainUrl = "https://hdmovie2.kim"
+    override var mainUrl = "https://hdmovie2.mba"
     override var name = "Hdmovie2"
     override val mainPage = mainPageOf(
         "trending" to "Trending",
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
index d1dd6ce4..9954eb5d 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Movierulzhd.kt
@@ -11,7 +11,7 @@ import java.net.URI
 
 open class Movierulzhd : MainAPI() {
 
-    override var mainUrl = "https://movierulzhd.party"
+    override var mainUrl = "https://movierulzhd.cafe"
     var directUrl = ""
     override var name = "Movierulzhd"
     override val hasMainPage = true
diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts
index bc8d4a59..928dbcf4 100644
--- a/OploverzProvider/build.gradle.kts
+++ b/OploverzProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 28
+version = 29
 
 
 cloudstream {
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
index 00cd0b41..908f97bb 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class OploverzProvider : MainAPI() {
-    override var mainUrl = "https://oploverz.bio"
+    override var mainUrl = "https://oploverz.guru"
     override var name = "Oploverz"
     override val hasMainPage = true
     override var lang = "id"
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 41837eab..367225c3 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 220
+version = 221
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 8a26c7ad..5c88a625 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -119,11 +119,11 @@ open class SoraStream : TmdbProvider() {
         const val moviefictionAPI = "https://moviefiction.com"
 
         const val fdMoviesAPI = "https://freedrivemovie.com"
-        const val uhdmoviesAPI = "https://uhdmovies.zip"
+        const val uhdmoviesAPI = "https://uhdmovies.us"
         const val gMoviesAPI = "https://gdrivemovies.xyz"
-        const val hdmovies4uAPI = "https://hdmovies4u.dad"
-        const val vegaMoviesAPI = "https://vegamovies.dad"
-        const val dotmoviesAPI = "https://dotmovies.rsvp"
+        const val hdmovies4uAPI = "https://hdmovies4u.day"
+        const val vegaMoviesAPI = "https://vegamovies.ngo"
+        const val dotmoviesAPI = "https://dotmovies.dad"
         const val tvMoviesAPI = "https://www.tvseriesnmovies.com"
         const val dahmerMoviesAPI = "https://odd-bird-1319.zwuhygoaqe.workers.dev"
 
diff --git a/YomoviesProvider/build.gradle.kts b/YomoviesProvider/build.gradle.kts
index 31a810db..d5e2c4a9 100644
--- a/YomoviesProvider/build.gradle.kts
+++ b/YomoviesProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 26
+version = 27
 
 
 cloudstream {
diff --git a/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt b/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
index 324130e4..db80da7f 100644
--- a/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
+++ b/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
@@ -10,7 +10,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 open class YomoviesProvider : MainAPI() {
-    override var mainUrl = "https://yomovies.boo"
+    override var mainUrl = "https://yomovies.fit"
     private var directUrl = ""
     override var name = "Yomovies"
     override val hasMainPage = true

From cd20690fe07a9d93feff006b8c16e8fefc82ca52 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:08:22 +0700
Subject: [PATCH 110/125] fix #559

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index eea131ee..5984cebf 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2348,7 +2348,7 @@ object SoraExtractor : SoraStream() {
         season: Int? = null,
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit,
-        host: String = "https://esh-bostewsom-i-273.site",
+        host: String = "https://weisatted-forminsting-i-277.site",
     ) {
         val res = app.get(
             "$host/play/$imdbId",

From 5982deb6843002102f556acfb7840b47d697a75d Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:16:39 +0700
Subject: [PATCH 111/125] fix

---
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 5984cebf..e4eabfbf 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2120,7 +2120,7 @@ object SoraExtractor : SoraStream() {
                 referer = url,
                 headers = headers
             ).text
-            val links = encryptedData.decrypt(base64Decode("MTEx"))
+            val links = encryptedData.decrypt(base64Decode("OTg="))
             links?.forEach { video ->
                 qualities.filter { it <= video.max.toInt() }.forEach {
                     callback(

From e3681935de2c70e3c07fde1a571c1de2d5bdc55a Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Tue, 30 Jan 2024 23:08:30 +0700
Subject: [PATCH 112/125] close #547

---
 Moflix/build.gradle.kts                       |  4 +-
 .../src/main/kotlin/com/hexated/Cineclix.kt   | 14 ++++++
 .../src/main/kotlin/com/hexated/Extractors.kt | 44 ++++++++++++++++++-
 Moflix/src/main/kotlin/com/hexated/Moflix.kt  | 16 +++----
 .../main/kotlin/com/hexated/MoflixPlugin.kt   |  2 +
 5 files changed, 69 insertions(+), 11 deletions(-)
 create mode 100644 Moflix/src/main/kotlin/com/hexated/Cineclix.kt

diff --git a/Moflix/build.gradle.kts b/Moflix/build.gradle.kts
index cc650970..738f38de 100644
--- a/Moflix/build.gradle.kts
+++ b/Moflix/build.gradle.kts
@@ -1,12 +1,12 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
     language = "de"
     // All of these properties are optional, you can safely remove them
 
-    // description = "Lorem Ipsum"
+     description = "Include: Cineclix"
     authors = listOf("Hexated")
 
     /**
diff --git a/Moflix/src/main/kotlin/com/hexated/Cineclix.kt b/Moflix/src/main/kotlin/com/hexated/Cineclix.kt
new file mode 100644
index 00000000..59a65732
--- /dev/null
+++ b/Moflix/src/main/kotlin/com/hexated/Cineclix.kt
@@ -0,0 +1,14 @@
+package com.hexated
+
+import com.lagradost.cloudstream3.mainPageOf
+
+class Cineclix : Moflix() {
+    override var name = "Cineclix"
+    override var mainUrl = "https://cineclix.in"
+    override val mainPage = mainPageOf(
+        "77/created_at:desc" to "Neuerscheinungen Filme",
+        "82/created_at:desc" to "Neuerscheinungen Serien",
+        "77/popularity:desc" to "Filme",
+        "82/popularity:desc" to "Serien",
+    )
+}
\ No newline at end of file
diff --git a/Moflix/src/main/kotlin/com/hexated/Extractors.kt b/Moflix/src/main/kotlin/com/hexated/Extractors.kt
index 7100f24f..e2a67320 100644
--- a/Moflix/src/main/kotlin/com/hexated/Extractors.kt
+++ b/Moflix/src/main/kotlin/com/hexated/Extractors.kt
@@ -3,6 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
+import java.net.URI
 
 class MoflixLink : MoflixClick() {
     override val name = "MoflixLink"
@@ -36,7 +37,8 @@ open class MoflixClick : ExtractorApi() {
         } else {
             response.document.selectFirst("script:containsData(sources:)")?.data()
         }
-        val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
+        val m3u8 =
+            Regex("file:\\s*\"(.*?m3u8.*?)\"").find(script ?: return)?.groupValues?.getOrNull(1)
         callback.invoke(
             ExtractorLink(
                 name,
@@ -49,4 +51,44 @@ open class MoflixClick : ExtractorApi() {
         )
     }
 
+}
+
+open class Doodstream : ExtractorApi() {
+    override val name = "Doodstream"
+    override val mainUrl = "https://doodstream.com"
+    override val requiresReferer = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val req = app.get(url)
+        val host = getBaseUrl(req.url)
+        val response0 = req.text
+        val md5 = host + (Regex("/pass_md5/[^']*").find(response0)?.value ?: return)
+        val trueUrl =
+            app.get(md5, referer = req.url).text + "qWMG3yc6F5?token=" + md5.substringAfterLast("/")
+        val quality = Regex("\\d{3,4}p").find(
+            response0.substringAfter("<title>").substringBefore("</title>")
+        )?.groupValues?.get(0)
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                trueUrl,
+                mainUrl,
+                getQualityFromName(quality),
+                false
+            )
+        )
+    }
+
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/Moflix/src/main/kotlin/com/hexated/Moflix.kt b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
index 247950d3..a8547ae8 100644
--- a/Moflix/src/main/kotlin/com/hexated/Moflix.kt
+++ b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
@@ -11,7 +11,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import org.jsoup.Jsoup
 import kotlin.math.roundToInt
 
-class Moflix : MainAPI() {
+open class Moflix : MainAPI() {
     override var name = "Moflix"
     override var mainUrl = "https://moflix-stream.xyz"
     override var lang = "de"
@@ -36,16 +36,16 @@ class Moflix : MainAPI() {
     }
 
     override val mainPage = mainPageOf(
-        "351" to "Kürzlich hinzugefügt",
-        "345" to "Movie-Datenbank",
-        "352" to "Angesagte Serien",
-        "358" to "Kinder & Familien",
+        "351/channelables.order:asc" to "Kürzlich hinzugefügt",
+        "345/popularity:desc" to "Movie-Datenbank",
+        "352/channelables.order:asc" to "Angesagte Serien",
+        "358/channelables.order:asc" to "Kinder & Familien",
     )
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
-        val order = if (request.data == "345") "popularity:desc" else "channelables.order:asc"
+        val query = request.data.split("/")
         val home = app.get(
-            "$mainUrl/api/v1/channel/${request.data}?returnContentOnly=true&restriction=&order=$order&paginate=simple&perPage=50&query=&page=$page",
+            "$mainUrl/api/v1/channel/${query.first()}?returnContentOnly=true&restriction=&order=${query.last()}&paginate=simple&perPage=50&query=&page=$page",
             referer = "$mainUrl/"
         ).parsedSafe<Responses>()?.pagination?.data?.mapNotNull { it.toSearchResponse() }
             ?: emptyList()
@@ -194,7 +194,7 @@ class Moflix : MainAPI() {
                 "$mainUrl/",
                 subtitleCallback,
                 callback,
-                iframe.quality?.filter { it.isDigit() }?.toIntOrNull()
+                iframe.quality?.substringBefore("/")?.filter { it.isDigit() }?.toIntOrNull()
             )
         }
 
diff --git a/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt b/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt
index 7e15db0a..42ade584 100644
--- a/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt
+++ b/Moflix/src/main/kotlin/com/hexated/MoflixPlugin.kt
@@ -10,9 +10,11 @@ class MoflixPlugin: Plugin() {
     override fun load(context: Context) {
         // All providers should be added in this manner. Please don't edit the providers list directly.
         registerMainAPI(Moflix())
+        registerMainAPI(Cineclix())
         registerExtractorAPI(MoflixClick())
         registerExtractorAPI(Highstream())
         registerExtractorAPI(MoflixFans())
         registerExtractorAPI(MoflixLink())
+        registerExtractorAPI(Doodstream())
     }
 }
\ No newline at end of file

From 1040dd6731f13a2bed5d2c5ad79c9e0dbcf9833d Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Tue, 30 Jan 2024 23:44:18 +0700
Subject: [PATCH 113/125] fix

---
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 57 ++++++++++++-------
 .../src/main/kotlin/com/hexated/SoraParser.kt | 36 ++++--------
 2 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index e4eabfbf..8b0ef008 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -2202,26 +2202,38 @@ object SoraExtractor : SoraStream() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
     ) {
-        val media =
-            app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "shows"}?filters[q]=$title")
-                .parsedSafe<CinemaTvResponse>()?.items?.find {
-                    it.imdb_id?.removePrefix("tt")
-                        .equals(imdbId?.removePrefix("tt")) || (it.title.equals(
-                        title,
-                        true
-                    ) && it.year == year)
-                } ?: return
-
-        val mediaId = if (season == null) {
-            media.id_movie
+        val id = imdbId?.removePrefix("tt")
+        val slug = title?.createSlug()
+        val url = if (season == null) {
+            "$cinemaTvAPI/movies/play/$id-$slug-$year"
         } else {
-            app.get("$cinemaTvAPI/v1/shows?expand=episodes&id=${media.id_show}")
-                .parsedSafe<CinemaTvResponse>()?.episodes?.find { it.episode == episode && it.season == season }?.id
-        } ?: return
+            "$cinemaTvAPI/shows/play/$id-$slug-$year"
+        }
 
-        val sources =
-            app.get("$cinemaTvAPI/v1/${if (season == null) "movies" else "episodes"}/view?expand=streams,subtitles&id=$mediaId")
-                .parsedSafe<CinemaTvResponse>()
+        val headers = mapOf(
+            "x-requested-with" to "XMLHttpRequest",
+        )
+        val doc = app.get(url, headers = headers).document
+        val script = doc.selectFirst("script:containsData(hash:)")?.data()
+        val hash = Regex("hash:\\s*['\"](\\S+)['\"]").find(script ?: return)?.groupValues?.get(1)
+        val expires = Regex("expires:\\s*(\\d+)").find(script)?.groupValues?.get(1)
+        val episodeId = (if (season == null) {
+            """id_movie:\s*(\d+)"""
+        } else {
+            """episode:\s*['"]$episode['"],[\n\s]+id_episode:\s*(\d+),[\n\s]+season:\s*['"]$season['"]"""
+        }).let { it.toRegex().find(script)?.groupValues?.get(1) }
+
+        val videoUrl = if (season == null) {
+            "$cinemaTvAPI/api/v1/security/movie-access?id_movie=$episodeId&hash=$hash&expires=$expires"
+        } else {
+            "$cinemaTvAPI/api/v1/security/episode-access?id_episode=$episodeId&hash=$hash&expires=$expires"
+        }
+
+        val sources = app.get(
+            videoUrl,
+            referer = url,
+            headers = headers
+        ).parsedSafe<CinemaTvResponse>()
 
         sources?.streams?.mapKeys { source ->
             callback.invoke(
@@ -2229,18 +2241,19 @@ object SoraExtractor : SoraStream() {
                     "CinemaTv",
                     "CinemaTv",
                     source.value,
-                    "",
+                    "$cinemaTvAPI/",
                     getQualityFromName(source.key),
                     true
                 )
             )
         }
 
-        sources?.subtitles?.map {
+        sources?.subtitles?.map { sub ->
+            val file = sub.file.toString()
             subtitleCallback.invoke(
                 SubtitleFile(
-                    it.language ?: return@map,
-                    fixUrl(it.url ?: return@map, cinemaTvAPI)
+                    sub.language ?: return@map,
+                    if (file.startsWith("[")) return@map else fixUrl(file, cinemaTvAPI),
                 )
             )
         }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index b09fa747..c920555a 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -191,32 +191,6 @@ data class JikanResponse(
     @JsonProperty("data") val data: JikanData? = null,
 )
 
-data class CinemaTvResponse(
-    @JsonProperty("items") val items: ArrayList<Items>? = arrayListOf(),
-    @JsonProperty("episodes") val episodes: ArrayList<Episodes>? = arrayListOf(),
-    @JsonProperty("streams") val streams: HashMap<String, String>? = null,
-    @JsonProperty("subtitles") val subtitles: ArrayList<Subtitles>? = arrayListOf(),
-    ) {
-    data class Items(
-        @JsonProperty("id_movie") val id_movie: Int? = null,
-        @JsonProperty("id_show") val id_show: Int? = null,
-        @JsonProperty("title") val title: String? = null,
-        @JsonProperty("year") val year: Int? = null,
-        @JsonProperty("imdb_id") val imdb_id: String? = null,
-    )
-
-    data class Episodes(
-        @JsonProperty("id") val id: Int? = null,
-        @JsonProperty("season") val season: Int? = null,
-        @JsonProperty("episode") val episode: Int? = null,
-    )
-
-    data class Subtitles(
-        @JsonProperty("language") val language: String? = null,
-        @JsonProperty("url") val url: String? = null,
-    )
-}
-
 data class VidsrctoResult(
     @JsonProperty("id") val id: String? = null,
     @JsonProperty("title") val title: String? = null,
@@ -486,4 +460,14 @@ data class AoneroomResponse(
             )
         }
     }
+}
+
+data class CinemaTvResponse(
+    @JsonProperty("streams") val streams: HashMap<String, String>? = null,
+    @JsonProperty("subtitles") val subtitles: ArrayList<Subtitles>? = arrayListOf(),
+) {
+    data class Subtitles(
+        @JsonProperty("language") val language: String? = null,
+        @JsonProperty("file") val file: Any? = null,
+    )
 }
\ No newline at end of file

From 15d9b5955b3e35975916bfac055532c00c99e57a Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 1 Feb 2024 03:13:14 +0700
Subject: [PATCH 114/125] added Raveeflix #566

---
 Raveeflix/build.gradle.kts                    |  27 +++
 Raveeflix/src/main/AndroidManifest.xml        |   2 +
 .../src/main/kotlin/com/hexated/Raveeflix.kt  | 198 ++++++++++++++++++
 .../kotlin/com/hexated/RaveeflixPlugin.kt     |  14 ++
 4 files changed, 241 insertions(+)
 create mode 100644 Raveeflix/build.gradle.kts
 create mode 100644 Raveeflix/src/main/AndroidManifest.xml
 create mode 100644 Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
 create mode 100644 Raveeflix/src/main/kotlin/com/hexated/RaveeflixPlugin.kt

diff --git a/Raveeflix/build.gradle.kts b/Raveeflix/build.gradle.kts
new file mode 100644
index 00000000..a6b81709
--- /dev/null
+++ b/Raveeflix/build.gradle.kts
@@ -0,0 +1,27 @@
+// use an integer for version numbers
+version = 1
+
+
+cloudstream {
+    language = "id"
+    // All of these properties are optional, you can safely remove them
+
+    // description = "Lorem Ipsum"
+    authors = listOf("Hexated")
+
+    /**
+     * Status int as the following:
+     * 0: Down
+     * 1: Ok
+     * 2: Slow
+     * 3: Beta only
+     * */
+    status = 1 // will be 3 if unspecified
+    tvTypes = listOf(
+        "AsianDrama",
+        "TvSeries",
+        "Movie",
+    )
+
+    iconUrl = "https://www.google.com/s2/favicons?domain=raveeflix.my.id&sz=%size%"
+}
diff --git a/Raveeflix/src/main/AndroidManifest.xml b/Raveeflix/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..c98063f8
--- /dev/null
+++ b/Raveeflix/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.hexated"/>
\ No newline at end of file
diff --git a/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt b/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
new file mode 100644
index 00000000..39c494ab
--- /dev/null
+++ b/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
@@ -0,0 +1,198 @@
+package com.hexated
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
+import com.lagradost.cloudstream3.utils.*
+import org.jsoup.nodes.Element
+
+class Raveeflix : MainAPI() {
+    override var mainUrl = "https://raveeflix.my.id"
+    override var name = "Raveeflix"
+    override val hasMainPage = true
+    override var lang = "id"
+    override val supportedTypes =
+        setOf(
+            TvType.Movie,
+            TvType.TvSeries,
+            TvType.AsianDrama,
+        )
+
+    override val mainPage =
+        mainPageOf(
+            "categories/trending" to "Trending",
+            "tv" to "Tv-Shows",
+            "drakor" to "Drakor",
+            "categories/anime" to "Anime",
+        )
+
+    override suspend fun getMainPage(
+        page: Int,
+        request: MainPageRequest,
+    ): HomePageResponse {
+        val pages = if (page > 1) "page/$page/" else ""
+        val document = app.get("$mainUrl/${request.data}/$pages").document
+        val home = document.select("section.w-full a.min-w-full").mapNotNull { it.toSearchResult() }
+        return newHomePageResponse(
+            HomePageList(
+                request.name, home, true
+            )
+        )
+    }
+
+    private fun Element.toSearchResult(): SearchResponse? {
+        val title = this.selectFirst("div.text-xl")?.text() ?: return null
+        val href = fixUrl(this.attr("href"))
+        val posterUrl = this.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
+
+        return newMovieSearchResponse(title, href, TvType.Movie) {
+            this.posterUrl = posterUrl
+        }
+    }
+
+    override suspend fun search(query: String): List<SearchResponse>? {
+        val res = app.get("$mainUrl/index.json").text.let { AppUtils.tryParseJson<ArrayList<Index>>(it) }
+        return res?.filter {
+            it.title?.contains(
+                query,
+                true
+            ) == true && !it.section.equals("Categories", true) && !it.section.equals("Tags", true) && it.permalink?.contains("/episode") == false
+        }?.mapNotNull {
+            newMovieSearchResponse(
+                it.title ?: return@mapNotNull null,
+                fixUrl(
+                    it.permalink?.substringBefore("episode")?.substringBefore("season")
+                        ?: return@mapNotNull null,
+                ),
+                TvType.Movie,
+            )
+        }
+    }
+
+    override suspend fun load(url: String): LoadResponse {
+        val document = app.get(url).document
+        val title = document.selectFirst("h1.text-4xl")?.text() ?: "No Title"
+        val poster = document.selectFirst("div.thumbnail_card, div.w-full.thumbnail_card_related")
+            ?.attr("style")?.getPoster()
+        val type =
+            if (document.select("mux-player").isNullOrEmpty()) TvType.TvSeries else TvType.Movie
+        val tags =
+            if (type == TvType.TvSeries) {
+                document.selectFirst("div.movie-details > p:nth-child(1)")
+                    ?.ownText()?.split(",")
+                    ?.map { it.trim() }
+            } else {
+                document.select("span.mr-2")
+                    .map { it.text() }.distinct()
+            }
+
+        val year =
+            document.selectFirst("div.movie-details > p:nth-child(2), div.max-w-prose.mb-20 > ul > li:nth-child(2) span")
+                ?.ownText()?.substringAfter(",")?.toIntOrNull()
+        val description =
+            document.selectFirst("div.lead.text-neutral-500, span#storyline")
+                ?.text()?.trim()
+        val rating =
+            document.selectFirst("span#rating")?.text()
+                ?.toRatingInt()
+        val actors =
+            document.select("span#cast").text().split(", ")
+                .map { it.trim() }
+
+        val recommendations =
+            document.select("section.w-full a.min-w-full").mapNotNull { it.toSearchResult() }
+
+        return if (type == TvType.TvSeries) {
+            val section = document.select("div.relative > section.w-full a.min-w-full")
+            val hasMultipleSeason = section.any { it.attr("href").contains("/season-") }
+            val episodes =
+                if (hasMultipleSeason) {
+                    section.apmap { ss ->
+                        val season = ss.selectFirst("div.text-xl")?.text()?.filter { it.isDigit() }
+                            ?.toIntOrNull()
+                        app.get(fixUrl(ss.attr("href"))).document.select("div.relative > section.w-full a.min-w-full")
+                            .mapNotNull { eps ->
+                                val name = eps.selectFirst("div.text-xl")?.text()
+                                    ?: return@mapNotNull null
+                                val href = fixUrl(eps.attr("href"))
+                                val posterUrl = eps.selectFirst("div.thumbnail_card")?.attr("style")
+                                    ?.getPoster()
+                                Episode(
+                                    href,
+                                    name,
+                                    posterUrl = posterUrl,
+                                    season = season
+                                )
+                            }
+                    }.flatten()
+                } else {
+                    section.mapNotNull { eps ->
+                        val name = eps.selectFirst("div.text-xl")?.text() ?: return@mapNotNull null
+                        val href = fixUrl(eps.attr("href"))
+                        val posterUrl =
+                            eps.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
+                        Episode(
+                            href,
+                            name,
+                            posterUrl = posterUrl,
+                        )
+                    }
+                }
+            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes.reversed()) {
+                this.posterUrl = poster
+                this.year = year
+                this.seasonNames
+                this.plot = description
+                this.tags = tags
+                this.rating = rating
+                addActors(actors)
+                this.recommendations = recommendations
+            }
+        } else {
+            newMovieLoadResponse(title, url, TvType.Movie, url) {
+                this.posterUrl = poster
+                this.year = year
+                this.plot = description
+                this.tags = tags
+                this.rating = rating
+                addActors(actors)
+                this.recommendations = recommendations
+            }
+        }
+    }
+
+    override suspend fun loadLinks(
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ): Boolean {
+
+        val video = app.get(data).document.select("mux-player").attr("src")
+
+        callback.invoke(
+            ExtractorLink(
+                name,
+                name,
+                video,
+                "",
+                Qualities.Unknown.value,
+            )
+        )
+
+        return true
+    }
+
+    private fun String.getPoster(): String? {
+        return fixUrlNull(
+            this.substringAfter("(")
+                .substringBefore(")"),
+        )
+    }
+
+    data class Index(
+        @JsonProperty("title") val title: String? = null,
+        @JsonProperty("permalink") val permalink: String? = null,
+        @JsonProperty("section") val section: String? = null,
+    )
+}
diff --git a/Raveeflix/src/main/kotlin/com/hexated/RaveeflixPlugin.kt b/Raveeflix/src/main/kotlin/com/hexated/RaveeflixPlugin.kt
new file mode 100644
index 00000000..9d379d11
--- /dev/null
+++ b/Raveeflix/src/main/kotlin/com/hexated/RaveeflixPlugin.kt
@@ -0,0 +1,14 @@
+
+package com.hexated
+
+import com.lagradost.cloudstream3.plugins.CloudstreamPlugin
+import com.lagradost.cloudstream3.plugins.Plugin
+import android.content.Context
+
+@CloudstreamPlugin
+class RaveeflixPlugin: Plugin() {
+    override fun load(context: Context) {
+        // All providers should be added in this manner. Please don't edit the providers list directly.
+        registerMainAPI(Raveeflix())
+    }
+}
\ No newline at end of file

From f455ec8905acf1fd75050cb0a0806cc8faa5e40c Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:26:41 +0700
Subject: [PATCH 115/125] fix #568

---
 DramaSerial/build.gradle.kts                  |   2 +-
 .../main/kotlin/com/hexated/DramaSerial.kt    | 105 +++++++++++++-----
 Raveeflix/build.gradle.kts                    |   2 +-
 3 files changed, 77 insertions(+), 32 deletions(-)

diff --git a/DramaSerial/build.gradle.kts b/DramaSerial/build.gradle.kts
index e00ab652..48e00692 100644
--- a/DramaSerial/build.gradle.kts
+++ b/DramaSerial/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 5
+version = 6
 
 
 cloudstream {
diff --git a/DramaSerial/src/main/kotlin/com/hexated/DramaSerial.kt b/DramaSerial/src/main/kotlin/com/hexated/DramaSerial.kt
index 1c1113dc..c5da4dda 100644
--- a/DramaSerial/src/main/kotlin/com/hexated/DramaSerial.kt
+++ b/DramaSerial/src/main/kotlin/com/hexated/DramaSerial.kt
@@ -6,13 +6,14 @@ import com.lagradost.cloudstream3.extractors.Filesim
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.INFER_TYPE
+import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.loadExtractor
 import org.jsoup.nodes.Element
+import java.net.URI
 
 class DramaSerial : MainAPI() {
     override var mainUrl = "https://tv3.dramaserial.id"
-    private var serverUrl = "http://31.220.73.179/"
+    private var serverUrl = "https://juraganfilm.info"
     override var name = "DramaSerial"
     override val hasMainPage = true
     override var lang = "id"
@@ -72,8 +73,12 @@ class DramaSerial : MainAPI() {
         val duration =
             document.selectFirst("div.gmr-movie-innermeta span:contains(Duration:)")?.text()
                 ?.filter { it.isDigit() }?.toIntOrNull()
-        val description = document.select("div.entry-content.entry-content-single div.entry-content.entry-content-single").text().trim()
-        val type = if(document.select("div.page-links").isNullOrEmpty()) TvType.Movie else TvType.AsianDrama
+        val description =
+            document.select("div.entry-content.entry-content-single div.entry-content.entry-content-single")
+                .text().trim()
+        val type = if (document.select("div.page-links")
+                .isNullOrEmpty()
+        ) TvType.Movie else TvType.AsianDrama
 
         if (type == TvType.Movie) {
             return newMovieLoadResponse(title, url, TvType.Movie, url) {
@@ -84,18 +89,19 @@ class DramaSerial : MainAPI() {
                 this.duration = duration
             }
         } else {
-            val episodes = document.select("div.page-links span.page-link-number").mapNotNull { eps ->
-                val episode = eps.text().filter { it.isDigit() }.toIntOrNull()
-                val link = if(episode == 1) {
-                    url
-                } else {
-                    eps.parent()?.attr("href")
+            val episodes =
+                document.select("div.page-links span.page-link-number").mapNotNull { eps ->
+                    val episode = eps.text().filter { it.isDigit() }.toIntOrNull()
+                    val link = if (episode == 1) {
+                        url
+                    } else {
+                        eps.parent()?.attr("href")
+                    }
+                    Episode(
+                        link ?: return@mapNotNull null,
+                        episode = episode,
+                    )
                 }
-                Episode(
-                    link ?: return@mapNotNull null,
-                    episode = episode,
-                )
-            }
             return newTvSeriesLoadResponse(title, url, TvType.AsianDrama, episodes = episodes) {
                 posterUrl = poster
                 this.year = year
@@ -107,6 +113,7 @@ class DramaSerial : MainAPI() {
     }
 
     private suspend fun invokeGetbk(
+        name: String,
         url: String,
         callback: (ExtractorLink) -> Unit
     ) {
@@ -115,12 +122,12 @@ class DramaSerial : MainAPI() {
             referer = "$serverUrl/"
         ).document.selectFirst("script:containsData(sources)")?.data() ?: return
 
-        val json = "\"sources\":\\s*\\[(.*)]".toRegex().find(script)?.groupValues?.get(1)
+        val json = "sources:\\s*\\[(.*)]".toRegex().find(script)?.groupValues?.get(1)
         AppUtils.tryParseJson<ArrayList<Sources>>("[$json]")?.map {
             callback.invoke(
                 ExtractorLink(
-                    "Getbk",
-                    "Getbk",
+                    name,
+                    name,
                     it.file ?: return@map,
                     "$serverUrl/",
                     getQualityFromName(it.label),
@@ -131,6 +138,34 @@ class DramaSerial : MainAPI() {
 
     }
 
+    private suspend fun invokeGdrive(
+        name: String,
+        url: String,
+        callback: (ExtractorLink) -> Unit
+    ) {
+
+        val embedUrl = app.get(
+            url,
+            referer = "$serverUrl/"
+        ).document.selectFirst("iframe")?.attr("src")?.let { fixUrl(it) } ?: return
+
+        val req = app.get(embedUrl)
+        val host = getBaseUrl(embedUrl)
+        val token = req.document.selectFirst("div#token")?.text() ?: return
+
+        callback.invoke(
+            ExtractorLink(
+                name,
+                name,
+                "$host/hlsplaylist.php?idhls=${token.trim()}.m3u8",
+                "$host/",
+                Qualities.Unknown.value,
+                true
+            )
+        )
+
+    }
+
     override suspend fun loadLinks(
         data: String,
         isCasting: Boolean,
@@ -142,19 +177,23 @@ class DramaSerial : MainAPI() {
         val iframe = document.select("iframe[name=juraganfilm]").attr("src")
         app.get(iframe, referer = "$mainUrl/").document.select("div#header-slider ul li")
             .apmap { mLink ->
-                mLink.attr("onclick").substringAfter("frame('").substringBefore("')").let { iLink ->
-                    val iMovie = iLink.substringAfter("movie=").substringBefore("&")
-                    val mIframe = iLink.substringAfter("iframe=")
-                    val iUrl = "$serverUrl/stream/$mIframe.php?movie=$iMovie"
-                    if(mIframe == "getbk") {
-                        invokeGetbk(iUrl, callback)
-                    } else {
-                        val link = app.get(
-                            iUrl,
-                            referer = "$serverUrl/"
-                        ).document.selectFirst("iframe")?.attr("src") ?: return@apmap null
-                        loadExtractor(fixUrl(link), "$serverUrl/", subtitleCallback, callback)
+                val iLink = mLink.attr("onclick").substringAfter("frame('").substringBefore("')")
+                serverUrl = getBaseUrl(iLink)
+                val iMovie = iLink.substringAfter("movie=").substringBefore("&")
+                val mIframe = iLink.substringAfter("iframe=")
+                val serverName = fixTitle(mIframe)
+                when (mIframe) {
+                    "getbk" -> {
+                        invokeGetbk(
+                            serverName,
+                            "$serverUrl/stream/$mIframe.php?movie=$iMovie",
+                            callback
+                        )
                     }
+                    "gdrivehls", "gdriveplayer" -> {
+                        invokeGdrive(serverName, iLink, callback)
+                    }
+                    else -> {}
                 }
             }
 
@@ -162,6 +201,12 @@ class DramaSerial : MainAPI() {
 
     }
 
+    private fun getBaseUrl(url: String): String {
+        return URI(url).let {
+            "${it.scheme}://${it.host}"
+        }
+    }
+
     private data class Sources(
         @JsonProperty("file") val file: String? = null,
         @JsonProperty("label") val label: String? = null,
diff --git a/Raveeflix/build.gradle.kts b/Raveeflix/build.gradle.kts
index a6b81709..43e6e5e1 100644
--- a/Raveeflix/build.gradle.kts
+++ b/Raveeflix/build.gradle.kts
@@ -23,5 +23,5 @@ cloudstream {
         "Movie",
     )
 
-    iconUrl = "https://www.google.com/s2/favicons?domain=raveeflix.my.id&sz=%size%"
+    iconUrl = "https://raveeflix.my.id/favicon.ico"
 }

From 2ea2bbb035af5b502b2b2fe2c01326fee8f13046 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 2 Feb 2024 11:07:51 +0700
Subject: [PATCH 116/125] fix #571

---
 AnimeDekhoProvider/build.gradle.kts           |   3 +-
 .../kotlin/com/anon/AnimeDekhoProvider.kt     | 199 ++++++++----------
 2 files changed, 90 insertions(+), 112 deletions(-)

diff --git a/AnimeDekhoProvider/build.gradle.kts b/AnimeDekhoProvider/build.gradle.kts
index 224fc347..934a2bd4 100644
--- a/AnimeDekhoProvider/build.gradle.kts
+++ b/AnimeDekhoProvider/build.gradle.kts
@@ -1,8 +1,7 @@
-version = 2
+version = 3
 
 cloudstream {
     language = "hi"
-    description = "SKIP ADS on the SITE every 24 hours to Play, has Hindi Dubbed Cartoons"
     authors = listOf("anon")
 
     /**
diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
index 0f024ddc..fb50b44c 100644
--- a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
@@ -1,26 +1,11 @@
 package com.anon
 
-import android.util.Log
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.extractors.DoodLaExtractor
+import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.nicehttp.Requests
-import com.lagradost.nicehttp.Session
-import kotlinx.coroutines.delay
-import org.jsoup.nodes.Element
-import com.lagradost.cloudstream3.network.WebViewResolver
-import com.lagradost.nicehttp.requestCreator
-import org.jsoup.Jsoup
-import java.util.regex.Pattern
-import okhttp3.Interceptor
-import okhttp3.Response
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import com.lagradost.nicehttp.RequestBodyTypes
-import okhttp3.RequestBody.Companion.toRequestBody
-import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler
+import org.jsoup.nodes.Element
 
 class AnimeDekhoProvider : MainAPI() {
     override var mainUrl = "https://animedekho.com"
@@ -28,83 +13,85 @@ class AnimeDekhoProvider : MainAPI() {
     override val hasMainPage = true
     override var lang = "hi"
     override val hasDownloadSupport = true
+    private val serverUrl = "https://vidxstream.xyz"
 
-    override val supportedTypes = setOf(
-        TvType.Cartoon,
-        TvType.Anime,
-        TvType.AnimeMovie,
-        TvType.Movie
-    )
-
-    override val mainPage = mainPageOf(
-        "/series/" to "Series",
-        "/movie/" to "Movies",
-        "/category/anime/" to "Anime",
-        "/category/cartoon/" to "Cartoon",
+    override val supportedTypes =
+        setOf(
+            TvType.Cartoon,
+            TvType.Anime,
+            TvType.AnimeMovie,
+            TvType.Movie,
         )
 
-    override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+    override val mainPage =
+        mainPageOf(
+            "/series/" to "Series",
+            "/movie/" to "Movies",
+            "/category/anime/" to "Anime",
+            "/category/cartoon/" to "Cartoon",
+        )
+
+    override suspend fun getMainPage(
+        page: Int,
+        request: MainPageRequest,
+    ): HomePageResponse {
         val link = "$mainUrl${request.data}"
         val document = app.get(link).document
-        val home = document.select("article").mapNotNull {
-            it.toSearchResult()
-        }
+        val home =
+            document.select("article").mapNotNull {
+                it.toSearchResult()
+            }
         return newHomePageResponse(request.name, home)
     }
 
     private fun Element.toSearchResult(): AnimeSearchResponse? {
-        //val href = fixUrl(this.selectFirst("a")?.attr("href") ?: return null)
-        val href = this.selectFirst("a.lnk-blk")?.attr("href") ?: "null"
-        var title = this.selectFirst("header h2")?.text() ?: "null"
-        val posterUrl = this.selectFirst("div figure img")?.attr("src") ?: "null"
+        val href = this.selectFirst("a.lnk-blk")?.attr("href") ?: return null
+        val title = this.selectFirst("header h2")?.text() ?: "null"
+        val posterUrl = this.selectFirst("div figure img")?.attr("src")
 
-        return newAnimeSearchResponse(title, href, TvType.Anime) {
+        return newAnimeSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Anime) {
             this.posterUrl = posterUrl
         }
     }
 
     override suspend fun search(query: String): List<AnimeSearchResponse> {
         val document = app.get("$mainUrl/?s=$query").document
-        //return document.select("div.post-filter-image").mapNotNull {
         return document.select("ul[data-results] li article").mapNotNull {
             it.toSearchResult()
         }
     }
 
-    override suspend fun load(url: String): LoadResponse? {
-        
-        val document = app.get(url).document
+    override suspend fun load(url: String): LoadResponse {
 
-        var title = document?.selectFirst("h1.entry-title")?.text()?.trim()  ?: (document?.selectFirst("h3")?.text()?.trim() ?: "Null title")
-        val poster  = document?.selectFirst("div.post-thumbnail figure img")?.attr("src") ?: "null"
-        val plot  = document?.selectFirst("div.entry-content p")?.text()?.trim() ?: "null"
-        val year  = document?.selectFirst("span.year")?.text()?.trim()?.toInt() ?: 1990
-        var episodes = mutableListOf<Episode>()
+        val media = parseJson<Media>(url)
+        val document = app.get(media.url).document
 
-        val items = document.select("ul.seasons-lst li").mapNotNull {   
-            val name = it?.selectFirst("h3.title")?.text() ?: "null"
-            val tempstring = it?.selectFirst("a")?.attr("href") ?: "null"
+        val title = document.selectFirst("h1.entry-title")?.text()?.trim()
+            ?: document.selectFirst("meta[property=og:image:alt]")?.attr("content") ?: "No Title"
+        val poster = fixUrlNull(document.selectFirst("div.post-thumbnail figure img")?.attr("src") ?: media.poster)
+        val plot = document.selectFirst("div.entry-content p")?.text()?.trim()
+            ?: document.selectFirst("meta[name=twitter:description]")?.attr("content")
+        val year = (document.selectFirst("span.year")?.text()?.trim()
+            ?: document.selectFirst("meta[property=og:updated_time]")?.attr("content")
+                ?.substringBefore("-"))?.toIntOrNull()
+        val lst = document.select("ul.seasons-lst li")
 
-            episodes.add( Episode(tempstring, name) )
-            }
-        
-        if(items.size==0){
-            val vidtoonoid = document?.selectFirst("iframe")?.attr("src") ?: "NULL"
-            val vidlink = app.get(vidtoonoid)?.document?.selectFirst("div iframe")?.attr("src") ?: "null"
-            return newMovieLoadResponse(title, vidlink, TvType.Movie, vidlink) {
-                this.posterUrl = poster.toString()
+        return if (lst.isEmpty()) {
+            newMovieLoadResponse(title, media.url, TvType.Movie, Media(media.url, mediaType = 1).toJson()) {
+                this.posterUrl = poster
                 this.plot = plot
                 this.year = year
-                //this.recommendations = recommendations
             }
-        }
-
-        else{
-            return newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
-                this.posterUrl = poster.toString()
+        } else {
+            val episodes = document.select("ul.seasons-lst li").mapNotNull {
+                val name = it.selectFirst("h3.title")?.text() ?: "null"
+                val href = it.selectFirst("a")?.attr("href") ?: return@mapNotNull null
+                Episode(Media(href, mediaType = 2).toJson(), name)
+            }
+            newTvSeriesLoadResponse(title, media.url, TvType.TvSeries, episodes) {
+                this.posterUrl = poster
                 this.plot = plot
                 this.year = year
-                //this.recommendations = recommendations
             }
         }
     }
@@ -113,56 +100,48 @@ class AnimeDekhoProvider : MainAPI() {
         data: String,
         isCasting: Boolean,
         subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
+        callback: (ExtractorLink) -> Unit,
     ): Boolean {
+        val media = parseJson<Media>(data)
+        val body = app.get(media.url).document.selectFirst("body")?.attr("class") ?: return false
+        val term = Regex("""(?:term|postid)-(\d+)""").find(body)?.groupValues?.get(1) ?: throw ErrorLoadingException("no id found")
+        val vidLink = app.get("$mainUrl/?trembed=0&trid=$term&trtype=${media.mediaType}")
+            .document.selectFirst("iframe")?.attr("src")
+            ?: throw ErrorLoadingException("no iframe found")
 
-        var vidlink = ""
+        val doc = app.get(vidLink).text
+        val master = Regex("""JScript[\w+]?\s*=\s*'([^']+)""").find(doc)!!.groupValues[1]
+        val decrypt = cryptoAESHandler(master, "a7igbpIApajDyNe".toByteArray(), false)?.replace("\\", "")
+            ?: throw ErrorLoadingException("error decrypting")
+        val vidFinal = Regex("""file:\s*"(https:[^"]+)"""").find(decrypt)!!.groupValues[1]
 
-        if(data.contains("https://vidxstream.xyz")){
-            vidlink = data
-        }
-        else{
-
-            val page1 = app.get(data).document
-
-            val name = page1?.selectFirst("body")?.attr("class") ?: "null"
-
-            var term = Regex("""\bterm-(\d+)\b""").find(name)?.value!!?.replace("term-","")
-
-            vidlink = app.get("https://animedekho.com/?trembed=0&trid="+term)
-                                .document?.selectFirst("iframe")?.attr("src") ?: "null"
-        }
-
-        //Log.d("TAGNAME", "vidlink $vidlink") //https://vidxstream.xyz/v/H0Rh3ixVLJKk/
-        val body = app.get(vidlink).text
-        val master = Regex("""JScript[\w+]?\s*=\s*'([^']+)""").find(body)!!.groupValues?.get(1)
-        val decrypt = cryptoAESHandler(master ?: return false, "4MmH9EsZrq0WEekn".toByteArray(), false)?.replace("\\", "") ?: "ERROR"
-        val vidfinal = Regex("""file:\s*\"(https:[^\"]+)\"""").find(decrypt)!!.groupValues?.get(1)
-
-        val headers = mapOf(
-            "accept" to "*/*",
-            "accept-language" to "en-US,en;q=0.5",
-            "Origin" to "https://vidxstream.xyz",
-            "Accept-Encoding" to "gzip, deflate, br",
-            "Connection" to "keep-alive",
-            //"Referer" to "https://vidxstream.xyz/",
-            "Sec-Fetch-Dest" to "empty",
-            "Sec-Fetch-Mode" to "cors",
-            "Sec-Fetch-Site" to "cross-site",
-            "user-agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/116.0",
-                )
-        
-        callback.invoke(ExtractorLink
-            (
-            source = "Toon",
-            name = "Toon",
-            url = vidfinal!!,
-            referer = "https://vidxstream.xyz/",
-            quality = Qualities.Unknown.value,
-            isM3u8 = true,
-            headers = headers,
+        val headers =
+            mapOf(
+                "accept" to "*/*",
+                "accept-language" to "en-US,en;q=0.5",
+                "Origin" to serverUrl,
+                "Accept-Encoding" to "gzip, deflate, br",
+                "Connection" to "keep-alive",
+                // "Referer" to "https://vidxstream.xyz/",
+                "Sec-Fetch-Dest" to "empty",
+                "Sec-Fetch-Mode" to "cors",
+                "Sec-Fetch-Site" to "cross-site",
+                "user-agent" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/116.0",
             )
+
+        callback.invoke(
+            ExtractorLink(
+                source = "Toon",
+                name = "Toon",
+                url = vidFinal,
+                referer = "$serverUrl/",
+                quality = Qualities.Unknown.value,
+                isM3u8 = true,
+                headers = headers,
+            ),
         )
         return true
     }
+
+    data class Media(val url: String, val poster: String? = null, val mediaType: Int? = null)
 }
\ No newline at end of file

From c57f60275d3a2302f3ec06a6e2a8531fd01e4624 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:11:50 +0700
Subject: [PATCH 117/125] sora: fi sources

---
 SoraStream/build.gradle.kts                   |  2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 33 +++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 367225c3..334cb5c4 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 221
+version = 222
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 8b0ef008..d8ef6a06 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -218,10 +218,29 @@ object SoraExtractor : SoraStream() {
         val req = app.get(url)
         val directUrl = getBaseUrl(req.url)
         req.document.select("ul.bx-lst.aa-tbs li a").apmap {
-            if(!it.select("span.option").text().startsWith("Gdmirrorbot")) return@apmap
             val iframe = app.get(base64Decode(it.attr("data-src"))).document.selectFirst("iframe")
-                ?.attr("src")
-            loadExtractor(iframe ?: return@apmap, "$directUrl/", subtitleCallback, callback)
+                ?.attr("src") ?: return@apmap
+            loadExtractor(iframe, "$directUrl/", subtitleCallback) { link ->
+                when {
+                    link.name == "Bestx" && link.quality == Qualities.Unknown.value -> {
+                        callback.invoke(
+                            ExtractorLink(
+                                "Moviefiction",
+                                "Moviefiction",
+                                link.url,
+                                link.referer,
+                                Qualities.P1080.value,
+                                link.type,
+                                link.headers,
+                                link.extractorData
+                            )
+                        )
+                    }
+                    link.name != "Bestx" -> {
+                        callback.invoke(link)
+                    }
+                }
+            }
         }
     }
 
@@ -2111,8 +2130,10 @@ object SoraExtractor : SoraStream() {
             cookies = cookies,
             referer = url,
             headers = headers
-        ).document
-        serverRes.select("ul li").apmap { el ->
+        )
+        val script = getAndUnpack(serverRes.text)
+        val key = """\(key\s*=\s*(\d+)\)""".toRegex().find(script)?.groupValues?.get(1) ?: return
+        serverRes.document.select("ul li").apmap { el ->
             val server = el.attr("data-value")
             val encryptedData = app.get(
                 "$url?server=$server&_=$unixTimeMS",
@@ -2120,7 +2141,7 @@ object SoraExtractor : SoraStream() {
                 referer = url,
                 headers = headers
             ).text
-            val links = encryptedData.decrypt(base64Decode("OTg="))
+            val links = encryptedData.decrypt(key)
             links?.forEach { video ->
                 qualities.filter { it <= video.max.toInt() }.forEach {
                     callback(

From b03368e13a9e2eeb10f05d22cb947fc31fe6af8a Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:33:52 +0700
Subject: [PATCH 118/125] fix #580, fix #575, solved #566

---
 DubokuProvider/build.gradle.kts               |   2 +-
 .../main/kotlin/com/hexated/DubokuProvider.kt |  28 +++--
 Kinoger/build.gradle.kts                      |   2 +-
 .../src/main/kotlin/com/hexated/Kinoger.kt    |   3 +-
 .../src/main/kotlin/com/hexated/Raveeflix.kt  | 116 +++++++++++-------
 5 files changed, 94 insertions(+), 57 deletions(-)

diff --git a/DubokuProvider/build.gradle.kts b/DubokuProvider/build.gradle.kts
index c5826742..75e75012 100644
--- a/DubokuProvider/build.gradle.kts
+++ b/DubokuProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt b/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt
index 1262fb5d..b0919422 100644
--- a/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt
+++ b/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt
@@ -3,10 +3,10 @@ package com.hexated
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
+import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
 import org.jsoup.nodes.Element
+import java.net.URLDecoder
 
 class DubokuProvider : MainAPI() {
     override var mainUrl = "https://www.duboku.tv"
@@ -110,21 +110,29 @@ class DubokuProvider : MainAPI() {
             if (script.data().contains("var player_data={")) {
                 val dataJson =
                     script.data().substringAfter("var player_data={").substringBefore("}")
-                tryParseJson<Sources>("{$dataJson}")?.let { source ->
-                    M3u8Helper.generateM3u8(
+                val source = tryParseJson<Sources>("{$dataJson}")
+                callback.invoke(
+                    ExtractorLink(
                         this.name,
-                        source.url ?: return@map,
-                        referer = "https://w.duboku.io/",
-                        headers = mapOf("Origin" to "https://w.duboku.io")
-                    ).forEach(callback)
-                }
+                        this.name,
+                        decode(base64Decode(source?.url ?: return@map)),
+                        "https://w.duboku.io/",
+                        Qualities.Unknown.value,
+                        INFER_TYPE,
+                        headers = mapOf(
+                            "Accept-Language" to "en-US,en;q=0.5",
+                            "Origin" to "https://w.duboku.io"
+                        ),
+                    )
+                )
             }
         }
 
-
         return true
     }
 
+    private fun decode(input: String): String = URLDecoder.decode(input, "utf-8")
+
     data class Sources(
         @JsonProperty("url") val url: String?,
     )
diff --git a/Kinoger/build.gradle.kts b/Kinoger/build.gradle.kts
index 68c19e49..f7decb7b 100644
--- a/Kinoger/build.gradle.kts
+++ b/Kinoger/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
diff --git a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
index 30e78a2a..d53d819f 100644
--- a/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
+++ b/Kinoger/src/main/kotlin/com/hexated/Kinoger.kt
@@ -2,6 +2,7 @@ package com.hexated
 
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.extractors.Chillx
+import com.lagradost.cloudstream3.network.CloudflareKiller
 import com.lagradost.cloudstream3.utils.AppUtils
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
@@ -11,7 +12,7 @@ import org.jsoup.nodes.Element
 
 class Kinoger : MainAPI() {
     override var name = "Kinoger"
-    override var mainUrl = "https://kinoger.com"
+    override var mainUrl = "https://kinoger.to"
     override var lang = "de"
     override val hasMainPage = true
     override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie)
diff --git a/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt b/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
index 39c494ab..98216d4d 100644
--- a/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
+++ b/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
@@ -4,7 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
 import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import org.jsoup.nodes.Element
+import org.jsoup.select.Elements
 
 class Raveeflix : MainAPI() {
     override var mainUrl = "https://raveeflix.my.id"
@@ -21,6 +24,7 @@ class Raveeflix : MainAPI() {
     override val mainPage =
         mainPageOf(
             "categories/trending" to "Trending",
+            "movies" to "Movies",
             "tv" to "Tv-Shows",
             "drakor" to "Drakor",
             "categories/anime" to "Anime",
@@ -45,34 +49,41 @@ class Raveeflix : MainAPI() {
         val href = fixUrl(this.attr("href"))
         val posterUrl = this.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
 
-        return newMovieSearchResponse(title, href, TvType.Movie) {
+        return newMovieSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Movie) {
             this.posterUrl = posterUrl
         }
     }
 
     override suspend fun search(query: String): List<SearchResponse>? {
-        val res = app.get("$mainUrl/index.json").text.let { AppUtils.tryParseJson<ArrayList<Index>>(it) }
+        val res =
+            app.get("$mainUrl/index.json").text.let { AppUtils.tryParseJson<ArrayList<Index>>(it) }
         return res?.filter {
             it.title?.contains(
                 query,
                 true
-            ) == true && !it.section.equals("Categories", true) && !it.section.equals("Tags", true) && it.permalink?.contains("/episode") == false
+            ) == true && !it.section.equals("Categories", true) && !it.section.equals(
+                "Tags",
+                true
+            ) && it.permalink?.contains("/episode") == false
         }?.mapNotNull {
             newMovieSearchResponse(
                 it.title ?: return@mapNotNull null,
-                fixUrl(
-                    it.permalink?.substringBefore("episode")?.substringBefore("season")
-                        ?: return@mapNotNull null,
-                ),
+                Media(
+                    fixUrl(
+                        it.permalink?.substringBefore("episode")?.substringBefore("season")
+                            ?: return@mapNotNull null
+                    )
+                ).toJson(),
                 TvType.Movie,
             )
         }
     }
 
     override suspend fun load(url: String): LoadResponse {
-        val document = app.get(url).document
+        val media = parseJson<Media>(url)
+        val document = app.get(media.url).document
         val title = document.selectFirst("h1.text-4xl")?.text() ?: "No Title"
-        val poster = document.selectFirst("div.thumbnail_card, div.w-full.thumbnail_card_related")
+        val poster = media.poster ?: document.selectFirst("div.thumbnail_card, div.w-full.thumbnail_card_related")
             ?.attr("style")?.getPoster()
         val type =
             if (document.select("mux-player").isNullOrEmpty()) TvType.TvSeries else TvType.Movie
@@ -103,42 +114,24 @@ class Raveeflix : MainAPI() {
             document.select("section.w-full a.min-w-full").mapNotNull { it.toSearchResult() }
 
         return if (type == TvType.TvSeries) {
-            val section = document.select("div.relative > section.w-full a.min-w-full")
+            val sectionSelector = "div.relative > section.w-full a.min-w-full"
+            val section = document.select(sectionSelector)
             val hasMultipleSeason = section.any { it.attr("href").contains("/season-") }
-            val episodes =
-                if (hasMultipleSeason) {
-                    section.apmap { ss ->
-                        val season = ss.selectFirst("div.text-xl")?.text()?.filter { it.isDigit() }
+            val episodes = if (hasMultipleSeason) {
+                section.apmap { ss ->
+                    fetchEpisodesFromPages(
+                        ss.attr("href"),
+                        5,
+                        sectionSelector,
+                        true,
+                        ss.selectFirst("div.text-xl")?.text()?.filter { it.isDigit() }
                             ?.toIntOrNull()
-                        app.get(fixUrl(ss.attr("href"))).document.select("div.relative > section.w-full a.min-w-full")
-                            .mapNotNull { eps ->
-                                val name = eps.selectFirst("div.text-xl")?.text()
-                                    ?: return@mapNotNull null
-                                val href = fixUrl(eps.attr("href"))
-                                val posterUrl = eps.selectFirst("div.thumbnail_card")?.attr("style")
-                                    ?.getPoster()
-                                Episode(
-                                    href,
-                                    name,
-                                    posterUrl = posterUrl,
-                                    season = season
-                                )
-                            }
-                    }.flatten()
-                } else {
-                    section.mapNotNull { eps ->
-                        val name = eps.selectFirst("div.text-xl")?.text() ?: return@mapNotNull null
-                        val href = fixUrl(eps.attr("href"))
-                        val posterUrl =
-                            eps.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
-                        Episode(
-                            href,
-                            name,
-                            posterUrl = posterUrl,
-                        )
-                    }
-                }
-            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes.reversed()) {
+                    )
+                }.toMutableList().flatten()
+            } else {
+                fetchEpisodesFromPages(media.url, 5, sectionSelector, false)
+            }
+            newTvSeriesLoadResponse(title, media.url, TvType.TvSeries, episodes.reversed()) {
                 this.posterUrl = poster
                 this.year = year
                 this.seasonNames
@@ -149,7 +142,7 @@ class Raveeflix : MainAPI() {
                 this.recommendations = recommendations
             }
         } else {
-            newMovieLoadResponse(title, url, TvType.Movie, url) {
+            newMovieLoadResponse(title, media.url, TvType.Movie, media.url) {
                 this.posterUrl = poster
                 this.year = year
                 this.plot = description
@@ -183,6 +176,39 @@ class Raveeflix : MainAPI() {
         return true
     }
 
+    private suspend fun fetchEpisodesFromPages(
+        baseUrl: String,
+        maxPages: Int,
+        sectionSelector: String,
+        hasMultipleSeasons: Boolean,
+        season: Int? = null
+    ): MutableList<Episode> {
+        val epsData = mutableListOf<Episode>()
+        for (index in 1..maxPages) {
+            val pageUrl = if (index == 1) baseUrl else "${baseUrl.removeSuffix("/")}/page/$index/"
+            val episodeVo = app.get(fixUrl(pageUrl)).document.select(sectionSelector)
+                .getEpisodes(if (hasMultipleSeasons) season else null)
+            if (episodeVo.isEmpty()) break
+            epsData.addAll(episodeVo)
+        }
+        return epsData
+    }
+
+    private fun Elements.getEpisodes(season: Int? = 1): List<Episode> {
+        return this.mapNotNull { eps ->
+            val name = eps.selectFirst("div.text-xl")?.text() ?: return@mapNotNull null
+            val href = fixUrl(eps.attr("href"))
+            val posterUrl =
+                eps.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
+            Episode(
+                href,
+                name,
+                posterUrl = posterUrl,
+                season = season
+            )
+        }
+    }
+
     private fun String.getPoster(): String? {
         return fixUrlNull(
             this.substringAfter("(")
@@ -190,6 +216,8 @@ class Raveeflix : MainAPI() {
         )
     }
 
+    data class Media(val url: String, val poster: String? = null)
+
     data class Index(
         @JsonProperty("title") val title: String? = null,
         @JsonProperty("permalink") val permalink: String? = null,

From 1fd3422832518eaa674f0cde5ff8e682a072dfe8 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Thu, 8 Feb 2024 19:04:56 +0700
Subject: [PATCH 119/125] bump

---
 Raveeflix/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Raveeflix/build.gradle.kts b/Raveeflix/build.gradle.kts
index 43e6e5e1..f826ae8d 100644
--- a/Raveeflix/build.gradle.kts
+++ b/Raveeflix/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {

From 6cce88370a6d502bc3b5e27416dcc496cffde534 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 9 Feb 2024 15:29:50 +0700
Subject: [PATCH 120/125] AnimeDekhoProvider, Raveeflix: fix when bookmarking.

---
 AnimeDekhoProvider/build.gradle.kts                        | 2 +-
 .../src/main/kotlin/com/anon/AnimeDekhoProvider.kt         | 7 ++++---
 Raveeflix/build.gradle.kts                                 | 2 +-
 Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt         | 7 ++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/AnimeDekhoProvider/build.gradle.kts b/AnimeDekhoProvider/build.gradle.kts
index 934a2bd4..38570fc9 100644
--- a/AnimeDekhoProvider/build.gradle.kts
+++ b/AnimeDekhoProvider/build.gradle.kts
@@ -1,4 +1,4 @@
-version = 3
+version = 4
 
 cloudstream {
     language = "hi"
diff --git a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
index fb50b44c..c69a9c0c 100644
--- a/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
+++ b/AnimeDekhoProvider/src/main/kotlin/com/anon/AnimeDekhoProvider.kt
@@ -49,8 +49,9 @@ class AnimeDekhoProvider : MainAPI() {
         val title = this.selectFirst("header h2")?.text() ?: "null"
         val posterUrl = this.selectFirst("div figure img")?.attr("src")
 
-        return newAnimeSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Anime) {
+        return newAnimeSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Anime, false) {
             this.posterUrl = posterUrl
+            addDubStatus(dubExist = true, subExist = true)
         }
     }
 
@@ -77,7 +78,7 @@ class AnimeDekhoProvider : MainAPI() {
         val lst = document.select("ul.seasons-lst li")
 
         return if (lst.isEmpty()) {
-            newMovieLoadResponse(title, media.url, TvType.Movie, Media(media.url, mediaType = 1).toJson()) {
+            newMovieLoadResponse(title, url, TvType.Movie, Media(media.url, mediaType = 1).toJson()) {
                 this.posterUrl = poster
                 this.plot = plot
                 this.year = year
@@ -88,7 +89,7 @@ class AnimeDekhoProvider : MainAPI() {
                 val href = it.selectFirst("a")?.attr("href") ?: return@mapNotNull null
                 Episode(Media(href, mediaType = 2).toJson(), name)
             }
-            newTvSeriesLoadResponse(title, media.url, TvType.TvSeries, episodes) {
+            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
                 this.posterUrl = poster
                 this.plot = plot
                 this.year = year
diff --git a/Raveeflix/build.gradle.kts b/Raveeflix/build.gradle.kts
index f826ae8d..a367f9d5 100644
--- a/Raveeflix/build.gradle.kts
+++ b/Raveeflix/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
diff --git a/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt b/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
index 98216d4d..fec8358b 100644
--- a/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
+++ b/Raveeflix/src/main/kotlin/com/hexated/Raveeflix.kt
@@ -49,7 +49,7 @@ class Raveeflix : MainAPI() {
         val href = fixUrl(this.attr("href"))
         val posterUrl = this.selectFirst("div.thumbnail_card")?.attr("style")?.getPoster()
 
-        return newMovieSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Movie) {
+        return newMovieSearchResponse(title, Media(href, posterUrl).toJson(), TvType.Movie, false) {
             this.posterUrl = posterUrl
         }
     }
@@ -75,6 +75,7 @@ class Raveeflix : MainAPI() {
                     )
                 ).toJson(),
                 TvType.Movie,
+                false,
             )
         }
     }
@@ -131,7 +132,7 @@ class Raveeflix : MainAPI() {
             } else {
                 fetchEpisodesFromPages(media.url, 5, sectionSelector, false)
             }
-            newTvSeriesLoadResponse(title, media.url, TvType.TvSeries, episodes.reversed()) {
+            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes.reversed()) {
                 this.posterUrl = poster
                 this.year = year
                 this.seasonNames
@@ -142,7 +143,7 @@ class Raveeflix : MainAPI() {
                 this.recommendations = recommendations
             }
         } else {
-            newMovieLoadResponse(title, media.url, TvType.Movie, media.url) {
+            newMovieLoadResponse(title, url, TvType.Movie, media.url) {
                 this.posterUrl = poster
                 this.year = year
                 this.plot = description

From d17d1e870affbbc2662cfea3629f9d15286dc924 Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Fri, 9 Feb 2024 16:45:04 +0700
Subject: [PATCH 121/125] fix #583

---
 DubokuProvider/build.gradle.kts               |  2 +-
 .../main/kotlin/com/hexated/DubokuProvider.kt | 49 +++++++++++--------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/DubokuProvider/build.gradle.kts b/DubokuProvider/build.gradle.kts
index 75e75012..6582031c 100644
--- a/DubokuProvider/build.gradle.kts
+++ b/DubokuProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
diff --git a/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt b/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt
index b0919422..998e1018 100644
--- a/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt
+++ b/DubokuProvider/src/main/kotlin/com/hexated/DubokuProvider.kt
@@ -10,6 +10,7 @@ import java.net.URLDecoder
 
 class DubokuProvider : MainAPI() {
     override var mainUrl = "https://www.duboku.tv"
+    private var serverUrl = "https://w.duboku.io"
     override var name = "Duboku"
     override val hasMainPage = true
     override var lang = "zh"
@@ -106,35 +107,41 @@ class DubokuProvider : MainAPI() {
         callback: (ExtractorLink) -> Unit
     ): Boolean {
 
-        app.get(data).document.select("script").map { script ->
-            if (script.data().contains("var player_data={")) {
-                val dataJson =
-                    script.data().substringAfter("var player_data={").substringBefore("}")
-                val source = tryParseJson<Sources>("{$dataJson}")
-                callback.invoke(
-                    ExtractorLink(
-                        this.name,
-                        this.name,
-                        decode(base64Decode(source?.url ?: return@map)),
-                        "https://w.duboku.io/",
-                        Qualities.Unknown.value,
-                        INFER_TYPE,
-                        headers = mapOf(
-                            "Accept-Language" to "en-US,en;q=0.5",
-                            "Origin" to "https://w.duboku.io"
-                        ),
-                    )
-                )
-            }
-        }
+        val dataJson =
+            app.get(data).document.selectFirst("script:containsData(var player_data={)")?.data()
+                ?.substringAfter("var player_data={")?.substringBefore("}")
+                ?: throw IllegalArgumentException()
+        val source = tryParseJson<Sources>("{$dataJson}")
+        callback.invoke(
+            ExtractorLink(
+                this.name,
+                this.name,
+                "${decode(base64Decode(source?.url ?: return false))}${getSign(source.from, data)}",
+                "$serverUrl/",
+                Qualities.Unknown.value,
+                INFER_TYPE,
+                headers = mapOf(
+                    "Accept-Language" to "en-US,en;q=0.5",
+                    "Origin" to serverUrl
+                ),
+            )
+        )
 
         return true
     }
 
+    private suspend fun getSign(server: String? = "vidjs24", ref: String): String {
+        return app.get(
+            "$serverUrl/static/player/$server.php",
+            referer = ref
+        ).text.substringAfter("PlayUrl+'").substringBefore("'")
+    }
+
     private fun decode(input: String): String = URLDecoder.decode(input, "utf-8")
 
     data class Sources(
         @JsonProperty("url") val url: String?,
+        @JsonProperty("from") val from: String?,
     )
 
 

From 36d0a975803b067005b35d54702170ba956cc8fb Mon Sep 17 00:00:00 2001
From: Olivia <olivia@users.noreply.github.com>
Date: Sun, 11 Feb 2024 04:21:01 +0700
Subject: [PATCH 122/125] fix sora sources, fix #583 and more

---
 Hentaiheaven/build.gradle.kts                 |   2 +-
 .../main/kotlin/com/hexated/Hentaiheaven.kt   |   2 +-
 OploverzProvider/build.gradle.kts             |   2 +-
 .../kotlin/com/hexated/OploverzProvider.kt    |  17 +--
 Samehadaku/build.gradle.kts                   |   2 +-
 .../src/main/kotlin/com/hexated/Samehadaku.kt | 116 ++++++------------
 SoraStream/build.gradle.kts                   |   2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  |  54 ++++----
 .../src/main/kotlin/com/hexated/SoraStream.kt |   3 +-
 9 files changed, 72 insertions(+), 128 deletions(-)

diff --git a/Hentaiheaven/build.gradle.kts b/Hentaiheaven/build.gradle.kts
index 017bc97a..1306ce5e 100644
--- a/Hentaiheaven/build.gradle.kts
+++ b/Hentaiheaven/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 3
+version = 4
 
 
 cloudstream {
diff --git a/Hentaiheaven/src/main/kotlin/com/hexated/Hentaiheaven.kt b/Hentaiheaven/src/main/kotlin/com/hexated/Hentaiheaven.kt
index aea799a0..568c1417 100644
--- a/Hentaiheaven/src/main/kotlin/com/hexated/Hentaiheaven.kt
+++ b/Hentaiheaven/src/main/kotlin/com/hexated/Hentaiheaven.kt
@@ -55,7 +55,7 @@ class Hentaiheaven : MainAPI() {
         val link = "$mainUrl/?s=$query&post_type=wp-manga"
         val document = app.get(link).document
 
-        return document.select("div.c-tabs-item div.row.c-tabs-item__content").mapNotNull {
+        return document.select("div.c-tabs-item > div.c-tabs-item__content").mapNotNull {
             it.toSearchResult()
         }
     }
diff --git a/OploverzProvider/build.gradle.kts b/OploverzProvider/build.gradle.kts
index 928dbcf4..e021c6c2 100644
--- a/OploverzProvider/build.gradle.kts
+++ b/OploverzProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 29
+version = 30
 
 
 cloudstream {
diff --git a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
index 908f97bb..37c0cf9e 100644
--- a/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
+++ b/OploverzProvider/src/main/kotlin/com/hexated/OploverzProvider.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.*
 import org.jsoup.nodes.Element
 
 class OploverzProvider : MainAPI() {
-    override var mainUrl = "https://oploverz.guru"
+    override var mainUrl = "https://oploverz.gold"
     override var name = "Oploverz"
     override val hasMainPage = true
     override var lang = "id"
@@ -20,7 +20,6 @@ class OploverzProvider : MainAPI() {
     )
 
     companion object {
-        const val acefile = "https://acefile.co"
         fun getType(t: String): TvType {
             return if (t.contains("OVA", true) || t.contains("Special")) TvType.OVA
             else if (t.contains("Movie", true)) TvType.AnimeMovie
@@ -170,14 +169,14 @@ class OploverzProvider : MainAPI() {
                         headers = mapOf("X-Requested-With" to "XMLHttpRequest")
                     ).document.select("iframe").attr("src")
 
-                    loadExtractor(fixedIframe(iframe), "$mainUrl/", subtitleCallback, callback)
+                    loadExtractor(fixUrl(iframe), "$mainUrl/", subtitleCallback, callback)
 
                 }
             },
             {
-                document.select("div#download tr").map { el ->
+                document.select("div#download tr").apmap { el ->
                     el.select("a").apmap {
-                        loadFixedExtractor(fixedIframe(it.attr("href")), el.select("strong").text(), "$mainUrl/", subtitleCallback, callback)
+                        loadFixedExtractor(fixUrl(it.attr("href")), el.select("strong").text(), "$mainUrl/", subtitleCallback, callback)
                     }
                 }
             }
@@ -217,12 +216,4 @@ class OploverzProvider : MainAPI() {
         }
     }
 
-    private fun fixedIframe(url: String): String {
-        val id = Regex("""(?:/f/|/file/)(\w+)""").find(url)?.groupValues?.getOrNull(1)
-        return when {
-            url.startsWith(acefile) -> "${acefile}/player/$id"
-            else -> fixUrl(url)
-        }
-    }
-
 }
diff --git a/Samehadaku/build.gradle.kts b/Samehadaku/build.gradle.kts
index f1f9be79..94602b00 100644
--- a/Samehadaku/build.gradle.kts
+++ b/Samehadaku/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 21
+version = 22
 
 
 cloudstream {
diff --git a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
index 95770cea..1a6c1c70 100644
--- a/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
+++ b/Samehadaku/src/main/kotlin/com/hexated/Samehadaku.kt
@@ -10,19 +10,17 @@ import com.lagradost.cloudstream3.utils.loadExtractor
 import org.jsoup.nodes.Element
 
 class Samehadaku : MainAPI() {
-    override var mainUrl = "https://samehadaku.guru"
+    override var mainUrl = "https://samehadaku.show"
     override var name = "Samehadaku"
     override val hasMainPage = true
     override var lang = "id"
     override val hasDownloadSupport = true
     override val supportedTypes = setOf(
-            TvType.Anime,
-            TvType.AnimeMovie,
-            TvType.OVA
+        TvType.Anime,
+        TvType.AnimeMovie,
+        TvType.OVA
     )
     companion object {
-        const val acefile = "https://acefile.co"
-
         fun getType(t: String): TvType {
             return if (t.contains("OVA", true) || t.contains("Special", true)) TvType.OVA
             else if (t.contains("Movie", true)) TvType.AnimeMovie
@@ -39,13 +37,13 @@ class Samehadaku : MainAPI() {
     }
 
     override val mainPage = mainPageOf(
-            "$mainUrl/page/" to "Episode Terbaru",
-            "$mainUrl/" to "HomePage",
+        "$mainUrl/page/" to "Episode Terbaru",
+        "$mainUrl/" to "HomePage",
     )
 
     override suspend fun getMainPage(
-            page: Int,
-            request: MainPageRequest
+        page: Int,
+        request: MainPageRequest
     ): HomePageResponse {
         val items = mutableListOf<HomePageList>()
 
@@ -62,9 +60,9 @@ class Samehadaku : MainAPI() {
 
         if (request.name == "Episode Terbaru") {
             val home = app.get(request.data + page).document.selectFirst("div.post-show")?.select("ul li")
-                    ?.mapNotNull {
-                        it.toSearchResult()
-                    } ?: throw ErrorLoadingException("No Media Found")
+                ?.mapNotNull {
+                    it.toSearchResult()
+                } ?: throw ErrorLoadingException("No Media Found")
             items.add(HomePageList(request.name, home, true))
         }
 
@@ -74,7 +72,7 @@ class Samehadaku : MainAPI() {
 
     private fun Element.toSearchResult(): AnimeSearchResponse? {
         val title = this.selectFirst("div.title, h2.entry-title a, div.lftinfo h2")?.text()?.trim()
-                ?: return null
+            ?: return null
         val href = fixUrlNull(this.selectFirst("a")?.attr("href") ?: return null)
         val posterUrl = fixUrlNull(this.select("img").attr("src"))
         val epNum = this.selectFirst("div.dtla author")?.text()?.toIntOrNull()
@@ -107,11 +105,11 @@ class Samehadaku : MainAPI() {
             Regex("\\d,\\s(\\d*)").find(it)?.groupValues?.getOrNull(1)?.toIntOrNull()
         }
         val status = getStatus(
-                document.selectFirst("div.spe > span:contains(Status)")?.ownText() ?: return null
+            document.selectFirst("div.spe > span:contains(Status)")?.ownText() ?: return null
         )
         val type =
-                getType(document.selectFirst("div.spe > span:contains(Type)")?.ownText()?.trim()?.lowercase()
-                        ?: "tv")
+            getType(document.selectFirst("div.spe > span:contains(Type)")?.ownText()?.trim()?.lowercase()
+                ?: "tv")
         val rating = document.selectFirst("span.ratingValue")?.text()?.trim()?.toRatingInt()
         val description = document.select("div.desc p").text().trim()
         val trailer = document.selectFirst("div.trailer-anime iframe")?.attr("src")
@@ -119,7 +117,7 @@ class Samehadaku : MainAPI() {
         val episodes = document.select("div.lstepsiode.listeps ul li").mapNotNull {
             val header = it.selectFirst("span.lchx > a") ?: return@mapNotNull null
             val episode = Regex("Episode\\s?(\\d+)").find(header.text())?.groupValues?.getOrNull(1)
-                    ?.toIntOrNull()
+                ?.toIntOrNull()
             val link = fixUrl(header.attr("href"))
             Episode(link, episode = episode)
         }.reversed()
@@ -149,68 +147,42 @@ class Samehadaku : MainAPI() {
     }
 
     override suspend fun loadLinks(
-            data: String,
-            isCasting: Boolean,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
+        data: String,
+        isCasting: Boolean,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ): Boolean {
 
         val document = app.get(data).document
 
-        argamap(
-                {
-                    document.select("div#server ul li div").apmap {
-                        val dataPost = it.attr("data-post")
-                        val dataNume = it.attr("data-nume")
-                        val dataType = it.attr("data-type")
-
-                        val iframe = app.post(
-                                url = "$mainUrl/wp-admin/admin-ajax.php",
-                                data = mapOf(
-                                        "action" to "player_ajax",
-                                        "post" to dataPost,
-                                        "nume" to dataNume,
-                                        "type" to dataType
-                                ),
-                                referer = data,
-                                headers = mapOf("X-Requested-With" to "XMLHttpRequest"),
-                        ).document.select("iframe").attr("src")
-
-                        loadFixedExtractor(fixedIframe(iframe), it.text(), "$mainUrl/", subtitleCallback, callback)
-
-                    }
-                },
-                {
-                    document.select("div#downloadb li").map { el ->
-                        el.select("a").apmap {
-                            loadFixedExtractor(fixedIframe(it.attr("href")), el.select("strong").text(), "$mainUrl/", subtitleCallback, callback)
-                        }
-                    }
-                }
-        )
+        document.select("div#downloadb li").map { el ->
+            el.select("a").apmap {
+                loadFixedExtractor(fixUrl(it.attr("href")), el.select("strong").text(), "$mainUrl/", subtitleCallback, callback)
+            }
+        }
 
         return true
     }
 
     private suspend fun loadFixedExtractor(
-            url: String,
-            name: String,
-            referer: String? = null,
-            subtitleCallback: (SubtitleFile) -> Unit,
-            callback: (ExtractorLink) -> Unit
+        url: String,
+        name: String,
+        referer: String? = null,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
     ) {
         loadExtractor(url, referer, subtitleCallback) { link ->
             callback.invoke(
-                    ExtractorLink(
-                            link.name,
-                            link.name,
-                            link.url,
-                            link.referer,
-                            name.fixQuality(),
-                            link.type,
-                            link.headers,
-                            link.extractorData
-                    )
+                ExtractorLink(
+                    link.name,
+                    link.name,
+                    link.url,
+                    link.referer,
+                    name.fixQuality(),
+                    link.type,
+                    link.headers,
+                    link.extractorData
+                )
             )
         }
     }
@@ -224,14 +196,6 @@ class Samehadaku : MainAPI() {
         }
     }
 
-    private fun fixedIframe(url: String): String {
-        val id = Regex("""(?:/f/|/file/)(\w+)""").find(url)?.groupValues?.getOrNull(1)
-        return when {
-            url.startsWith(acefile) -> "${acefile}/player/$id"
-            else -> fixUrl(url)
-        }
-    }
-
     private fun String.removeBloat(): String {
         return this.replace(Regex("(Nonton)|(Anime)|(Subtitle\\sIndonesia)"), "").trim()
     }
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 334cb5c4..74dbdf5e 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 222
+version = 223
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index d8ef6a06..24749e70 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -389,7 +389,6 @@ object SoraExtractor : SoraStream() {
             callback,
             true,
             hasCloudflare = true,
-            interceptor = multiInterceptor
         )
     }
 
@@ -1421,30 +1420,20 @@ object SoraExtractor : SoraStream() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val slugTitle = title.createSlug()
+        val slugTitle = title?.createSlug()
         val (seasonSlug, episodeSlug) = getEpisodeSlug(season, episode)
-        val req = app.get("$m4uhdAPI/search/$slugTitle.html")
+        val req = app.get("$m4uhdAPI/search/$slugTitle.html", timeout = 20)
         val referer = getBaseUrl(req.url)
-        val scriptData = req.document.select("div.row div.item").map { ele ->
-            Triple(
-                ele.select("div.tiptitle p").text().substringBefore("(").trim().createSlug(),
-                ele.select("div.jtip-top div:last-child").text().filter { it.isDigit() },
-                ele.selectFirst("a")?.attr("href")
-            )
-        }
 
-        val script = if (scriptData.size == 1) {
-            scriptData.firstOrNull()
+        val media = req.document.select("div.row div.item > a").map { it.attr("href") }
+        val mediaUrl = if(media.size == 1) {
+            media.first()
         } else {
-            scriptData.find {
-                it.first.equals(slugTitle) && it.second == "$year" && if (season != null) it.third?.contains(
-                    "-tvshow-"
-                ) == true else it.third?.contains("-movie-") == true
-            }
+            media.find { it.contains("-$slugTitle-") && it.contains("-$year-") }
         }
 
-        val link = fixUrl(script?.third ?: return, referer)
-        val request = app.get(link)
+        val link = fixUrl(mediaUrl ?: return, referer)
+        val request = app.get(link, timeout = 20)
         var cookies = request.cookies
         val headers = mapOf("Accept" to "*/*", "X-Requested-With" to "XMLHttpRequest")
 
@@ -1454,15 +1443,13 @@ object SoraExtractor : SoraStream() {
             doc.select("div.le-server span").map { it.attr("data") }
         } else {
             val idepisode =
-                doc.selectFirst("div.detail > p:matches((?i)S$seasonSlug-E$episodeSlug) button")
+                doc.selectFirst("div.season > p:matches((?i)S$seasonSlug-E$episodeSlug) button")
                     ?.attr("idepisode")
                     ?: return
             val requestEmbed = app.post(
-                "$referer/ajaxtv",
-                data = mapOf("idepisode" to idepisode, "_token" to "$token"),
-                referer = link,
-                headers = headers,
-                cookies = cookies
+                "$referer/ajaxtv", data = mapOf(
+                    "idepisode" to idepisode, "_token" to "$token"
+                ), referer = link, headers = headers, cookies = cookies, timeout = 20
             )
             cookies = requestEmbed.cookies
             requestEmbed.document.select("div.le-server span").map { it.attr("data") }
@@ -1475,6 +1462,7 @@ object SoraExtractor : SoraStream() {
                 referer = link,
                 headers = headers,
                 cookies = cookies,
+                timeout = 20
             ).document.select("iframe").attr("src")
 
             loadExtractor(iframe, referer, subtitleCallback, callback)
@@ -2084,7 +2072,7 @@ object SoraExtractor : SoraStream() {
             base64Decode("X2lkZW50aXR5Z29tb3ZpZXM3") to base64Decode("NTJmZGM3MGIwMDhjMGIxZDg4MWRhYzBmMDFjY2E4MTllZGQ1MTJkZTAxY2M4YmJjMTIyNGVkNGFhZmI3OGI1MmElM0EyJTNBJTdCaSUzQTAlM0JzJTNBMTglM0ElMjJfaWRlbnRpdHlnb21vdmllczclMjIlM0JpJTNBMSUzQnMlM0E1MiUzQSUyMiU1QjIwNTAzNjYlMkMlMjJIblZSUkFPYlRBU09KRXI0NVl5Q004d2lIb2wwVjFrbyUyMiUyQzI1OTIwMDAlNUQlMjIlM0IlN0Q="),
         )
 
-        var res = app.get("$api/search/$query")
+        var res = app.get("$api/search/$query", timeout = 20)
         val cookies = savedCookies + res.cookies
         val doc = res.document
         val media = doc.select("div.$mediaSelector").map {
@@ -2109,12 +2097,12 @@ object SoraExtractor : SoraStream() {
         val iframe = if (season == null) {
             media.third
         } else {
-            app.get(fixUrl(media.third, api), cookies = cookies)
+            app.get(fixUrl(media.third, api), cookies = cookies, timeout = 20)
                 .document.selectFirst("div#$episodeSelector a:contains(Episode ${slug.second})")
                 ?.attr("href")
         }
 
-        res = app.get(fixUrl(iframe ?: return, api), cookies = cookies)
+        res = app.get(fixUrl(iframe ?: return, api), cookies = cookies, timeout = 20)
         val url = res.document.select("meta[property=og:url]").attr("content")
         val headers = mapOf("X-Requested-With" to "XMLHttpRequest")
         val qualities = intArrayOf(2160, 1440, 1080, 720, 480, 360)
@@ -2129,17 +2117,19 @@ object SoraExtractor : SoraStream() {
             "$api/user/servers/$serverId?ep=$episodeId",
             cookies = cookies,
             referer = url,
-            headers = headers
+            headers = headers,
+            timeout = 20
         )
         val script = getAndUnpack(serverRes.text)
-        val key = """\(key\s*=\s*(\d+)\)""".toRegex().find(script)?.groupValues?.get(1) ?: return
+        val key = """key\s*=\s*(\d+)""".toRegex().find(script)?.groupValues?.get(1) ?: return
         serverRes.document.select("ul li").apmap { el ->
             val server = el.attr("data-value")
             val encryptedData = app.get(
                 "$url?server=$server&_=$unixTimeMS",
                 cookies = cookies,
                 referer = url,
-                headers = headers
+                headers = headers,
+                timeout = 20
             ).text
             val links = encryptedData.decrypt(key)
             links?.forEach { video ->
@@ -2382,7 +2372,7 @@ object SoraExtractor : SoraStream() {
         season: Int? = null,
         episode: Int? = null,
         callback: (ExtractorLink) -> Unit,
-        host: String = "https://weisatted-forminsting-i-277.site",
+        host: String = "https://dozzlegram-duj-i-280.site",
     ) {
         val res = app.get(
             "$host/play/$imdbId",
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 5c88a625..2f12c19e 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -66,7 +66,6 @@ open class SoraStream : TmdbProvider() {
     )
 
     val wpRedisInterceptor by lazy { CloudflareKiller() }
-    val multiInterceptor by lazy { CloudflareKiller() }
 
     /** AUTHOR : Hexated & Sora */
     companion object {
@@ -91,7 +90,7 @@ open class SoraStream : TmdbProvider() {
         const val crunchyrollAPI = "https://beta-api.crunchyroll.com"
         const val kissKhAPI = "https://kisskh.co"
         const val lingAPI = "https://ling-online.net"
-        const val m4uhdAPI = "https://ww2.m4ufree.com"
+        const val m4uhdAPI = "https://m4umv.org"
         const val rStreamAPI = "https://remotestream.cc"
         const val flixonAPI = "https://flixon.lol"
         const val smashyStreamAPI = "https://embed.smashystream.com"

From 21988a718e4c23c7b488e87f4eb860bd097d9974 Mon Sep 17 00:00:00 2001
From: Samantha <samantha@users.noreply.github.com>
Date: Mon, 12 Feb 2024 20:06:53 +0700
Subject: [PATCH 123/125] fix #592

---
 SoraStream/build.gradle.kts                   |   2 +-
 .../main/kotlin/com/hexated/SoraExtractor.kt  | 142 ++++++++++++------
 .../src/main/kotlin/com/hexated/SoraParser.kt |  10 ++
 .../src/main/kotlin/com/hexated/SoraStream.kt |  30 ++--
 .../main/kotlin/com/hexated/SoraStreamLite.kt |  15 +-
 5 files changed, 134 insertions(+), 65 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 74dbdf5e..7601086f 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 223
+version = 224
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 24749e70..3a5873df 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1307,51 +1307,6 @@ object SoraExtractor : SoraStream() {
         }
     }
 
-    suspend fun invokeGMovies(
-        title: String? = null,
-        year: Int? = null,
-        season: Int? = null,
-        episode: Int? = null,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val fixTitle = title.createSlug()
-        val url = if (season == null || season == 1) {
-            "$gMoviesAPI/$fixTitle-$year"
-        } else {
-            "$gMoviesAPI/$fixTitle-$year-season-$season"
-        }
-
-        val doc = app.get(url).document
-
-        val iframe = (if (season == null) {
-            doc.select("div.is-content-justification-center div.wp-block-button").map {
-                it.select("a").attr("href") to it.text()
-            }
-        } else {
-            doc.select("div.is-content-justification-center").find {
-                it.previousElementSibling()?.text()
-                    ?.contains(Regex("(?i)episode\\s?$episode")) == true
-            }?.select("div.wp-block-button")?.map {
-                it.select("a").attr("href") to it.text()
-            }
-        })?.filter {
-            it.second.contains(Regex("(?i)(4k|1080p)"))
-        } ?: return
-
-        iframe.apmap { (iframeLink, title) ->
-            val size = Regex("(?i)\\s(\\S+gb|mb)").find(title)?.groupValues?.getOrNull(1)
-            loadCustomTagExtractor(
-                "[$size]",
-                iframeLink,
-                "$gMoviesAPI/",
-                subtitleCallback,
-                callback,
-                getIndexQuality(title)
-            )
-        }
-    }
-
     suspend fun invokeFDMovies(
         title: String? = null,
         season: Int? = null,
@@ -1694,6 +1649,58 @@ object SoraExtractor : SoraStream() {
 
     }
 
+    suspend fun invokeNepu(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val slug = title?.createSlug()
+        val headers = mapOf(
+            "X-Requested-With" to "XMLHttpRequest"
+        )
+        val data = app.get("$nepuAPI/ajax/posts?q=$title", headers = headers, referer = "$nepuAPI/")
+            .parsedSafe<NepuSearch>()?.data
+
+        val media =
+            data?.find { it.url?.startsWith(if (season == null) "/movie/$slug-$year-" else "/serie/$slug-$year-") == true }
+                ?: data?.find {
+                    (it.name.equals(
+                        title,
+                        true
+                    ) && it.type == if (season == null) "Movie" else "Serie")
+                }
+
+        if (media?.url == null) return
+        val mediaUrl = if (season == null) {
+            media.url
+        } else {
+            "${media.url}/season/$season/episode/$episode"
+        }
+
+        val dataId = app.get(fixUrl(mediaUrl, nepuAPI)).document.selectFirst("a[data-embed]")?.attr("data-embed") ?: return
+        val res = app.post(
+            "$nepuAPI/ajax/embed", data = mapOf(
+                "id" to dataId
+            ), referer = mediaUrl, headers = headers
+        ).text
+
+        val m3u8 = "(http[^\"]+)".toRegex().find(res)?.groupValues?.get(1)
+
+        callback.invoke(
+            ExtractorLink(
+                "Nepu",
+                "Nepu",
+                m3u8 ?: return,
+                "$nepuAPI/",
+                Qualities.P1080.value,
+                INFER_TYPE
+            )
+        )
+
+    }
+
     suspend fun invokeMoflix(
         tmdbId: Int? = null,
         season: Int? = null,
@@ -2156,6 +2163,7 @@ object SoraExtractor : SoraStream() {
         episode: Int? = null,
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit,
+        api: String = "https://parse.showflix.online"
     ) {
         val where = if (season == null) "movieName" else "seriesName"
         val classes = if (season == null) "movies" else "series"
@@ -2172,12 +2180,12 @@ object SoraExtractor : SoraStream() {
             "_ApplicationId": "SHOWFLIXAPPID",
             "_JavaScriptKey": "SHOWFLIXMASTERKEY",
             "_ClientVersion": "js3.4.1",
-            "_InstallationId": "d92d98d3-fa49-4103-8dcf-6347c86942a7"
+            "_InstallationId": "58f0e9ca-f164-42e0-a683-a1450ccf0221"
         }
     """.trimIndent().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull())
 
         val data =
-            app.post("https://parse.showflix.tk/parse/classes/$classes", requestBody = body).text
+            app.post("$api/parse/classes/$classes", requestBody = body).text
         val iframes = if (season == null) {
             val result = tryParseJson<ShowflixSearchMovies>(data)?.resultsMovies?.find {
                 it.movieName.equals("$title ($year)", true)
@@ -2204,6 +2212,46 @@ object SoraExtractor : SoraStream() {
 
     }
 
+    suspend fun invokeZoechip(
+        title: String? = null,
+        year: Int? = null,
+        season: Int? = null,
+        episode: Int? = null,
+        callback: (ExtractorLink) -> Unit,
+    ) {
+        val slug = title?.createSlug()
+        val url = if (season == null) {
+            "$zoechipAPI/film/${title?.createSlug()}-$year"
+        } else {
+            "$zoechipAPI/episode/$slug-season-$season-episode-$episode"
+        }
+
+        val id = app.get(url).document.selectFirst("div#show_player_ajax")?.attr("movie-id") ?: return
+
+        val server = app.post(
+            "$zoechipAPI/wp-admin/admin-ajax.php", data = mapOf(
+                "action" to "lazy_player",
+                "movieID" to id,
+            ), referer = url, headers = mapOf(
+                "X-Requested-With" to "XMLHttpRequest"
+            )
+        ).document.selectFirst("ul.nav a:contains(Filemoon)")?.attr("data-server")
+
+        val res = app.get(server ?: return, referer = "$zoechipAPI/")
+        val host = getBaseUrl(res.url)
+        val script = res.document.select("script:containsData(function(p,a,c,k,e,d))").last()?.data()
+        val unpacked = getAndUnpack(script ?: return)
+
+        val m3u8 = Regex("file:\\s*\"(.*?m3u8.*?)\"").find(unpacked)?.groupValues?.getOrNull(1)
+
+        M3u8Helper.generateM3u8(
+            "Zoechip",
+            m3u8 ?: return,
+            "$host/",
+        ).forEach(callback)
+
+    }
+
     suspend fun invokeCinemaTv(
         imdbId: String? = null,
         title: String? = null,
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
index c920555a..0fdb7778 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraParser.kt
@@ -470,4 +470,14 @@ data class CinemaTvResponse(
         @JsonProperty("language") val language: String? = null,
         @JsonProperty("file") val file: Any? = null,
     )
+}
+
+data class NepuSearch(
+    @JsonProperty("data") val data: ArrayList<Data>? = arrayListOf(),
+) {
+    data class Data(
+        @JsonProperty("url") val url: String? = null,
+        @JsonProperty("name") val name: String? = null,
+        @JsonProperty("type") val type: String? = null,
+    )
 }
\ No newline at end of file
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 2f12c19e..eeec600c 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -18,7 +18,6 @@ import com.hexated.SoraExtractor.invokeDramaday
 import com.hexated.SoraExtractor.invokeDreamfilm
 import com.hexated.SoraExtractor.invokeFDMovies
 import com.hexated.SoraExtractor.invokeFlixon
-import com.hexated.SoraExtractor.invokeGMovies
 import com.hexated.SoraExtractor.invokeGoku
 import com.hexated.SoraExtractor.invokeKisskh
 import com.hexated.SoraExtractor.invokeLing
@@ -41,9 +40,10 @@ import com.hexated.SoraExtractor.invokeVidsrcto
 import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeMoflix
 import com.hexated.SoraExtractor.invokeGhostx
-import com.hexated.SoraExtractor.invokeMoviefiction
+import com.hexated.SoraExtractor.invokeNepu
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
+import com.hexated.SoraExtractor.invokeZoechip
 import com.hexated.SoraExtractor.invokeZshow
 import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTMDbId
@@ -110,16 +110,17 @@ open class SoraStream : TmdbProvider() {
         const val vidsrctoAPI = "https://vidsrc.to"
         const val dramadayAPI = "https://dramaday.me"
         const val animetoshoAPI = "https://animetosho.org"
-        const val showflixAPI = "https://showflix.space"
+        const val showflixAPI = "https://showflix.lol"
         const val aoneroomAPI = "https://api3.aoneroom.com"
         const val mMoviesAPI = "https://multimovies.uno"
         const val watchCartoonAPI = "https://www1.watchcartoononline.bz"
         const val moflixAPI = "https://moflix-stream.xyz"
         const val moviefictionAPI = "https://moviefiction.com"
+        const val zoechipAPI = "https://zoechip.org"
+        const val nepuAPI = "https://nepu.to"
 
         const val fdMoviesAPI = "https://freedrivemovie.com"
         const val uhdmoviesAPI = "https://uhdmovies.us"
-        const val gMoviesAPI = "https://gdrivemovies.xyz"
         const val hdmovies4uAPI = "https://hdmovies4u.day"
         const val vegaMoviesAPI = "https://vegamovies.ngo"
         const val dotmoviesAPI = "https://dotmovies.dad"
@@ -481,16 +482,6 @@ open class SoraStream : TmdbProvider() {
                     callback
                 )
             },
-            {
-                if (!res.isAnime) invokeGMovies(
-                    res.title,
-                    res.year,
-                    res.season,
-                    res.episode,
-                    subtitleCallback,
-                    callback
-                )
-            },
             {
                 if (!res.isAnime) invokeFDMovies(res.title, res.season, res.episode, callback)
             },
@@ -688,8 +679,17 @@ open class SoraStream : TmdbProvider() {
                 if (!res.isAnime) invokeMoflix(res.id, res.season, res.episode, callback)
             },
             {
-                if (!res.isAnime) invokeMoviefiction(res.title, res.season, res.episode, subtitleCallback, callback)
+                if (!res.isAnime) invokeZoechip(res.title, res.year, res.season, res.episode, callback)
             },
+            {
+                if (!res.isAnime) invokeNepu(
+                    res.title,
+                    res.airedYear ?: res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            }
         )
 
         return true
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
index 9da5d53b..122f4c45 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt
@@ -30,8 +30,10 @@ import com.hexated.SoraExtractor.invokeCinemaTv
 import com.hexated.SoraExtractor.invokeMoflix
 import com.hexated.SoraExtractor.invokeGhostx
 import com.hexated.SoraExtractor.invokeMoviefiction
+import com.hexated.SoraExtractor.invokeNepu
 import com.hexated.SoraExtractor.invokeWatchCartoon
 import com.hexated.SoraExtractor.invokeWatchsomuch
+import com.hexated.SoraExtractor.invokeZoechip
 import com.hexated.SoraExtractor.invokeZshow
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.argamap
@@ -321,14 +323,23 @@ class SoraStreamLite : SoraStream() {
                 )
             },
             {
-                if (!res.isAnime) invokeMoviefiction(
+                if (!res.isAnime) invokeZoechip(
                     res.title,
+                    res.year,
                     res.season,
                     res.episode,
-                    subtitleCallback,
                     callback
                 )
             },
+            {
+                if (!res.isAnime) invokeNepu(
+                    res.title,
+                    res.airedYear ?: res.year,
+                    res.season,
+                    res.episode,
+                    callback
+                )
+            }
         )
 
         return true

From 29e26b4a1bfe918528306a7532f5daee91db5260 Mon Sep 17 00:00:00 2001
From: irfannajmudinsidik
 <50092754+irfannajmudinsidik@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:40:20 +0700
Subject: [PATCH 124/125] Update Ngefilm.kt (#607)

---
 Gomov/src/main/kotlin/com/hexated/Ngefilm.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
index 9ae96908..7ed59d86 100644
--- a/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
+++ b/Gomov/src/main/kotlin/com/hexated/Ngefilm.kt
@@ -3,7 +3,7 @@ package com.hexated
 import com.lagradost.cloudstream3.mainPageOf
 
 class Ngefilm : Gomov() {
-    override var mainUrl = "https://tv4.ngefilm21.homes"
+    override var mainUrl = "https://nf1.ngefilm21.quest"
     override var name = "Ngefilm"
     override val mainPage = mainPageOf(
         "/page/%d/?s&search=advanced&post_type=movie&index&orderby&genre&movieyear&country&quality=" to "Movies Terbaru",

From 179b268bceb6de09faa4b5a7a806d6e19aa025a4 Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Sun, 25 Feb 2024 02:07:00 +0530
Subject: [PATCH 125/125] fix workflow and update domains (#613)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update domains 💀

* fix workflows and update nicehttp
---
 .github/workflows/build.yml                                | 7 ++++---
 Movierulzhd/build.gradle.kts                               | 2 +-
 Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt        | 2 +-
 SoraStream/build.gradle.kts                                | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt       | 7 +++----
 YomoviesProvider/build.gradle.kts                          | 2 +-
 .../src/main/kotlin/com/hexated/YomoviesProvider.kt        | 2 +-
 build.gradle.kts                                           | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a9cc822..c7297f57 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           path: "src"
 
       - name: Checkout builds
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           ref: "builds"
           path: "builds"
@@ -33,8 +33,9 @@ jobs:
         run: rm $GITHUB_WORKSPACE/builds/*.cs3 || true
 
       - name: Setup JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: "adopt"
           java-version: 11
 
       - name: Setup Android SDK
diff --git a/Movierulzhd/build.gradle.kts b/Movierulzhd/build.gradle.kts
index 5aa5a88e..7f643139 100644
--- a/Movierulzhd/build.gradle.kts
+++ b/Movierulzhd/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 62
+version = 63
 
 
 cloudstream {
diff --git a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
index 9c141a03..59eaf0a5 100644
--- a/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
+++ b/Movierulzhd/src/main/kotlin/com/hexated/Hdmovie2.kt
@@ -12,7 +12,7 @@ import org.jsoup.Jsoup
 
 class Hdmovie2 : Movierulzhd() {
 
-    override var mainUrl = "https://hdmovie2.mba"
+    override var mainUrl = "https://hdmovie2.tax"
     override var name = "Hdmovie2"
     override val mainPage = mainPageOf(
         "trending" to "Trending",
diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 7601086f..4f2c8e13 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.properties.Properties
 
 // use an integer for version numbers
-version = 224
+version = 225
 
 android {
     defaultConfig {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index eeec600c..8df050d4 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -118,12 +118,11 @@ open class SoraStream : TmdbProvider() {
         const val moviefictionAPI = "https://moviefiction.com"
         const val zoechipAPI = "https://zoechip.org"
         const val nepuAPI = "https://nepu.to"
-
         const val fdMoviesAPI = "https://freedrivemovie.com"
-        const val uhdmoviesAPI = "https://uhdmovies.us"
+        const val uhdmoviesAPI = "https://uhdmovies.asia"
         const val hdmovies4uAPI = "https://hdmovies4u.day"
-        const val vegaMoviesAPI = "https://vegamovies.ngo"
-        const val dotmoviesAPI = "https://dotmovies.dad"
+        const val vegaMoviesAPI = "https://vegamovies.ong"
+        const val dotmoviesAPI = "https://dotmovies.one"
         const val tvMoviesAPI = "https://www.tvseriesnmovies.com"
         const val dahmerMoviesAPI = "https://odd-bird-1319.zwuhygoaqe.workers.dev"
 
diff --git a/YomoviesProvider/build.gradle.kts b/YomoviesProvider/build.gradle.kts
index d5e2c4a9..dd06bcee 100644
--- a/YomoviesProvider/build.gradle.kts
+++ b/YomoviesProvider/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 27
+version = 28
 
 
 cloudstream {
diff --git a/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt b/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
index db80da7f..5905b782 100644
--- a/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
+++ b/YomoviesProvider/src/main/kotlin/com/hexated/YomoviesProvider.kt
@@ -10,7 +10,7 @@ import org.jsoup.nodes.Element
 import java.net.URI
 
 open class YomoviesProvider : MainAPI() {
-    override var mainUrl = "https://yomovies.fit"
+    override var mainUrl = "https://yomovies.town"
     private var directUrl = ""
     override var name = "Yomovies"
     override val hasMainPage = true
diff --git a/build.gradle.kts b/build.gradle.kts
index 6e28f8fa..9edb04d4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -77,11 +77,11 @@ subprojects {
         // https://github.com/recloudstream/cloudstream/blob/master/app/build.gradle
 
         implementation(kotlin("stdlib")) // adds standard kotlin features, like listOf, mapOf etc
-        implementation("com.github.Blatzar:NiceHttp:0.4.5") // http library
+        implementation("com.github.Blatzar:NiceHttp:0.4.11") // http library
         implementation("org.jsoup:jsoup:1.17.2") // html parser
         implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
         implementation("io.karn:khttp-android:0.1.2")
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") // html parser
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0")
         implementation("org.mozilla:rhino:1.7.14") //run JS
 
     }