From 26832004a33ceb2e3202e67ec8948a43d00d7f71 Mon Sep 17 00:00:00 2001
From: hexated <hexated@gmail.com>
Date: Tue, 6 Dec 2022 04:03:26 +0700
Subject: [PATCH] [Sora] Updated Home and small fix in UHDMovies

---
 SoraStream/build.gradle.kts                             | 2 +-
 SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 4 ++--
 SoraStream/src/main/kotlin/com/hexated/SoraStream.kt    | 1 +
 SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts
index 2733b23d..eebdfe33 100644
--- a/SoraStream/build.gradle.kts
+++ b/SoraStream/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 43
+version = 44
 
 
 cloudstream {
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
index 93ebaebc..bc1ee6e8 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt
@@ -1223,7 +1223,7 @@ object SoraExtractor : SoraStream() {
 
         val iframe =
             detailDoc.select("div.entry-content p").map { it }
-                .filter { it.text().filterIframe(season, year) }
+                .filter { it.text().filterIframe(season, lastSeason, year) }
                 .mapNotNull {
                     if (season == null) {
                         it.text() to it.nextElementSibling()?.select("a")?.attr("href")
@@ -1264,7 +1264,7 @@ object SoraExtractor : SoraStream() {
             val videoQuality =
                 Regex("(\\d{3,4})p").find(quality)?.groupValues?.getOrNull(1)?.toIntOrNull()
                     ?: Qualities.Unknown.value
-            val size = Regex("(?i)\\[(\\S+\\s?gb|mb)[]/]").find(quality)?.groupValues?.getOrNull(1)
+            val size = Regex("(?i)\\[(\\S+\\s?(gb|mb))[]/]").find(quality)?.groupValues?.getOrNull(1)
                 ?.let { "[$it]" } ?: quality
             callback.invoke(
                 ExtractorLink(
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
index 631104b1..a1900772 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt
@@ -97,6 +97,7 @@ open class SoraStream : TmdbProvider() {
     }
 
     override val mainPage = mainPageOf(
+        "$tmdbAPI/trending/all/day?api_key=$apiKey&region=&page=" to "Trending",
         "$tmdbAPI/tv/airing_today?api_key=$apiKey&region=&page=" to "Airing Today TV Shows",
         "$tmdbAPI/movie/popular?api_key=$apiKey&region=&page=" to "Popular Movies",
         "$tmdbAPI/tv/popular?api_key=$apiKey&region=&page=" to "Popular TV Shows",
diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
index 420c7335..796b3161 100644
--- a/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
+++ b/SoraStream/src/main/kotlin/com/hexated/SoraUtils.kt
@@ -18,9 +18,9 @@ data class FilmxyCookies(
     val wSec: String? = null,
 )
 
-fun String.filterIframe(seasonNum: Int?, year: Int?): Boolean {
+fun String.filterIframe(seasonNum: Int?, lastSeason: Int?, year: Int?): Boolean {
     return if (seasonNum != null) {
-        if (seasonNum == 1) {
+        if (lastSeason == 1) {
             this.contains(Regex("(?i)(S0?$seasonNum)|(Season\\s0?$seasonNum)|([0-9]{3,4}p)")) && !this.contains(
                 "Download",
                 true