Merge pull request #2096 from tidusjar/feature/recently-added

Feature/recently added

src/Ombi.Core/Engine/MovieRequestEngine.cs

@@ -54,7 +54,7 @@ namespace Ombi.Core.Engine
                 {
                     Result = false,
                     Message = "There was an issue adding this movie!",
-                    ErrorMessage = $"TheMovieDb didn't have any information for ID {model.TheMovieDbId}"
+                    ErrorMessage = $"Please try again later"
                 };
             }
             var fullMovieName =

src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html

@@ -151,7 +151,7 @@
                                         <td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">
                                             <br />
                                             <br />
-                                            <p style="font-family: sans-serif; font-size: 20px; font-weight: normal; margin: 0; Margin-bottom: 15px;">Here is a list of Movies and TV Shows that have recently been added!</p>
+                                            <p style="font-family: sans-serif; font-size: 20px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{@INTRO}</p>
 
                                         </td>
                                     </tr>

src/Ombi.Notifications/NotificationMessageCurlys.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Ombi.Helpers;
 using Ombi.Notifications.Models;
 using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository.Requests;
 
 namespace Ombi.Notifications
 {
@@ -25,9 +28,9 @@ namespace Ombi.Notifications
             }
             ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
             ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
-            RequestedUser = string.IsNullOrEmpty(req?.RequestedUser?.Alias)
-                ? req?.RequestedUser?.UserName
-                : req?.RequestedUser?.Alias;
+            RequestedUser = req?.RequestedUser?.UserName;
+            UserName = req?.RequestedUser?.UserName;
+            Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
             Title = title;
             RequestedDate = req?.RequestedDate.ToString("D");
             Type = req?.RequestType.ToString();
@@ -43,6 +46,8 @@ namespace Ombi.Notifications
             ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
             ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
             RequestedUser = username.UserName;
+            UserName = username.UserName;
+            Alias = username.Alias.HasValue() ? username.Alias : username.UserName;
         }
 
         public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s)
@@ -59,9 +64,9 @@ namespace Ombi.Notifications
             }
             ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
             ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
-            RequestedUser = string.IsNullOrEmpty(req?.RequestedUser.Alias)
-                ? req?.RequestedUser.UserName
-                : req?.RequestedUser.Alias;
+            RequestedUser = req?.RequestedUser?.UserName;
+            UserName = req?.RequestedUser?.UserName;
+            Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
             Title = title;
             RequestedDate = req?.RequestedDate.ToString("D");
             Type = req?.RequestType.ToString();
@@ -71,6 +76,40 @@ namespace Ombi.Notifications
                 $"https://image.tmdb.org/t/p/w300{req?.ParentRequest.PosterPath}" : req?.ParentRequest.PosterPath;
             AdditionalInformation = opts.AdditionalInformation;
             // DO Episode and Season Lists
+
+            var episodes = req?.SeasonRequests?.SelectMany(x => x.Episodes) ?? new List<EpisodeRequests>();
+            var seasons = req?.SeasonRequests?.OrderBy(x => x.SeasonNumber).ToList() ?? new List<SeasonRequests>();
+            var orderedEpisodes = episodes.OrderBy(x => x.EpisodeNumber).ToList();
+            var epSb = new StringBuilder();
+            var seasonSb = new StringBuilder();
+            for (var i = 0; i < orderedEpisodes.Count; i++)
+            {
+                var ep = orderedEpisodes[i];
+                if (i < orderedEpisodes.Count - 1)
+                {
+                    epSb.Append($"{ep.EpisodeNumber},");
+                }
+                else
+                {
+                    epSb.Append($"{ep.EpisodeNumber}");
+                }
+            }
+
+            for (var i = 0; i < seasons.Count; i++)
+            {
+                var ep = seasons[i];
+                if (i < seasons.Count - 1)
+                {
+                    seasonSb.Append($"{ep.SeasonNumber},");
+                }
+                else
+                {
+                    seasonSb.Append($"{ep.SeasonNumber}");
+                }
+            }
+
+            EpisodesList = epSb.ToString();
+            SeasonsList = seasonSb.ToString();
         }
 
         public void Setup(OmbiUser user, CustomizationSettings s)
