From 7c37458e3b594650398225186730f5e00921ae19 Mon Sep 17 00:00:00 2001
From: "Jamie.Rees" <Jamie.Rees>
Date: Thu, 30 Mar 2017 08:07:59 +0100
Subject: [PATCH] slightly increased the wait time for the emby newsletter also
 fixed a potential error in the plex user checker

---
 Ombi.Services/Jobs/PlexUserChecker.cs         |  3 ++-
 .../EmbyRecentlyAddedNewsletter.cs            | 26 ++-----------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/Ombi.Services/Jobs/PlexUserChecker.cs b/Ombi.Services/Jobs/PlexUserChecker.cs
index 7a56ddeee..1ea679b02 100644
--- a/Ombi.Services/Jobs/PlexUserChecker.cs
+++ b/Ombi.Services/Jobs/PlexUserChecker.cs
@@ -31,6 +31,7 @@ using System;
 using System.Linq;
 using NLog;
 using Ombi.Api.Interfaces;
+using Ombi.Api.Models.Plex;
 using Ombi.Core;
 using Ombi.Core.SettingModels;
 using Ombi.Core.Users;
@@ -89,7 +90,7 @@ namespace Ombi.Services.Jobs
                 var localUsers = LocalUserRepository.GetAll().ToList();
 
                 // Regular users
-                foreach (var user in plexUsers.User)
+                foreach (var user in plexUsers?.User ?? new UserFriends[]{})
                 {
                     var dbUser = dbUsers.FirstOrDefault(x => x.PlexUserId == user.Id);
                     if (dbUser != null)
diff --git a/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs b/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs
index 6c6be9ec5..b3830fc58 100644
--- a/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs
+++ b/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs
@@ -159,9 +159,11 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
                         var i = Api.GetInformation(relatedSeries.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
                             embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
 
+                        Thread.Sleep(200);
                         var episodeInfo = Api.GetInformation(embyEpisodes.EmbyId,
                             Ombi.Api.Models.Emby.EmbyMediaType.Episode,
                             embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
+                        
                         // Check if we already have this series
                         var existingSeries = recentlyAddedModel.FirstOrDefault(x =>
                             x.EmbyInformation.SeriesInformation.Id.Equals(i.SeriesInformation.Id,
@@ -197,35 +199,11 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter
                 {
                     var i = Api.GetInformation(t.EmbyId, Ombi.Api.Models.Emby.EmbyMediaType.Series,
                         embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
-                    var ep = filteredEp.Where(x => x.ParentId == t.EmbyId).ToList();
                     var item = new EmbyRecentlyAddedModel
                     {
                         EmbyContent = t,
                         EmbyInformation = i,
                     };
-                    if (ep.Any() && embySettings.EnableEpisodeSearching)
-                    {
-                        try
-                        {
-                            var episodeList = new List<EmbyEpisodeInformation>();
-                            foreach (var embyEpisodese in ep)
-                            {
-                                var epInfo = Api.GetInformation(embyEpisodese.EmbyId,
-                                    Ombi.Api.Models.Emby.EmbyMediaType.Episode,
-                                    embySettings.ApiKey, embySettings.AdministratorId, embySettings.FullUri);
-                                episodeList.Add(epInfo.EpisodeInformation);
-                                Thread.Sleep(600); // Let's not try and overload the server
-                            }
-                            item.EpisodeInformation = episodeList;
-                        }
-                        catch (JsonReaderException)
-                        {
-                            Log.Error(
-                                "Failed getting episode information, we may have overloaded Emby's api... Waiting and we will skip this one and go to the next");
-                            Thread.Sleep(1000);
-                        }
-                    }
-
                     info.Add(item);
                 }
             }