From 05f2bce9a8d999bf8a33edc804cdcc448994f575 Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Sun, 30 Jul 2023 02:37:51 +0700
Subject: [PATCH] TimefourTv: fix daddy again

---
 .../src/main/kotlin/com/hexated/SoraUtils.kt  |  2 +-
 TimefourTv/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/TimefourTv.kt | 20 ++++++++-----------
 .../kotlin/com/hexated/TimefourTvExtractor.kt |  9 +++++++--
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 2f912165..386dea91 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -918,7 +918,7 @@ suspend fun getFilmxyCookies(imdbId: String? = null, season: Int? = null): Map<S
             Regex("var\\suserNonce.*?\"(\\S+?)\";").find(it)?.groupValues?.get(1)
         }
 
-    var phpsessid = session.baseClient.cookieJar.loadForRequest(url.toHttpUrl())
+    val phpsessid = session.baseClient.cookieJar.loadForRequest(url.toHttpUrl())
         .first { it.name == "PHPSESSID" }.value
 
     session.post(
diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index 3fb6e15e..8194a3f8 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 16
+version = 17
 
 
 cloudstream {
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
index 7b68e7a7..2ecb947b 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
@@ -1,15 +1,16 @@
 package com.hexated
 
+import com.hexated.TimefourTvExtractor.getBaseUrl
 import com.hexated.TimefourTvExtractor.getLink
 import com.lagradost.cloudstream3.*
 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"
     override var name = "Time4tv"
     override val hasDownloadSupport = false
     override val hasMainPage = true
@@ -18,14 +19,6 @@ open class TimefourTv : MainAPI() {
         TvType.Live
     )
 
-    companion object {
-        const val daddyUrl = "https://daddylivehd.com"
-        val daddyHost: String = daddyUrl.getHost()
-        private fun String.getHost(): String {
-            return URI(this).host.substringBeforeLast(".").substringAfterLast(".")
-        }
-    }
-
     override val mainPage = mainPageOf(
         "$mainUrl/tv-channels" to "All Channels",
         "$mainUrl/usa-channels" to "USA Channels",
@@ -145,6 +138,7 @@ open class TimefourTv : MainAPI() {
     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
@@ -177,9 +171,11 @@ open class TimefourTv : MainAPI() {
                     }
                 }
             } ?: listOf(
-            Episode(
-                document.selectFirst("div#content iframe")?.attr("src") ?: return null, title
-            )
+            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
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt
index 57d484a2..16003528 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTvExtractor.kt
@@ -10,7 +10,7 @@ var mainServer: String? = null
 
 object TimefourTvExtractor : TimefourTv() {
 
-    private fun getBaseUrl(url: String): String {
+    fun getBaseUrl(url: String): String {
         return URI(url).let {
             "${it.scheme}://${it.host}"
         }
@@ -72,7 +72,7 @@ object TimefourTvExtractor : TimefourTv() {
             return getSportLink(url)
         }
 
-        if(url.contains(daddyHost, true)) {
+        if(url.contains(daddyUrl.getHost(), true)) {
             mainServer = getBaseUrl(url)
             return getFinalLink(app.get(url, referer = daddyUrl))
         }
@@ -126,4 +126,9 @@ object TimefourTvExtractor : TimefourTv() {
                 ?.joinToString("")
         }
     }
+
+    private fun String.getHost(): String {
+        return URI(this).host.substringBeforeLast(".").substringAfterLast(".")
+    }
+
 }
\ No newline at end of file