@@ -88,13 +127,14 @@ namespace Ombi.Notifications
             IssueStatus = opts.Substitutes.TryGetValue("IssueStatus", out val) ? val : string.Empty;
             IssueSubject = opts.Substitutes.TryGetValue("IssueSubject", out val) ? val : string.Empty;
             NewIssueComment = opts.Substitutes.TryGetValue("NewIssueComment", out val) ? val : string.Empty;
-            RequestedUser = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
+            UserName = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
         }
 
         // User Defined
         public string RequestedUser { get; set; }
-        public string UserName => RequestedUser;
-        public string IssueUser => RequestedUser;
+        public string UserName { get; set; }
+        public string IssueUser => UserName;
+        public string Alias { get; set; }
 
         public string Title { get; set; }
         public string RequestedDate { get; set; }
@@ -144,6 +184,7 @@ namespace Ombi.Notifications
             {nameof(NewIssueComment),NewIssueComment},
             {nameof(IssueUser),IssueUser},
             {nameof(UserName),UserName},
+            {nameof(Alias),Alias},
         };
     }
 }

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

@@ -288,22 +288,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
                 try
                 {
-                    AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.BackdropPath}");
-
-                    sb.Append("<tr>");
-                    TableData(sb);
-
-                    Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
-                    Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
-                    EndTag(sb, "a");
-
-                    if (info.Genres.Any())
-                    {
-                        AddParagraph(sb,
-                            $"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
-                    }
-
-                    AddParagraph(sb, info.Overview);
+                    CreateMovieHtmlContent(sb, info);
                 }
                 catch (Exception e)
                 {
@@ -316,6 +301,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
             }
         }
