From 8b5051ae4ddf983c0f33e1aa89b8f1e20e84c489 Mon Sep 17 00:00:00 2001 From: Szajkop Date: Thu, 16 Mar 2023 17:45:15 +0100 Subject: [PATCH 1/2] Add default language to trending queries --- TMDbLib/Client/TMDbClientTrending.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/TMDbLib/Client/TMDbClientTrending.cs b/TMDbLib/Client/TMDbClientTrending.cs index f0134a6b..5bd84fdd 100644 --- a/TMDbLib/Client/TMDbClientTrending.cs +++ b/TMDbLib/Client/TMDbClientTrending.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using TMDbLib.Objects.General; +using TMDbLib.Objects.Languages; using TMDbLib.Objects.Search; using TMDbLib.Objects.Trending; using TMDbLib.Rest; @@ -18,6 +19,9 @@ public async Task> GetTrendingMoviesAsync(TimeWindo if (page >= 1) req.AddQueryString("page", page.ToString()); + if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + req.AddParameter("language", DefaultLanguage); + SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false); return resp; @@ -31,6 +35,9 @@ public async Task> GetTrendingTvAsync(TimeWindow timeW if (page >= 1) req.AddQueryString("page", page.ToString()); + if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + req.AddParameter("language", DefaultLanguage); + SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false); return resp; @@ -44,6 +51,9 @@ public async Task> GetTrendingPeopleAsync(TimeWind if (page >= 1) req.AddQueryString("page", page.ToString()); + if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + req.AddParameter("language", DefaultLanguage); + SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false); return resp; From c7f50e3dfc5e63ae97a9f01a97928ed1edcfffa7 Mon Sep 17 00:00:00 2001 From: szajkop Date: Fri, 5 Jan 2024 15:56:39 +0100 Subject: [PATCH 2/2] updated language handling logic in ClientTrending methods --- TMDbLib/Client/TMDbClientTrending.cs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/TMDbLib/Client/TMDbClientTrending.cs b/TMDbLib/Client/TMDbClientTrending.cs index 608adc32..aef3852b 100644 --- a/TMDbLib/Client/TMDbClientTrending.cs +++ b/TMDbLib/Client/TMDbClientTrending.cs @@ -18,10 +18,10 @@ public async Task> GetTrendingMoviesAsync(TimeWindo if (page >= 1) req.AddQueryString("page", page.ToString()); - if (language != null) - req.AddQueryString("language", language); - if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + if (!string.IsNullOrWhiteSpace(language)) + req.AddQueryString("language", language); + else if (!string.IsNullOrWhiteSpace(DefaultLanguage)) req.AddParameter("language", DefaultLanguage); SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false); @@ -36,10 +36,10 @@ public async Task> GetTrendingTvAsync(TimeWindow timeW if (page >= 1) req.AddQueryString("page", page.ToString()); - if (language != null) - req.AddQueryString("language", language); - if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + if (!string.IsNullOrWhiteSpace(language)) + req.AddQueryString("language", language); + else if (!string.IsNullOrWhiteSpace(DefaultLanguage)) req.AddParameter("language", DefaultLanguage); SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false); @@ -54,10 +54,10 @@ public async Task> GetTrendingPeopleAsync(TimeWind if (page >= 1) req.AddQueryString("page", page.ToString()); - if (language != null) - req.AddQueryString("language", language); - if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + if (!string.IsNullOrWhiteSpace(language)) + req.AddQueryString("language", language); + else if (!string.IsNullOrWhiteSpace(DefaultLanguage)) req.AddParameter("language", DefaultLanguage); SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false); @@ -72,8 +72,11 @@ public async Task> GetTrendingAllAsync(TimeWindow ti if (page >= 1) req.AddQueryString("page", page.ToString()); - if (language != null) + + if (!string.IsNullOrWhiteSpace(language)) req.AddQueryString("language", language); + else if (!string.IsNullOrWhiteSpace(DefaultLanguage)) + req.AddParameter("language", DefaultLanguage); SearchContainer resp = await req.GetOfT>(cancellationToken).ConfigureAwait(false);