From ec8981576a2296d9b162e46837a470628295f78a Mon Sep 17 00:00:00 2001
From: WebDitto <webditto@proton.me>
Date: Thu, 10 Oct 2024 19:56:06 -0300
Subject: [PATCH 1/2] fix(pt/vizer): Fixed pt/Vizer videos empty (fix #256)

---
 .../lib/mixdropextractor/MixDropExtractor.kt  |  7 +-
 src/pt/vizer/build.gradle                     |  4 +-
 .../animeextension/pt/vizer/Vizer.kt          | 29 ++++---
 .../animeextension/pt/vizer/dto/VizerDto.kt   |  2 +-
 .../vizer/extractors/FireplayerExtractor.kt   | 56 +++++++++++++
 .../pt/vizer/extractors/WarezExtractor.kt     | 52 -------------
 .../pt/vizer/interceptor/WebViewResolver.kt   | 78 +++++++++++++++++++
 7 files changed, 157 insertions(+), 71 deletions(-)
 create mode 100644 src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt
 delete mode 100644 src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt
 create mode 100644 src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt

diff --git a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
index f4f231ce..5b2d68ba 100644
--- a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
+++ b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt
@@ -17,7 +17,12 @@ class MixDropExtractor(private val client: OkHttpClient) {
         externalSubs: List<Track> = emptyList(),
         referer: String = DEFAULT_REFERER,
     ): List<Video> {
-        val headers = Headers.headersOf("Referer", referer)
+        val headers = Headers.headersOf(
+            "Referer",
+            referer,
+            "User-Agent",
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
+        )
         val doc = client.newCall(GET(url, headers)).execute().asJsoup()
         val unpacked = doc.selectFirst("script:containsData(eval):containsData(MDCore)")
             ?.data()
diff --git a/src/pt/vizer/build.gradle b/src/pt/vizer/build.gradle
index 937aaa17..359097b3 100644
--- a/src/pt/vizer/build.gradle
+++ b/src/pt/vizer/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Vizer.tv'
     extClass = '.Vizer'
-    extVersionCode = 16
+    extVersionCode = 17
     isNsfw = true
 }
 
@@ -9,5 +9,7 @@ apply from: "$rootDir/common.gradle"
 
 dependencies {
     implementation(project(':lib:mixdrop-extractor'))
+    implementation(project(':lib:playlist-utils'))
     implementation(project(':lib:streamtape-extractor'))
+    implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1"
 }
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
index fc2ef35b..8bf2b122 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
@@ -10,7 +10,8 @@ import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.SearchItemDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.SearchResultDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.VideoDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.VideoListDto
-import eu.kanade.tachiyomi.animeextension.pt.vizer.extractors.WarezExtractor
+import eu.kanade.tachiyomi.animeextension.pt.vizer.extractors.FireplayerExtractor
+import eu.kanade.tachiyomi.animeextension.pt.vizer.interceptor.WebViewResolver
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
@@ -41,7 +42,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val name = "Vizer.tv"
 
-    override val baseUrl = "https://vizertv.in"
+    override val baseUrl = "https://novizer.com"
     private val apiUrl = "$baseUrl/includes/ajax"
 
     override val lang = "pt-BR"
@@ -58,6 +59,8 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
 
+    private val webViewResolver by lazy { WebViewResolver(headers) }
+
     // ============================== Popular ===============================
     override fun popularAnimeRequest(page: Int): Request {
         val pageType = preferences.getString(PREF_POPULAR_PAGE_KEY, PREF_POPULAR_PAGE_DEFAULT)!!
@@ -176,7 +179,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         val response = episodesClient.newCall(apiRequest("getEpisodes=$id")).execute()
         val episodes = response.parseAs<EpisodeListDto>().episodes
             .values
-            .filter { it.released }
+            .filter { it.released === true }
             .map {
                 SEpisode.create().apply {
                     name = "$sname: Ep ${it.name}".run {
@@ -243,7 +246,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val mixdropExtractor by lazy { MixDropExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
-    private val warezExtractor by lazy { WarezExtractor(client, headers) }
+    private val fireplayerExtractor by lazy { FireplayerExtractor(client, "https://basseqwevewcewcewecwcw.xyz") }
 
     private fun getVideosFromObject(videoObj: VideoDto): List<Video> {
         val hosters = videoObj.hosters ?: return emptyList()
@@ -253,10 +256,13 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         return hosters.iterator().flatMap { (name, status) ->
             if (status != 3) return@flatMap emptyList()
             val url = getPlayerUrl(videoObj.id, name)
+            if (url.isNullOrBlank()) {
+                return emptyList()
+            }
             when (name) {
                 "mixdrop" -> mixdropExtractor.videosFromUrl(url, langPrefix)
                 "streamtape" -> streamtapeExtractor.videosFromUrl(url, "StreamTape($langPrefix)")
-                "warezcdn" -> warezExtractor.videosFromUrl(url, langPrefix)
+                "warezcdn" -> fireplayerExtractor.videosFromUrl(url, langPrefix)
                 else -> emptyList()
             }
         }
@@ -295,17 +301,8 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
     // ============================= Utilities ==============================
     private val noRedirectClient = client.newBuilder().followRedirects(false).build()
 
-    private fun getPlayerUrl(id: String, name: String): String {
-        val req = GET("$baseUrl/embed/getPlay.php?id=$id&sv=$name", headers)
-        return if (name == "warezcdn") {
-            val res = noRedirectClient.newCall(req).execute()
-            res.close()
-            res.headers["location"]!!
-        } else {
-            val res = client.newCall(req).execute()
-            val body = res.body.string()
-            body.substringAfter("location.href=\"", "").substringBefore("\";", "")
-        }
+    private fun getPlayerUrl(id: String, name: String): String? {
+        return webViewResolver.getUrl("$baseUrl/embed/getEmbed.php?id=$id&sv=$name", "$baseUrl/termos")
     }
 
     private fun apiRequest(body: String): Request {
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt
index d6b9dc40..f8bf3c96 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/dto/VizerDto.kt
@@ -83,7 +83,7 @@ class HostersDto(
 object BooleanSerializer : JsonTransformingSerializer<Boolean>(Boolean.serializer()) {
     override fun transformDeserialize(element: JsonElement): JsonElement {
         require(element is JsonPrimitive)
-        return if (element.jsonPrimitive.isString) {
+        return if (element.jsonPrimitive.isString && element.jsonPrimitive.content == "true") {
             JsonPrimitive(true)
         } else {
             JsonPrimitive(element.jsonPrimitive.booleanOrNull ?: false)
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt
new file mode 100644
index 00000000..1dc111f0
--- /dev/null
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt
@@ -0,0 +1,56 @@
+package eu.kanade.tachiyomi.animeextension.pt.vizer.extractors
+
+import dev.datlag.jsunpacker.JsUnpacker
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.FormBody
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class FireplayerExtractor(private val client: OkHttpClient, private val host: String = "https://embedplayer.online") {
+    private val headers by lazy {
+        Headers.headersOf(
+            "X-Requested-With",
+            "XMLHttpRequest",
+            "Referer",
+            host,
+            "Origin",
+            host,
+        )
+    }
+
+    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+
+    fun videosFromUrl(url: String, lang: String): List<Video> {
+        var id = url.substringAfterLast("/")
+
+        if (id.length < 32) {
+            val doc = client.newCall(GET(url, headers)).execute().asJsoup()
+
+            val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
+                ?.let(JsUnpacker::unpackAndCombine)
+                ?: doc.selectFirst("script:containsData(FirePlayer)")?.data()
+
+            if (script?.contains("FirePlayer(") == true) {
+                id = script.substringAfter("FirePlayer(\"").substringBefore('"')
+            }
+        }
+
+        val postUrl = "$host/player/index.php?data=$id&do=getVideo"
+        val body = FormBody.Builder()
+            .add("hash", id)
+            .add("r", "")
+            .build()
+
+        val masterUrl = client.newCall(POST(postUrl, headers, body = body)).execute()
+            .body.string()
+            .substringAfter("securedLink\":\"")
+            .substringBefore('"')
+            .replace("\\", "")
+
+        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "WarezCDN($lang) - $it" })
+    }
+}
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt
deleted file mode 100644
index 50a23f84..00000000
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/WarezExtractor.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package eu.kanade.tachiyomi.animeextension.pt.vizer.extractors
-
-import android.util.Base64
-import eu.kanade.tachiyomi.animesource.model.Video
-import eu.kanade.tachiyomi.network.GET
-import eu.kanade.tachiyomi.network.POST
-import eu.kanade.tachiyomi.util.asJsoup
-import okhttp3.FormBody
-import okhttp3.Headers
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.OkHttpClient
-
-class WarezExtractor(private val client: OkHttpClient, private val headers: Headers) {
-
-    fun videosFromUrl(url: String, lang: String): List<Video> {
-        val doc = client.newCall(GET(url, headers)).execute().asJsoup()
-        val httpUrl = doc.location().toHttpUrl()
-        val videoId = httpUrl.queryParameter("id") ?: return emptyList()
-        val script = doc.selectFirst("script:containsData(allowanceKey)")?.data()
-            ?: return emptyList()
-        val key = script.substringAfter("allowanceKey").substringAfter('"').substringBefore('"')
-        val cdn = script.substringAfter("cdnListing").substringAfter('[').substringBefore(']')
-            .split(',')
-            .random()
-
-        val body = FormBody.Builder()
-            .add("getVideo", videoId)
-            .add("key", key)
-            .build()
-
-        val host = "https://" + httpUrl.host
-        val reqHeaders = headers.newBuilder()
-            .set("Origin", host)
-            .set("Referer", url)
-            .set("X-Requested-With", "XMLHttpRequest")
-            .build()
-
-        val req = client.newCall(POST("$host/player/functions.php", reqHeaders, body)).execute()
-        val id = req.body.string().substringAfter("id\":\"", "").substringBefore('"', "")
-            .ifBlank { return emptyList() }
-        val decrypted = decryptorium(id)
-        val videoUrl = "https://workerproxy.warezcdn.workers.dev/?url=https://cloclo$cdn.cloud.mail.ru/weblink/view/$decrypted"
-        return listOf(Video(videoUrl, "WarezCDN - $lang", videoUrl, headers))
-    }
-
-    private fun decryptorium(enc: String): String {
-        val b64dec = String(Base64.decode(enc, Base64.DEFAULT)).trim()
-        val start = b64dec.reversed().dropLast(5)
-        val end = b64dec.substring(0, 5)
-        return start + end
-    }
-}
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt
new file mode 100644
index 00000000..177f2704
--- /dev/null
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/interceptor/WebViewResolver.kt
@@ -0,0 +1,78 @@
+package eu.kanade.tachiyomi.animeextension.pt.vizer.interceptor
+
+import android.annotation.SuppressLint
+import android.app.Application
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import okhttp3.Headers
+import uy.kohesive.injekt.injectLazy
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class WebViewResolver(private val globalHeaders: Headers) {
+    private val context: Application by injectLazy()
+    private val handler by lazy { Handler(Looper.getMainLooper()) }
+    private val tag by lazy { javaClass.simpleName }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    fun getUrl(origRequestUrl: String, baseUrl: String): String? {
+        val latch = CountDownLatch(1)
+        var webView: WebView? = null
+        var result: String? = null
+
+        handler.post {
+            val webview = WebView(context)
+            webView = webview
+            with(webview.settings) {
+                javaScriptEnabled = true
+                domStorageEnabled = true
+                databaseEnabled = true
+                useWideViewPort = false
+                loadWithOverviewMode = false
+                userAgentString = globalHeaders["User-Agent"]
+            }
+            webview.webViewClient = object : WebViewClient() {
+                override fun shouldInterceptRequest(
+                    view: WebView,
+                    request: WebResourceRequest,
+                ): WebResourceResponse? {
+                    val url = request.url.toString()
+                    Log.d(tag, "Checking url $url")
+                    if (VIDEO_REGEX.containsMatchIn(url)) {
+                        result = url
+                        latch.countDown()
+                    }
+                    return super.shouldInterceptRequest(view, request)
+                }
+
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    Log.d(tag, "onPageFinished $url")
+                    super.onPageFinished(view, url)
+
+                    view?.evaluateJavascript("document.body.innerHTML += '<iframe src=\"" + origRequestUrl + "\" scrolling=\"no\" frameborder=\"0\" allowfullscreen=\"\" webkitallowfullscreen=\"\" mozallowfullscreen=\"\"></iframe>'") {}
+                }
+            }
+
+            webView?.loadUrl(baseUrl)
+        }
+
+        latch.await(TIMEOUT_SEC, TimeUnit.SECONDS)
+
+        handler.post {
+            webView?.stopLoading()
+            webView?.destroy()
+            webView = null
+        }
+        return result
+    }
+
+    companion object {
+        const val TIMEOUT_SEC: Long = 25
+        private val VIDEO_REGEX by lazy { Regex("//(mixdrop|streamtape|warezcdn)|/video/") }
+    }
+}
-- 
2.47.2


From aa2b5807d507c99b50ea7568d7749cc3b432fdff Mon Sep 17 00:00:00 2001
From: WebDitto <webditto@proton.me>
Date: Wed, 16 Oct 2024 14:17:48 -0300
Subject: [PATCH 2/2] feat: Added new lib extractor: fireplayer-extractor

---
 lib/fireplayer-extractor/build.gradle.kts     | 10 +++++
 .../FireplayerExtractor.kt                    | 43 +++++++++++--------
 src/pt/vizer/build.gradle                     |  1 +
 .../animeextension/pt/vizer/Vizer.kt          |  9 ++--
 4 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 lib/fireplayer-extractor/build.gradle.kts
 rename {src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors => lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor}/FireplayerExtractor.kt (51%)

diff --git a/lib/fireplayer-extractor/build.gradle.kts b/lib/fireplayer-extractor/build.gradle.kts
new file mode 100644
index 00000000..b102264b
--- /dev/null
+++ b/lib/fireplayer-extractor/build.gradle.kts
@@ -0,0 +1,10 @@
+plugins {
+    id("lib-android")
+}
+
+dependencies {
+    implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
+    }
+    implementation(project(":lib:playlist-utils"))
+}
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt b/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt
similarity index 51%
rename from src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt
rename to lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt
index 1dc111f0..f9735def 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/extractors/FireplayerExtractor.kt
+++ b/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.animeextension.pt.vizer.extractors
+package eu.kanade.tachiyomi.lib.fireplayerextractor
 
 import dev.datlag.jsunpacker.JsUnpacker
 import eu.kanade.tachiyomi.animesource.model.Video
@@ -8,31 +8,36 @@ import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.FormBody
 import okhttp3.Headers
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 
-class FireplayerExtractor(private val client: OkHttpClient, private val host: String = "https://embedplayer.online") {
-    private val headers by lazy {
-        Headers.headersOf(
-            "X-Requested-With",
-            "XMLHttpRequest",
-            "Referer",
-            host,
-            "Origin",
-            host,
-        )
-    }
+class FireplayerExtractor(
+    private val client: OkHttpClient,
+    private val defaultHost: String? = null,
+) {
+    fun videosFromUrl(
+        url: String,
+        videoNameGen: (String) -> String = { quality -> quality },
+        videoHost: String? = null,
+    ): List<Video> {
+        val host = videoHost ?: defaultHost ?: "https://${url.toHttpUrl().host}"
 
-    private val playlistUtils by lazy { PlaylistUtils(client, headers) }
+        val headers = Headers.Builder()
+            .set("X-Requested-With", "XMLHttpRequest")
+            .set("Referer", host)
+            .set("Origin", "https://${host.toHttpUrl().host}")
+            .set("X-Requested-With", "XMLHttpRequest")
+            .build()
 
-    fun videosFromUrl(url: String, lang: String): List<Video> {
         var id = url.substringAfterLast("/")
 
         if (id.length < 32) {
             val doc = client.newCall(GET(url, headers)).execute().asJsoup()
 
-            val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
-                ?.let(JsUnpacker::unpackAndCombine)
-                ?: doc.selectFirst("script:containsData(FirePlayer)")?.data()
+            val script =
+                doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data()
+                    ?.let(JsUnpacker::unpackAndCombine)
+                    ?: doc.selectFirst("script:containsData(FirePlayer)")?.data()
 
             if (script?.contains("FirePlayer(") == true) {
                 id = script.substringAfter("FirePlayer(\"").substringBefore('"')
@@ -51,6 +56,8 @@ class FireplayerExtractor(private val client: OkHttpClient, private val host: St
             .substringBefore('"')
             .replace("\\", "")
 
-        return playlistUtils.extractFromHls(masterUrl, videoNameGen = { "WarezCDN($lang) - $it" })
+        val playlistUtils = PlaylistUtils(client, headers)
+
+        return playlistUtils.extractFromHls(masterUrl, videoNameGen = videoNameGen)
     }
 }
diff --git a/src/pt/vizer/build.gradle b/src/pt/vizer/build.gradle
index 359097b3..80fe0b05 100644
--- a/src/pt/vizer/build.gradle
+++ b/src/pt/vizer/build.gradle
@@ -8,6 +8,7 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
+    implementation(project(':lib:fireplayer-extractor'))
     implementation(project(':lib:mixdrop-extractor'))
     implementation(project(':lib:playlist-utils'))
     implementation(project(':lib:streamtape-extractor'))
diff --git a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
index 8bf2b122..6491bd8a 100644
--- a/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
+++ b/src/pt/vizer/src/eu/kanade/tachiyomi/animeextension/pt/vizer/Vizer.kt
@@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.SearchItemDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.SearchResultDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.VideoDto
 import eu.kanade.tachiyomi.animeextension.pt.vizer.dto.VideoListDto
-import eu.kanade.tachiyomi.animeextension.pt.vizer.extractors.FireplayerExtractor
 import eu.kanade.tachiyomi.animeextension.pt.vizer.interceptor.WebViewResolver
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -19,6 +18,7 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
+import eu.kanade.tachiyomi.lib.fireplayerextractor.FireplayerExtractor
 import eu.kanade.tachiyomi.lib.mixdropextractor.MixDropExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.network.GET
@@ -246,7 +246,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
 
     private val mixdropExtractor by lazy { MixDropExtractor(client) }
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
-    private val fireplayerExtractor by lazy { FireplayerExtractor(client, "https://basseqwevewcewcewecwcw.xyz") }
+    private val fireplayerExtractor by lazy { FireplayerExtractor(client) }
 
     private fun getVideosFromObject(videoObj: VideoDto): List<Video> {
         val hosters = videoObj.hosters ?: return emptyList()
@@ -254,7 +254,8 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
         val langPrefix = if (videoObj.lang == "1") "LEG" else "DUB"
 
         return hosters.iterator().flatMap { (name, status) ->
-            if (status != 3) return@flatMap emptyList()
+            // Always try the warezcdn
+            if (status != 3 && name != "warezcdn") return@flatMap emptyList()
             val url = getPlayerUrl(videoObj.id, name)
             if (url.isNullOrBlank()) {
                 return emptyList()
@@ -262,7 +263,7 @@ class Vizer : ConfigurableAnimeSource, AnimeHttpSource() {
             when (name) {
                 "mixdrop" -> mixdropExtractor.videosFromUrl(url, langPrefix)
                 "streamtape" -> streamtapeExtractor.videosFromUrl(url, "StreamTape($langPrefix)")
-                "warezcdn" -> fireplayerExtractor.videosFromUrl(url, langPrefix)
+                "warezcdn" -> fireplayerExtractor.videosFromUrl(url, videoNameGen = { "WarezCDN($langPrefix) - $it" })
                 else -> emptyList()
             }
         }
-- 
2.47.2