From dc010bf034cf41a1d1f37cc2362cb46137d4a12e Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Tue, 24 Oct 2023 12:49:34 -0600 Subject: [PATCH] Remove manual isTvSeries check --- .../cloudstream3/metaproviders/TmdbProvider.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt index 6500f644..50301e22 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt @@ -152,7 +152,7 @@ open class TmdbProvider : MainAPI() { ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() } addActors(credits?.cast?.toList().toActors()) - contentRating = fetchContentRating(id, "US", true) + contentRating = fetchContentRating(id, "US") } } @@ -196,7 +196,7 @@ open class TmdbProvider : MainAPI() { ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() } addActors(credits?.cast?.toList().toActors()) - contentRating = fetchContentRating(id, "US", false) + contentRating = fetchContentRating(id, "US") } } @@ -268,14 +268,14 @@ open class TmdbProvider : MainAPI() { return null } - open suspend fun fetchContentRating(id: Int?, country: String, isTvSeries: Boolean): String? { + open suspend fun fetchContentRating(id: Int?, country: String): String? { id ?: return null - return if (isTvSeries) { - val contentRatings = tmdb.tvService().content_ratings(id).awaitResponse().body() - contentRatings?.results - ?.find { it: ContentRating -> - it.iso_3166_1 == country - }?.rating + + val contentRatings = tmdb.tvService().content_ratings(id).awaitResponse().body()?.results + return if (!contentRatings.isNullOrEmpty()) { + contentRatings.firstOrNull { it: ContentRating -> + it.iso_3166_1 == country + }?.rating } else { val releaseDates = tmdb.moviesService().releaseDates(id).awaitResponse().body()?.results val certification = releaseDates?.firstOrNull { it: ReleaseDatesResult ->