From 7253111d3e11eef825e7efa55d3a87b0e2ee8aaa Mon Sep 17 00:00:00 2001
From: alex <alex@users.noreply.github.com>
Date: Tue, 16 Jan 2024 17:04:44 +0700
Subject: [PATCH] Moflix: update detail page

---
 Moflix/build.gradle.kts                      |  2 +-
 Moflix/src/main/kotlin/com/hexated/Moflix.kt | 22 +++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Moflix/build.gradle.kts b/Moflix/build.gradle.kts
index e0197813..cc650970 100644
--- a/Moflix/build.gradle.kts
+++ b/Moflix/build.gradle.kts
@@ -1,5 +1,5 @@
 // use an integer for version numbers
-version = 1
+version = 2
 
 
 cloudstream {
diff --git a/Moflix/src/main/kotlin/com/hexated/Moflix.kt b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
index 385eb0aa..247950d3 100644
--- a/Moflix/src/main/kotlin/com/hexated/Moflix.kt
+++ b/Moflix/src/main/kotlin/com/hexated/Moflix.kt
@@ -8,6 +8,7 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import org.jsoup.Jsoup
 import kotlin.math.roundToInt
 
 class Moflix : MainAPI() {
@@ -72,10 +73,11 @@ class Moflix : MainAPI() {
 
     override suspend fun load(url: String): LoadResponse {
         val res = app.get(
-            "$mainUrl/api/v1/titles/${url.removePrefix("$mainUrl/")}?loader=titlePage",
+            "$mainUrl/api/v1/titles/${url.fixId()}?loader=titlePage",
             referer = "$mainUrl/"
         ).parsedSafe<Responses>()
 
+        val uri = Jsoup.parse(res?.seo.toString()).selectFirst("link[rel=canonical]")?.attr("href")
         val id = res?.title?.id
         val title = res?.title?.name ?: ""
         val poster = res?.title?.poster
@@ -83,6 +85,8 @@ class Moflix : MainAPI() {
         val tags = res?.title?.keywords?.mapNotNull { it.displayName }
         val year = res?.title?.year
         val isSeries = res?.title?.isSeries
+        val certification = res?.title?.certification
+        val duration = res?.title?.runtime
         val type = getType(isSeries)
         val description = res?.title?.description
         val trailers = res?.title?.videos?.filter { it.category.equals("trailer", true) }
@@ -123,7 +127,7 @@ class Moflix : MainAPI() {
                     }
                 }
             }?.flatten() ?: emptyList()
-            newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) {
+            newTvSeriesLoadResponse(title, uri ?: url, TvType.TvSeries, episodes) {
                 this.posterUrl = poster
                 this.backgroundPosterUrl = backdrop
                 this.year = year
@@ -132,7 +136,9 @@ class Moflix : MainAPI() {
                 this.tags = tags
                 this.rating = rating
                 this.actors = actors
+                this.duration = duration
                 this.recommendations = recommendations
+                this.contentRating = certification
                 addTrailer(trailers)
                 addImdbId(res?.title?.imdbId)
                 addTMDbId(res?.title?.tmdbId)
@@ -142,7 +148,7 @@ class Moflix : MainAPI() {
 
             newMovieLoadResponse(
                 title,
-                url,
+                uri ?: url,
                 TvType.Movie,
                 LoadData(isSeries = isSeries, urls = urls)
             ) {
@@ -154,7 +160,9 @@ class Moflix : MainAPI() {
                 this.tags = tags
                 this.rating = rating
                 this.actors = actors
+                this.duration = duration
                 this.recommendations = recommendations
+                this.contentRating = certification
                 addTrailer(trailers)
                 addImdbId(res?.title?.imdbId)
                 addTMDbId(res?.title?.tmdbId)
@@ -193,6 +201,12 @@ class Moflix : MainAPI() {
         return true
     }
 
+    private fun String.fixId(): String {
+        val chunk = "/titles/"
+        return if (this.contains(chunk)) this.substringAfter(chunk)
+            .substringBefore("/") else this.substringAfterLast("/")
+    }
+
     private suspend fun loadCustomExtractor(
         url: String,
         referer: String? = null,
@@ -233,6 +247,7 @@ class Moflix : MainAPI() {
     data class Responses(
         @JsonProperty("pagination") val pagination: Pagination? = null,
         @JsonProperty("title") val title: Title? = null,
+        @JsonProperty("seo") val seo: String? = null,
         @JsonProperty("credits") val credits: Credits? = null,
         @JsonProperty("seasons") val seasons: Seasons? = null,
         @JsonProperty("episodes") val episodes: Episodes? = null,
@@ -305,6 +320,7 @@ class Moflix : MainAPI() {
         @JsonProperty("name") val name: String? = null,
         @JsonProperty("release_date") val releaseDate: String? = null,
         @JsonProperty("year") val year: Int? = null,
+        @JsonProperty("runtime") val runtime: Int? = null,
         @JsonProperty("poster") val poster: String? = null,
         @JsonProperty("backdrop") val backdrop: String? = null,
         @JsonProperty("description") val description: String? = null,