+
         private async Task ProcessEmbyMovies(IQueryable<EmbyContent> embyContent, StringBuilder sb)
         {
             sb.Append(
@@ -331,22 +317,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
                 try
                 {
-                    AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.BackdropPath}");
-
-                    sb.Append("<tr>");
-                    TableData(sb);
-
-                    Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
-                    Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
-                    EndTag(sb, "a");
-
-                    if (info.Genres.Any())
-                    {
-                        AddParagraph(sb,
-                            $"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
-                    }
-
-                    AddParagraph(sb, info.Overview);
+                    CreateMovieHtmlContent(sb, info);
                 }
                 catch (Exception e)
                 {
@@ -360,6 +331,26 @@ namespace Ombi.Schedule.Jobs.Ombi
             }
         }
 
+        private void CreateMovieHtmlContent(StringBuilder sb, MovieResponseDto info)
+        {
+            AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.PosterPath}");
+
+            sb.Append("<tr>");
+            TableData(sb);
+
+            Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
+            Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
+            EndTag(sb, "a");
+
+            if (info.Genres.Any())
+            {
+                AddParagraph(sb,
+                    $"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
+            }
+
+            AddParagraph(sb, info.Overview);
+        }
+
         private async Task ProcessPlexTv(IQueryable<PlexServerContent> plexContent, StringBuilder sb)
         {
             var orderedTv = plexContent.OrderByDescending(x => x.AddedAt);

src/Ombi.Store/Context/OmbiContext.cs

@@ -119,7 +119,10 @@ namespace Ombi.Store.Context
             var roles = Roles.Where(x => x.Name == OmbiRoles.RecievesNewsletter);
             if (!roles.Any())
             {
-                Roles.Add(new IdentityRole(OmbiRoles.RecievesNewsletter));
+                Roles.Add(new IdentityRole(OmbiRoles.RecievesNewsletter)
+                {
+                    NormalizedName = OmbiRoles.RecievesNewsletter.ToUpper()
+                });
             }
             //Check if templates exist
             var templates = NotificationTemplates.ToList();
@@ -143,7 +146,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! The user '{RequestedUser}' has requested the {Type} '{Title}'! Please log in to approve this request. Request Date: {RequestedDate}",
+                                Message = "Hello! The user '{UserName}' has requested the {Type} '{Title}'! Please log in to approve this request. Request Date: {RequestedDate}",
                                 Subject = "{ApplicationName}: New {Type} request for {Title}!",
                                 Agent = agent,
                                 Enabled = true,
@@ -153,7 +156,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! The user '{IssueUser}' has reported a new issue for the title {Title}! </br> {IssueCategory} - {IssueSubject} : {IssueDescription}",
+                                Message = "Hello! The user '{UserName}' has reported a new issue for the title {Title}! </br> {IssueCategory} - {IssueSubject} : {IssueDescription}",
                                 Subject = "{ApplicationName}: New issue for {Title}!",
                                 Agent = agent,
                                 Enabled = true,
@@ -163,7 +166,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! You requested {Title} on {ApplicationName}! This is now available! :)",
+                                Message = "Hello! You   {Title} on {ApplicationName}! This is now available! :)",
                                 Subject = "{ApplicationName}: {Title} is now available!",
                                 Agent = agent,
                                 Enabled = true,
@@ -207,7 +210,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello {IssueUser} Your issue for {Title} has now been resolved.",
+                                Message = "Hello {UserName} Your issue for {Title} has now been resolved.",
                                 Subject = "{ApplicationName}: Issue has been resolved for {Title}!",
                                 Agent = agent,
                                 Enabled = true,

src/Ombi/ClientApp/app/search/tvsearch.component.ts

@@ -129,7 +129,6 @@ export class TvSearchComponent implements OnInit {
 
     public getExtraInfo() {
         this.tvResults.forEach((val, index) => {
-
             this.imageService.getTvBanner(val.data.id).subscribe(x => {
                 
                 val.data.background = this.sanitizer.

src/Ombi/ClientApp/app/services/job.service.ts

@@ -38,4 +38,8 @@ export class JobService extends ServiceHelpers {
     public runEmbyCacher(): Observable<boolean> {
         return this.http.post<boolean>(`${this.url}embycontentcacher/`, {headers: this.headers});
     }
+
+    public runNewsletter(): Observable<boolean> {
+        return this.http.post<boolean>(`${this.url}newsletter/`, {headers: this.headers});
+    }
 }

src/Ombi/ClientApp/app/settings/notifications/newsletter.component.html

@@ -30,14 +30,18 @@
                         <button type="button" (click)="test()" class="btn btn-danger-outline">Test</button>
                         <button type="button" (click)="updateDatabase()" class="btn btn-info-outline" tooltipPosition="top" pTooltip="I recommend running this with a fresh Ombi install, this will set all the current *found* content to have been sent via Newsletter, 
                         if you do not do this then everything that Ombi has found in your libraries will go out on the first email!">Update Database</button>
+                        
+                        <button type="button" (click)="trigger()" class="btn btn-danger-outline">Trigger now</button>
                     </div>
-                    <small>NOTE: Please see the tooltip on the Update Database button.</small>
-                    <small>When testing, the test newsletter will go to all users that have the Admin role, please ensure that there are valid email addresses for this. The test will also only grab the latest 10 movies and 10 shows just to give you an example.</small>
-                </div>
+                                 </div>
         </div>
 
 
         <div class="col-md-6">
+            <small>NOTE: Please see the tooltip on the Update Database button - Please see the wiki for more information</small>
+            <br/>
+            <br/>
+            <small>When testing, the test newsletter will go to all users that have the Admin role, please ensure that there are valid email addresses for this. The test will also only grab the latest 10 movies and 10 shows just to give you an example.</small>
 
         </div>
     </fieldset>

src/Ombi/ClientApp/app/settings/notifications/newsletter.component.ts

@@ -1,9 +1,9 @@
-
+import {  } from './../../services/job.service';
+
 import { Component, OnInit } from "@angular/core";
 
 import { INewsletterNotificationSettings, NotificationType } from "../../interfaces";
-import { NotificationService } from "../../services";
-import { SettingsService } from "../../services";
+import { JobService, NotificationService, SettingsService } from "../../services";
 import { TesterService } from "./../../services/applications/tester.service";
 
 @Component({
@@ -16,7 +16,8 @@ export class NewsletterComponent implements OnInit {
 
     constructor(private settingsService: SettingsService,
                 private notificationService: NotificationService,
-                private testService: TesterService) { }
+                private testService: TesterService,
+                private jobService: JobService) { }
 
     public ngOnInit() {
         this.settingsService.getNewsletterSettings().subscribe(x => {
@@ -26,10 +27,17 @@ export class NewsletterComponent implements OnInit {
 
     public updateDatabase() {
         this.settingsService.updateNewsletterDatabase().subscribe();
+        this.notificationService.success("Database updated");
     }
 
     public test() {
         this.testService.newsletterTest(this.settings).subscribe();
+        this.notificationService.success("Test message queued");
+    }
+
+    public trigger() {
+        this.jobService.runNewsletter().subscribe();
+        this.notificationService.success("Triggered newsletter job");
     }
 
     public onSubmit() {

src/Ombi/ClientApp/styles/_imports.scss

@@ -1 +1,2 @@
-@import './styles.scss';
+@import './styles.scss';
+@import './scrollbar.scss';

src/Ombi/ClientApp/styles/scrollbar.scss

@@ -0,0 +1,23 @@
+::-webkit-scrollbar {
+    width: 15px;
+}
+
+::-webkit-scrollbar-track {
+    background-color: rgba(0,0,0,.2);
+}
+
+::-webkit-scrollbar-thumb {
+    min-height: 50px;
+    background-color: rgba(255,255,255,.15);
+    border: 3px solid transparent;
+    border-radius: 8px;
+    background-clip: padding-box;
+}
+
+pre::-webkit-scrollbar-track {
+    background-color: rgba(255,255,255,.2);
+}
+
+pre::-webkit-scrollbar-thumb {
+    background-color: rgba(0,0,0,.15);
+}

src/Ombi/Controllers/JobController.cs

@@ -20,7 +20,7 @@ namespace Ombi.Controllers
     {
         public JobController(IOmbiAutomaticUpdater updater, IPlexUserImporter userImporter,
             ICacheService mem, IEmbyUserImporter embyImporter, IPlexContentSync plexContentSync,
-            IEmbyContentSync embyContentSync)
+            IEmbyContentSync embyContentSync, INewsletterJob newsletter)
         {
             _updater = updater;
             _plexUserImporter = userImporter;
@@ -28,6 +28,7 @@ namespace Ombi.Controllers
             _memCache = mem;
             _plexContentSync = plexContentSync;
             _embyContentSync = embyContentSync;
+            _newsletterJob = newsletter;
         }
 
         private readonly IOmbiAutomaticUpdater _updater;
@@ -36,6 +37,7 @@ namespace Ombi.Controllers
         private readonly ICacheService _memCache;
         private readonly IPlexContentSync _plexContentSync;
         private readonly IEmbyContentSync _embyContentSync;
+        private readonly INewsletterJob _newsletterJob;
 
         /// <summary>
         /// Runs the update job
@@ -129,5 +131,16 @@ namespace Ombi.Controllers
             BackgroundJob.Enqueue(() => _embyContentSync.Start());
             return true;
         }
+
+        /// <summary>
+        /// Runs the newsletter
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("newsletter")]
+        public bool StartNewsletter()
+        {
+            BackgroundJob.Enqueue(() => _newsletterJob.Start());
+            return true;
+        }
     }
 }

src/Ombi/Startup.cs

@@ -165,6 +165,12 @@ namespace Ombi
             var ombiService =
                 app.ApplicationServices.GetService<ISettingsService<OmbiSettings>>();
             var settings = ombiService.GetSettings();
+            if (settings.ApiKey.IsNullOrEmpty())
+            {
+                // Generate a API Key
+                settings.ApiKey = Guid.NewGuid().ToString("N");
+                ombiService.SaveSettings(settings);
+            }
             if (settings.BaseUrl.HasValue())
             {
                 app.UsePathBase(settings.BaseUrl);