From 8fbd21857429994c34bf402aea4855dea07e7859 Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Thu, 2 Mar 2023 13:06:31 +0700
Subject: [PATCH] sora: changed flixhq API

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

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index a11542fc..ce40324f 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 98
+version = 99
 
 
 cloudstream {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index c237a630..a0c3f9ba 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -825,7 +825,7 @@ object SoraExtractor : SoraStream() {
         callback: (ExtractorLink) -> Unit
     ) {
         val fixTitle = title?.replace("–", "-")
-        val id = app.get("$consumetFlixhqAPI/$title")
+        val id = app.get("$haikeiFlixhqAPI/$title")
             .parsedSafe<ConsumetSearchResponse>()?.results?.find {
                 if (season == null) {
                     it.title?.equals(
@@ -837,7 +837,7 @@ object SoraExtractor : SoraStream() {
             }?.id ?: return
 
         val episodeId =
-            app.get("$consumetFlixhqAPI/info?id=$id").parsedSafe<ConsumetDetails>()?.let {
+            app.get("$haikeiFlixhqAPI/info?id=$id").parsedSafe<ConsumetDetails>()?.let {
                 if (season == null) {
                     it.episodes?.first()?.id
                 } else {
@@ -850,9 +850,9 @@ object SoraExtractor : SoraStream() {
         ).apmap { server ->
             val sources = app.get(
                 if(server == "upcloud") {
-                    "$consumetFlixhqAPI/watch?episodeId=$episodeId&mediaId=$id"
+                    "$haikeiFlixhqAPI/watch?episodeId=$episodeId&mediaId=$id"
                 } else {
-                    "$consumetFlixhqAPI/watch?episodeId=$episodeId&mediaId=$id&server=$server"
+                    "$haikeiFlixhqAPI/watch?episodeId=$episodeId&mediaId=$id&server=$server"
                 },
             ).parsedSafe<ConsumetSourcesResponse>()
             val name = fixTitle(server)
@@ -1329,9 +1329,7 @@ object SoraExtractor : SoraStream() {
                 it.select("a").attr("href") to it.text()
             }
         })?.filter {
-            it.first.contains("gdtot") && (it.second.contains(
-                "1080p", true
-            ) || it.second.contains("4k", true))
+            it.first.contains("gdtot") && it.second.contains(Regex("(?i)(4k|1080p)"))
         } ?: return
 
         iframe.apmap { (iframeLink, title) ->
@@ -1383,10 +1381,11 @@ object SoraExtractor : SoraStream() {
             val qualities = getFDoviesQuality(quality)
             val fdLink = bypassFdAds(link)
             val videoLink = when {
-                type.contains("gdtot") -> {
-                    val gdBotLink = extractGdbot(fdLink ?: return@apmap null)
-                    extractGdflix(gdBotLink ?: return@apmap null)
-                }
+                // pass due too many gdtot links
+//                type.contains("gdtot") -> {
+//                    val gdBotLink = extractGdbot(fdLink ?: return@apmap null)
+//                    extractGdflix(gdBotLink ?: return@apmap null)
+//                }
                 type.contains("oiya") -> {
                     extractOiya(fdLink ?: return@apmap null, qualities)
                 }
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index b2b92a65..3867b1c9 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -22,7 +22,6 @@ import com.hexated.SoraExtractor.invokeXmovies
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.metaproviders.TmdbProvider
-import com.hexated.SoraExtractor.invokeCrunchyroll
 import com.hexated.SoraExtractor.invokeDahmerMovies
 import com.hexated.SoraExtractor.invokeEdithxmovies
 import com.hexated.SoraExtractor.invokeFDMovies
@@ -32,7 +31,6 @@ import com.hexated.SoraExtractor.invokeGMovies
 import com.hexated.SoraExtractor.invokeGdbotMovies
 import com.hexated.SoraExtractor.invokeGomovies
 import com.hexated.SoraExtractor.invokeJmdkhMovies
-import com.hexated.SoraExtractor.invokeJsmovies
 import com.hexated.SoraExtractor.invokeKickassanime
 import com.hexated.SoraExtractor.invokeKisskh
 import com.hexated.SoraExtractor.invokeLing
@@ -53,7 +51,6 @@ import com.hexated.SoraExtractor.invokeTvMovies
 import com.hexated.SoraExtractor.invokeUhdmovies
 import com.hexated.SoraExtractor.invokeVitoenMovies
 import com.hexated.SoraExtractor.invokeWatchsomuch
-import com.hexated.SoraExtractor.invokeXtrememovies
 import com.lagradost.cloudstream3.extractors.VidSrcExtractor
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
@@ -99,7 +96,7 @@ open class SoraStream : TmdbProvider() {
         const val filmxyAPI = "https://www.filmxy.vip"
         const val kimcartoonAPI = "https://kimcartoon.li"
         const val xMovieAPI = "https://xemovies.to"
-        const val consumetFlixhqAPI = "https://api.consumet.org/movies/flixhq"
+        const val haikeiFlixhqAPI = "https://api.haikei.xyz/movies/flixhq"
         const val consumetZoroAPI = "https://api.consumet.org/anime/zoro"
         const val consumetCrunchyrollAPI = "https://api.consumet.org/anime/crunchyroll" // dead
         const val kickassanimeAPI = "https://www2.kickassanime.ro"