!wip fixed merge

src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs

@@ -84,6 +84,13 @@ namespace Ombi.Schedule.Jobs.Ombi
 
 
                 var customization = await _customizationSettings.GetSettingsAsync();
+                // Get the Content
+                var plexContent = _plex.GetAll().Include(x => x.Episodes).AsNoTracking();
+                var embyContent = _emby.GetAll().Include(x => x.Episodes).AsNoTracking();
+
+                var addedLog = _recentlyAddedLog.GetAll();
+                var addedPlexMovieLogIds = addedLog.Where(x => x.Type == RecentlyAddedType.Plex && x.ContentType == ContentType.Parent).Select(x => x.ContentId);
+                var addedEmbyMoviesLogIds = addedLog.Where(x => x.Type == RecentlyAddedType.Emby && x.ContentType == ContentType.Parent).Select(x => x.ContentId);
 
                 var addedPlexEpisodesLogIds =
                 addedLog.Where(x => x.Type == RecentlyAddedType.Plex && x.ContentType == ContentType.Episode);
@@ -142,23 +149,6 @@ namespace Ombi.Schedule.Jobs.Ombi
                     foreach (var user in users)
                     {
                         // Get the users to send it to
-                    var users = await _userManager.GetUsersInRoleAsync(OmbiRoles.RecievesNewsletter);
-                    if (!users.Any())
-                    {
-                        return;
-                    }
-
-                    foreach (var emails in settings.ExternalEmails)
-                    {
-                        users.Add(new OmbiUser
-                        {
-                            UserName = emails,
-                            Email = emails
-                        });
-                    }
-                    var emailTasks = new List<Task>();
-                    foreach (var user in users)
-                    {
                         if (user.Email.IsNullOrEmpty())
                         {
                             continue;