From c1c4dd91de403024f6b90ed19420a8321709aaee Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Tue, 4 Oct 2022 19:51:29 +0700
Subject: [PATCH] fixed OnetwothreeTv TimefourTv home

---
 OnetwothreeTv/build.gradle.kts                |  2 +-
 .../main/kotlin/com/hexated/OnetwothreeTv.kt  | 33 ++++++++++---------
 TimefourTv/build.gradle.kts                   |  2 +-
 .../src/main/kotlin/com/hexated/TimefourTv.kt | 32 +++++++++---------
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/OnetwothreeTv/build.gradle.kts b/OnetwothreeTv/build.gradle.kts
index 9bcf3679..a000e631 100644
--- a/OnetwothreeTv/build.gradle.kts
+++ b/OnetwothreeTv/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 2
+version = 3
 
 
 cloudstream {
diff --git a/OnetwothreeTv/src/main/kotlin/com/hexated/OnetwothreeTv.kt b/OnetwothreeTv/src/main/kotlin/com/hexated/OnetwothreeTv.kt
index 46094646..bcd7bc9d 100644
--- a/OnetwothreeTv/src/main/kotlin/com/hexated/OnetwothreeTv.kt
+++ b/OnetwothreeTv/src/main/kotlin/com/hexated/OnetwothreeTv.kt
@@ -29,9 +29,19 @@ class OnetwothreeTv : MainAPI() {
     )
 
     override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse {
+        val items = mutableListOf<HomePageList>()
+        val nonPaged =
+            (request.name == "Top Streams" || request.name == "Latest Streams") && page <= 1
+        if (nonPaged) {
+            val res = app.get(request.data).document
+            val home = res.select("div.col-md-3.col-sm-6").mapNotNull {
+                it.toSearchResult()
+            }
+            items.add(HomePageList(request.name, home, true))
+        }
 
-        val document = if (request.name.contains("USA")) {
-            app.post(
+        if (request.name == "United States (USA)") {
+            val res = app.post(
                 "$mainUrl/wp-admin/admin-ajax.php", data = mapOf(
                     "action" to "_123tv_load_more_videos_from_category",
                     "cat_id" to request.data,
@@ -40,20 +50,13 @@ class OnetwothreeTv : MainAPI() {
                     "X-Requested-With" to "XMLHttpRequest"
                 )
             ).document
-        } else {
-            app.get(request.data).document
+            val home = res.select("div.col-md-3.col-sm-6").mapNotNull {
+                it.toSearchResult()
+            }
+            items.add(HomePageList(request.name, home, true))
         }
-        val home = document.select("div.col-md-3.col-sm-6").mapNotNull {
-            it.toSearchResult()
-        }
-        return newHomePageResponse(
-            list = HomePageList(
-                name = request.name,
-                list = home,
-                isHorizontalImages = true
-            ),
-            hasNext = true
-        )
+
+        return newHomePageResponse(items)
 
     }
 
diff --git a/TimefourTv/build.gradle.kts b/TimefourTv/build.gradle.kts
index 9d050653..68be48c6 100644
--- a/TimefourTv/build.gradle.kts
+++ b/TimefourTv/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
index 80d4ccf2..dcd34925 100644
--- a/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
+++ b/TimefourTv/src/main/kotlin/com/hexated/TimefourTv.kt
@@ -28,26 +28,28 @@ class TimefourTv : MainAPI() {
         page: Int,
         request: MainPageRequest
     ): HomePageResponse {
-        val document = if (request.name == "All Channels") {
-            if (page == 1) {
+        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()
+            }
+            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
             }
-        } else {
-            app.get("${request.data}.php").document
+            val home = res.select("div.tab-content ul li").mapNotNull {
+                it.toSearchResult()
+            }
+            items.add(HomePageList(request.name, home, true))
         }
-        val home = document.select("div.tab-content ul li").mapNotNull {
-            it.toSearchResult()
-        }
-        return newHomePageResponse(
-            list = HomePageList(
-                name = request.name,
-                list = home,
-                isHorizontalImages = true
-            ),
-            hasNext = true
-        )
+
+        return newHomePageResponse(items)
     }
 
     private fun Element.toSearchResult(): LiveSearchResponse? {