diff --git a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs index 62fc1352f..ba4bd5c62 100644 --- a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs +++ b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs @@ -35,7 +35,8 @@ namespace Ombi.Schedule.Jobs.Ombi IMovieDbApi movieApi, ITvMazeApi tvApi, IEmailProvider email, ISettingsService custom, ISettingsService emailSettings, INotificationTemplatesRepository templateRepo, UserManager um, ISettingsService newsletter, ILogger log, - ILidarrApi lidarrApi, IRepository albumCache, ISettingsService lidarrSettings) + ILidarrApi lidarrApi, IRepository albumCache, ISettingsService lidarrSettings, + ISettingsService ombiSettings) { _plex = plex; _emby = emby; @@ -55,6 +56,8 @@ namespace Ombi.Schedule.Jobs.Ombi _lidarrApi = lidarrApi; _lidarrAlbumRepository = albumCache; _lidarrSettings = lidarrSettings; + _ombiSettings = ombiSettings; + _ombiSettings.ClearCache(); _lidarrSettings.ClearCache(); } @@ -68,6 +71,7 @@ namespace Ombi.Schedule.Jobs.Ombi private readonly INotificationTemplatesRepository _templateRepo; private readonly ISettingsService _emailSettings; private readonly ISettingsService _newsletterSettings; + private readonly ISettingsService _ombiSettings; private readonly UserManager _userManager; private readonly ILogger _log; private readonly ILidarrApi _lidarrApi; @@ -331,6 +335,7 @@ namespace Ombi.Schedule.Jobs.Ombi private async Task BuildHtml(IQueryable plexContentToSend, IQueryable embyContentToSend, HashSet plexEpisodes, HashSet embyEp, HashSet albums, NewsletterSettings settings) { + var ombiSettings = await _ombiSettings.GetSettingsAsync(); var sb = new StringBuilder(); var plexMovies = plexContentToSend.Where(x => x.Type == PlexMediaTypeEntity.Movie); @@ -344,8 +349,8 @@ namespace Ombi.Schedule.Jobs.Ombi sb.Append(""); sb.Append(""); sb.Append(""); - await ProcessPlexMovies(plexMovies, sb); - await ProcessEmbyMovies(embyMovies, sb); + await ProcessPlexMovies(plexMovies, sb, ombiSettings.DefaultLanguageCode); + await ProcessEmbyMovies(embyMovies, sb, ombiSettings.DefaultLanguageCode); sb.Append(""); sb.Append("
"); sb.Append(""); @@ -392,7 +397,7 @@ namespace Ombi.Schedule.Jobs.Ombi return sb.ToString(); } - private async Task ProcessPlexMovies(IQueryable plexContentToSend, StringBuilder sb) + private async Task ProcessPlexMovies(IQueryable plexContentToSend, StringBuilder sb, string defaultLanguageCode) { int count = 0; var ordered = plexContentToSend.OrderByDescending(x => x.AddedAt); @@ -403,7 +408,7 @@ namespace Ombi.Schedule.Jobs.Ombi { continue; } - var info = await _movieApi.GetMovieInformationWithExtraInfo(movieDbId); + var info = await _movieApi.GetMovieInformationWithExtraInfo(movieDbId, defaultLanguageCode); var mediaurl = content.Url; if (info == null) { @@ -466,7 +471,7 @@ namespace Ombi.Schedule.Jobs.Ombi } } - private async Task ProcessEmbyMovies(IQueryable embyContent, StringBuilder sb) + private async Task ProcessEmbyMovies(IQueryable embyContent, StringBuilder sb, string defaultLangaugeCode) { int count = 0; var ordered = embyContent.OrderByDescending(x => x.AddedAt); @@ -487,7 +492,7 @@ namespace Ombi.Schedule.Jobs.Ombi } var mediaurl = content.Url; - var info = await _movieApi.GetMovieInformationWithExtraInfo(StringHelper.IntParseLinq(theMovieDbId)); + var info = await _movieApi.GetMovieInformationWithExtraInfo(StringHelper.IntParseLinq(theMovieDbId), defaultLangaugeCode); if (info == null) { continue;