From 0ad948b37beb039e8b1df97415d02d0f81c5b032 Mon Sep 17 00:00:00 2001
From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:09:14 -0300
Subject: [PATCH] fix(ar/witanime): Fix soraplay & mp4upload extractors +
 update baseUrl (#2297)

---
 .../mp4uploadextractor/Mp4uploadExtractor.kt  |  2 +-
 src/ar/witanime/build.gradle                  |  2 +-
 .../animeextension/ar/witanime/WitAnime.kt    | 29 ++++++++++++++-----
 .../witanime/extractors/SoraPlayExtractor.kt  |  5 ++--
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt b/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt
index aebd186f9..155ffc936 100644
--- a/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt
+++ b/lib/mp4upload-extractor/src/main/java/eu/kanade/tachiyomi/lib/mp4uploadextractor/Mp4uploadExtractor.kt
@@ -10,7 +10,7 @@ import dev.datlag.jsunpacker.JsUnpacker
 class Mp4uploadExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, headers: Headers, prefix: String = "", suffix: String = ""): List<Video> {
         val newHeaders = headers.newBuilder()
-            .add("referer", REFERER)
+            .set("referer", REFERER)
             .build()
 
         val doc = client.newCall(GET(url, newHeaders)).execute().use { it.asJsoup() }
diff --git a/src/ar/witanime/build.gradle b/src/ar/witanime/build.gradle
index 778dd618a..5dae8521d 100644
--- a/src/ar/witanime/build.gradle
+++ b/src/ar/witanime/build.gradle
@@ -7,7 +7,7 @@ ext {
     extName = 'WIT ANIME'
     pkgNameSuffix = 'ar.witanime'
     extClass = '.WitAnime'
-    extVersionCode = 44
+    extVersionCode = 45
     libVersion = '13'
 }
 
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
index 2740ba7a4..5840b50de 100755
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/WitAnime.kt
@@ -23,7 +23,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.runBlocking
-import okhttp3.OkHttpClient
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -35,13 +34,13 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val name = "WIT ANIME"
 
-    override val baseUrl = "https://witanime.fun"
+    override val baseUrl = "https://witanime.rest"
 
     override val lang = "ar"
 
     override val supportsLatest = true
 
-    override val client: OkHttpClient = network.cloudflareClient
+    override val client = network.cloudflareClient
 
     override fun headersBuilder() = super.headersBuilder().add("Referer", baseUrl)
 
@@ -145,7 +144,10 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
         return when {
             url.contains("yonaplay") -> extractFromMulti(url)
             url.contains("soraplay") -> {
-                soraPlayExtractor.videosFromUrl(url, headers)
+                when {
+                    url.contains("/mirror") -> extractFromMulti(url)
+                    else -> soraPlayExtractor.videosFromUrl(url, headers)
+                }
             }
             url.contains("dood") -> {
                 doodExtractor.videoFromUrl(url, "Dood mirror")
@@ -176,9 +178,22 @@ class WitAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     }
 
     private fun extractFromMulti(url: String): List<Video> {
-        val doc = client.newCall(GET(url, headers)).execute().asJsoup()
-        return doc.select("div.OD li").flatMap {
-            val videoUrl = it.attr("onclick").substringAfter("go_to_player('").substringBefore("')")
+        val newHeaders = when {
+            url.contains("soraplay") ->
+                super.headersBuilder().set("referer", "https://yonaplay.org").build()
+            else -> headers
+        }
+        val doc = client.newCall(GET(url, newHeaders)).execute()
+            .use { it.asJsoup() }
+        return doc.select(".OD li").flatMap { element ->
+            val videoUrl = element.attr("onclick").substringAfter("go_to_player('")
+                .substringBefore("')")
+                .let {
+                    when {
+                        it.startsWith("https:") -> it
+                        else -> "https:$it"
+                    }
+                }
             runCatching { extractVideos(videoUrl) }.getOrElse { emptyList() }
         }
     }
diff --git a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt
index 703cc26c8..cd0c2826e 100644
--- a/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt
+++ b/src/ar/witanime/src/eu/kanade/tachiyomi/animeextension/ar/witanime/extractors/SoraPlayExtractor.kt
@@ -8,14 +8,15 @@ import okhttp3.OkHttpClient
 
 class SoraPlayExtractor(private val client: OkHttpClient) {
     fun videosFromUrl(url: String, headers: Headers): List<Video> {
-        val doc = client.newCall(GET(url)).execute().asJsoup()
+        val newHeaders = headers.newBuilder().set("referer", "https://yonaplay.org/").build()
+        val doc = client.newCall(GET(url, newHeaders)).execute().asJsoup()
         val script = doc.selectFirst("script:containsData(sources)")!!
         val data = script.data().substringAfter("sources: [").substringBefore("],")
 
         return data.split("\"file\":\"").drop(1).map { source ->
             val src = source.substringBefore("\"")
             val quality = "Soraplay: " + source.substringAfter("\"label\":\"").substringBefore("\"")
-            Video(src, quality, src, headers = headers)
+            Video(src, quality, src, headers = newHeaders)
         }
     }
 }