Merge pull request #2194 from tidusjar/develop

Develop

src/Ombi.Api.Mattermost/Ombi.Api.Mattermost.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Api.Plex/IPlexApi.cs

@@ -1,6 +1,8 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Ombi.Api.Plex.Models;
 using Ombi.Api.Plex.Models.Friends;
+using Ombi.Api.Plex.Models.OAuth;
 using Ombi.Api.Plex.Models.Server;
 using Ombi.Api.Plex.Models.Status;
 
@@ -20,5 +22,8 @@ namespace Ombi.Api.Plex
         Task<PlexFriends> GetUsers(string authToken);
         Task<PlexAccount> GetAccount(string authToken);
         Task<PlexMetadata> GetRecentlyAdded(string authToken, string uri, string sectionId);
+        Task<OAuthPin> CreatePin();
+        Task<OAuthPin> GetPin(int pinId);
+        Uri GetOAuthUrl(int pinId, string code, string applicationUrl, bool wizard);
     }
 }

src/Ombi.Api.Plex/Models/OAuth/OAuthPin.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace Ombi.Api.Plex.Models.OAuth
+{
+    public class OAuthPin
+    {
+        public int id { get; set; }
+        public string code { get; set; }
+        public bool trusted { get; set; }
+        public string clientIdentifier { get; set; }
+        public Location location { get; set; }
+        public int expiresIn { get; set; }
+        public DateTime createdAt { get; set; }
+        public DateTime expiresAt { get; set; }
+        public string authToken { get; set; }
+    }
+
+    public class Location
+    {
+        public string code { get; set; }
+        public string country { get; set; }
+        public string city { get; set; }
+        public string subdivisions { get; set; }
+        public string coordinates { get; set; }
+    }
+
+}

src/Ombi.Api.Plex/PlexApi.cs

@@ -1,20 +1,53 @@
-using System.Net.Http;
+using System;
+using System.Net.Http;
+using System.Reflection;
 using System.Threading.Tasks;
 using Ombi.Api.Plex.Models;
 using Ombi.Api.Plex.Models.Friends;
+using Ombi.Api.Plex.Models.OAuth;
 using Ombi.Api.Plex.Models.Server;
 using Ombi.Api.Plex.Models.Status;
+using Ombi.Core.Settings;
+using Ombi.Core.Settings.Models.External;
+using Ombi.Helpers;
+using Ombi.Settings.Settings.Models;
 
 namespace Ombi.Api.Plex
 {
     public class PlexApi : IPlexApi
     {
-        public PlexApi(IApi api)
+        public PlexApi(IApi api, ISettingsService<CustomizationSettings> settings)
         {
             Api = api;
+            _custom = settings;
         }
 
         private IApi Api { get; }
+        private readonly ISettingsService<CustomizationSettings> _custom;
+
+        private string _app;
+        private string ApplicationName
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_app))
+                {
+                    var settings = _custom.GetSettings();
+                    if (settings.ApplicationName.IsNullOrEmpty())
+                    {
+                        _app = "Ombi";
+                    }
+                    else
+                    {
+                        _app = settings.ApplicationName;
+                    }
+
+                    return _app;
+                }
+
+                return _app;
+            }
+        }
 
         private const string SignInUri = "https://plex.tv/users/sign_in.json";
         private const string FriendsUri = "https://plex.tv/pms/friends/all";
@@ -156,6 +189,50 @@ namespace Ombi.Api.Plex
             return await Api.Request<PlexMetadata>(request);
         }
 
+        public async Task<OAuthPin> CreatePin()
+        {
+            var request = new Request($"api/v2/pins", "https://plex.tv/", HttpMethod.Post);
+            request.AddQueryString("strong", "true");
+            AddHeaders(request);
+
+            return await Api.Request<OAuthPin>(request);
+        }
+
+        public async Task<OAuthPin> GetPin(int pinId)
+        {
+            var request = new Request($"api/v2/pins/{pinId}", "https://plex.tv/", HttpMethod.Get);
+            AddHeaders(request);
+
+            return await Api.Request<OAuthPin>(request);
+        }
+
+        public Uri GetOAuthUrl(int pinId, string code, string applicationUrl, bool wizard)
+        {
+            var request = new Request("auth#", "https://app.plex.tv", HttpMethod.Get);
+            AddHeaders(request);
+            var forwardUrl = wizard 
+                ? new Request($"Wizard/OAuth/{pinId}", applicationUrl, HttpMethod.Get) 
+                : new Request($"Login/OAuth/{pinId}", applicationUrl, HttpMethod.Get);
+
+            request.AddQueryString("forwardUrl", forwardUrl.FullUri.ToString());
+            request.AddQueryString("pinID", pinId.ToString());
+            request.AddQueryString("code", code);
+            request.AddQueryString("context[device][product]", "Ombi");
+            request.AddQueryString("context[device][environment]", "bundled");
+            request.AddQueryString("clientID", $"OmbiV3");
+
+            if (request.FullUri.Fragment.Equals("#"))
+            {
+                var uri = request.FullUri.ToString();
+                var withoutEnd = uri.Remove(uri.Length - 1, 1);
+                var startOfQueryLocation = withoutEnd.IndexOf('?');
+                var better = withoutEnd.Insert(startOfQueryLocation, "#");
+                request.FullUri = new Uri(better);
+            }
+
+            return request.FullUri;
+        }
+
         /// <summary>
         /// Adds the required headers and also the authorization header
         /// </summary>
@@ -174,7 +251,7 @@ namespace Ombi.Api.Plex
         private void AddHeaders(Request request)
         {
             request.AddHeader("X-Plex-Client-Identifier", $"OmbiV3");
-            request.AddHeader("X-Plex-Product", "Ombi");
+            request.AddHeader("X-Plex-Product", ApplicationName);
             request.AddHeader("X-Plex-Version", "3");
             request.AddContentHeader("Content-Type", request.ContentType == ContentType.Json ? "application/json" : "application/xml");
             request.AddHeader("Accept", "application/json");

src/Ombi.Api.Pushover/PushoverApi.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Ombi.Api.Pushover.Models;
@@ -17,7 +18,7 @@ namespace Ombi.Api.Pushover
 
         public async Task<PushoverResponse> PushAsync(string accessToken, string message, string userToken)
         {
-            var request = new Request($"messages.json?token={accessToken}&user={userToken}&message={message}", PushoverEndpoint, HttpMethod.Post);
+            var request = new Request($"messages.json?token={accessToken}&user={userToken}&message={WebUtility.HtmlEncode(message)}", PushoverEndpoint, HttpMethod.Post);
             
             var result = await _api.Request<PushoverResponse>(request);
             return result;

src/Ombi.Api/Ombi.Api.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Polly" Version="5.8.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>

src/Ombi.Api/Request.cs

@@ -105,10 +105,10 @@ namespace Ombi.Api
                 hasQuery = true;
                 startingTag = builder.Query.Contains("?") ? "&" : "?";
             }
-
             builder.Query = hasQuery
                 ? $"{builder.Query}{startingTag}{key}={value}"
                 : $"{startingTag}{key}={value}";
+
             _modified = builder.Uri;
         }
 

src/Ombi.Core/Authentication/PlexOAuthManager.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Threading.Tasks;
+using Ombi.Api.Plex;
+using Ombi.Api.Plex.Models;
+using Ombi.Api.Plex.Models.OAuth;
+using Ombi.Core.Settings;
+using Ombi.Helpers;
+using Ombi.Settings.Settings.Models;
+
+namespace Ombi.Core.Authentication
+{
+    public class PlexOAuthManager : IPlexOAuthManager
+    {
+        public PlexOAuthManager(IPlexApi api, ISettingsService<CustomizationSettings> settings)
+        {
+            _api = api;
+            _customizationSettingsService = settings;
+        }
+
+        private readonly IPlexApi _api;
+        private readonly ISettingsService<CustomizationSettings> _customizationSettingsService;
+
+        public async Task<OAuthPin> RequestPin()
+        {
+            var pin = await _api.CreatePin();
+            return pin;
+        }
+
+        public async Task<string> GetAccessTokenFromPin(int pinId)
+        {
+            var pin = await _api.GetPin(pinId);
+            if (pin.expiresAt < DateTime.UtcNow)
+            {
+                return string.Empty;
+            }
+
+            if (pin.authToken.IsNullOrEmpty())
+            {
+                // Looks like we do not have a pin yet, we should retry a few times.
+                var retryCount = 0;
+                var retryMax = 5;
+                var retryWaitMs = 1000;
+                while (pin.authToken.IsNullOrEmpty() && retryCount < retryMax)
+                {
+                    retryCount++;
+                    await Task.Delay(retryWaitMs);
+                    pin = await _api.GetPin(pinId);
+                }
+            }
+            return pin.authToken;
+        }
+
+        public async Task<PlexAccount> GetAccount(string accessToken)
+        {
+            return await _api.GetAccount(accessToken);
+        }
+
+        public async Task<Uri> GetOAuthUrl(int pinId, string code, string websiteAddress = null)
+        {
+            Uri url;
+            if (websiteAddress.IsNullOrEmpty())
+            {
+                var settings = await _customizationSettingsService.GetSettingsAsync();
+                if (settings.ApplicationUrl.IsNullOrEmpty())
+                {
+                    return null;
+                }
+
+                url = _api.GetOAuthUrl(pinId, code, settings.ApplicationUrl, false);
+            }
+            else
+            {
+                url = _api.GetOAuthUrl(pinId, code, websiteAddress, false);
+            }
+
+            return url;
+        }
+
+        public Uri GetWizardOAuthUrl(int pinId, string code, string websiteAddress)
+        {
+            var url = _api.GetOAuthUrl(pinId, code, websiteAddress, true);
+            return url;
+        }
+    }
+}

src/Ombi.Core/Engine/Interfaces/BaseEngine.cs

@@ -32,14 +32,7 @@ namespace Ombi.Core.Engine.Interfaces
         private OmbiUser _user;
         protected async Task<OmbiUser> GetUser()
         {
-            if (IsApiUser)
-            {
-                return new OmbiUser
-                {
-                    UserName = Username,
-                };
-            }
-            return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName == Username));
+            return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName.Equals(Username, StringComparison.CurrentCultureIgnoreCase)));
         }
 
         protected async Task<string> UserAlias()
@@ -49,10 +42,6 @@ namespace Ombi.Core.Engine.Interfaces
 
         protected async Task<bool> IsInRole(string roleName)
         {
-            if (IsApiUser && roleName != OmbiRoles.Disabled)
-            {
-                return true;
-            }
             return await UserManager.IsInRoleAsync(await GetUser(), roleName);
         }
         
@@ -72,7 +61,5 @@ namespace Ombi.Core.Engine.Interfaces
             var ruleResults = await Rules.StartSpecificRules(model, rule);
             return ruleResults;
         }
-
-        private bool IsApiUser => Username.Equals("Api", StringComparison.CurrentCultureIgnoreCase);
     }
 }

src/Ombi.Core/Engine/Interfaces/IMovieRequestEngine.cs

@@ -18,5 +18,6 @@ namespace Ombi.Core.Engine.Interfaces
         Task<RequestEngineResult> ApproveMovieById(int requestId);
         Task<RequestEngineResult> DenyMovieById(int modelId);
         Task<IEnumerable<MovieRequests>> Filter(FilterViewModel vm);
+   
     }
 }

src/Ombi.Core/Engine/Interfaces/IRequestEngine.cs

@@ -17,5 +17,6 @@ namespace Ombi.Core.Engine.Interfaces
 
         Task<RequestEngineResult> MarkUnavailable(int modelId);
         Task<RequestEngineResult> MarkAvailable(int modelId);
+        Task<int> GetTotal();
     }
 }

src/Ombi.Core/Engine/MovieRequestEngine.cs

@@ -144,6 +144,19 @@ namespace Ombi.Core.Engine
             return allRequests;
         }
 
+        public async Task<int> GetTotal()
+        {
+            var shouldHide = await HideFromOtherUsers();
+            if (shouldHide.Hide)
+            {
+                return await MovieRepository.GetWithUser(shouldHide.UserId).CountAsync();
+            }
+            else
+            {
+                return await MovieRepository.GetWithUser().CountAsync();
+            }
+        }
+
         /// <summary>
         /// Gets the requests.
         /// </summary>

src/Ombi.Core/Engine/RecentlyAddedEngine.cs

@@ -63,13 +63,17 @@ namespace Ombi.Core.Engine
             var recentlyAddedLog = new HashSet<RecentlyAddedLog>();
             foreach (var p in plexContent)
             {
+                if (!p.HasTheMovieDb)
+                {
+                    continue;
+                }
                 if (p.Type == PlexMediaTypeEntity.Movie)
                 {
                     recentlyAddedLog.Add(new RecentlyAddedLog
                     {
                         AddedAt = DateTime.Now,
                         Type = RecentlyAddedType.Plex,
-                        ContentId = p.Id,
+                        ContentId = int.Parse(p.TheMovieDbId),
                         ContentType = ContentType.Parent
                     });
                 }
@@ -78,12 +82,18 @@ namespace Ombi.Core.Engine
                     // Add the episodes
                     foreach (var ep in p.Episodes)
                     {
+                        if (!ep.Series.HasTvDb)
+                        {
+                            continue;
+                        }
                         recentlyAddedLog.Add(new RecentlyAddedLog
                         {
                             AddedAt = DateTime.Now,
                             Type = RecentlyAddedType.Plex,
-                            ContentId = ep.Id,
-                            ContentType = ContentType.Episode
+                            ContentId = int.Parse(ep.Series.TvDbId),
+                            ContentType = ContentType.Episode,
+                            EpisodeNumber = ep.EpisodeNumber,
+                            SeasonNumber = ep.SeasonNumber
                         });
                     }
                 }
@@ -91,13 +101,17 @@ namespace Ombi.Core.Engine
 
             foreach (var e in embyContent)
             {
+                if (e.TheMovieDbId.IsNullOrEmpty())
+                {
+                    continue;
+                }
                 if (e.Type == EmbyMediaType.Movie)
                 {
                     recentlyAddedLog.Add(new RecentlyAddedLog
                     {
                         AddedAt = DateTime.Now,
                         Type = RecentlyAddedType.Emby,
-                        ContentId = e.Id,
+                        ContentId = int.Parse(e.TheMovieDbId),
                         ContentType = ContentType.Parent
                     });
                 }
@@ -106,12 +120,18 @@ namespace Ombi.Core.Engine
                     // Add the episodes
                     foreach (var ep in e.Episodes)
                     {
+                        if (ep.Series.TvDbId.IsNullOrEmpty())
+                        {
+                            continue;
+                        }
                         recentlyAddedLog.Add(new RecentlyAddedLog
                         {
                             AddedAt = DateTime.Now,
                             Type = RecentlyAddedType.Emby,
-                            ContentId = ep.Id,
-                            ContentType = ContentType.Episode
+                            ContentId = int.Parse(ep.Series.TvDbId),
+                            ContentType = ContentType.Episode,
+                            EpisodeNumber = ep.EpisodeNumber,
+                            SeasonNumber = ep.SeasonNumber
                         });
                     }
                 }

src/Ombi.Core/Engine/TvRequestEngine.cs

@@ -1,6 +1,7 @@
 using System;
 using AutoMapper;
 using Ombi.Api.TvMaze;
+using Ombi.Api.TheMovieDb;
 using Ombi.Core.Models.Requests;
 using Ombi.Core.Models.Search;
 using Ombi.Helpers;
@@ -26,11 +27,12 @@ namespace Ombi.Core.Engine
 {
     public class TvRequestEngine : BaseMediaEngine, ITvRequestEngine
     {
-        public TvRequestEngine(ITvMazeApi tvApi, IRequestServiceMain requestService, IPrincipal user,
+        public TvRequestEngine(ITvMazeApi tvApi, IMovieDbApi movApi, IRequestServiceMain requestService, IPrincipal user,
             INotificationHelper helper, IRuleEvaluator rule, OmbiUserManager manager,
             ITvSender sender, IAuditRepository audit, IRepository<RequestLog> rl, ISettingsService<OmbiSettings> settings, ICacheService cache) : base(user, requestService, rule, manager, cache, settings)
         {
             TvApi = tvApi;
+            MovieDbApi = movApi;
             NotificationHelper = helper;
             TvSender = sender;
             Audit = audit;
@@ -39,6 +41,7 @@ namespace Ombi.Core.Engine
 
         private INotificationHelper NotificationHelper { get; }
         private ITvMazeApi TvApi { get; }
+        private IMovieDbApi MovieDbApi { get; }
         private ITvSender TvSender { get; }
         private IAuditRepository Audit { get; }
         private readonly IRepository<RequestLog> _requestLog;
@@ -47,7 +50,7 @@ namespace Ombi.Core.Engine
         {
             var user = await GetUser();
 
-            var tvBuilder = new TvShowRequestBuilder(TvApi);
+            var tvBuilder = new TvShowRequestBuilder(TvApi, MovieDbApi);
             (await tvBuilder
                 .GetShowInfo(tv.TvDbId))
                 .CreateTvList(tv)
@@ -274,6 +277,7 @@ namespace Ombi.Core.Engine
             results.ImdbId = request.ImdbId;
             results.Overview = request.Overview;
             results.PosterPath = PosterPathHelper.FixPosterPath(request.PosterPath);
+            results.Background = PosterPathHelper.FixBackgroundPath(request.Background);
             results.QualityOverride = request.QualityOverride;
             results.RootFolder = request.RootFolder;
 
@@ -428,6 +432,19 @@ namespace Ombi.Core.Engine
             };
         }
 
+        public async Task<int> GetTotal()
+        {
+            var shouldHide = await HideFromOtherUsers();
+            if (shouldHide.Hide)
+            {
+                return await TvRepository.Get(shouldHide.UserId).CountAsync();
+            }
+            else
+            {
+                return await TvRepository.Get().CountAsync();
+            }
+        }
+
         private async Task<RequestEngineResult> AddExistingRequest(ChildRequests newRequest, TvRequests existingRequest)
         {
             // Add the child

src/Ombi.Core/Helpers/TvShowRequestBuilder.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Ombi.Api.TvMaze;
+using Ombi.Api.TheMovieDb;
 using Ombi.Api.TvMaze.Models;
+using Ombi.Api.TheMovieDb.Models;
 using Ombi.Core.Models.Requests;
 using Ombi.Core.Models.Search;
 using Ombi.Helpers;
@@ -16,23 +18,37 @@ namespace Ombi.Core.Helpers
     public class TvShowRequestBuilder
     {
 
-        public TvShowRequestBuilder(ITvMazeApi tvApi)
+        public TvShowRequestBuilder(ITvMazeApi tvApi, IMovieDbApi movApi)
         {
             TvApi = tvApi;
+            MovieDbApi = movApi;
         }
         
         private ITvMazeApi TvApi { get; }
+        private IMovieDbApi MovieDbApi { get; }
 
         public ChildRequests ChildRequest { get; set; }
         public List<SeasonsViewModel> TvRequests { get; protected set; }
         public string PosterPath { get; protected set; }
+        public string BackdropPath { get; protected set; }
         public DateTime FirstAir { get; protected set; }
         public TvRequests NewRequest { get; protected set; }
         protected TvMazeShow ShowInfo { get; set; }
+        protected List<TvSearchResult> Results { get; set; }
 
         public async Task<TvShowRequestBuilder> GetShowInfo(int id)
         {
             ShowInfo = await TvApi.ShowLookupByTheTvDbId(id);
+            Results = await MovieDbApi.SearchTv(ShowInfo.name);
+            foreach (TvSearchResult result in Results) {
+                if (result.Name == ShowInfo.name)
+                {                  
+                    var showIds = await MovieDbApi.GetTvExternals(result.Id);
+                    ShowInfo.externals.imdb = showIds.imdb_id;
+                    BackdropPath = result.BackdropPath;
+                    break;
+                }
+            }
 
             DateTime.TryParse(ShowInfo.premiered, out var dt);
 
@@ -226,7 +242,8 @@ namespace Ombi.Core.Helpers
                 ImdbId = ShowInfo.externals?.imdb ?? string.Empty,
                 TvDbId = tv.TvDbId,
                 ChildRequests = new List<ChildRequests>(),
-                TotalSeasons = tv.Seasons.Count()
+                TotalSeasons = tv.Seasons.Count(),
+                Background = BackdropPath
             };
             NewRequest.ChildRequests.Add(ChildRequest);
 

src/Ombi.Core/IPlexOAuthManager.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Threading.Tasks;
+using Ombi.Api.Plex.Models;
+using Ombi.Api.Plex.Models.OAuth;
+
+namespace Ombi.Core.Authentication
+{
+    public interface IPlexOAuthManager
+    {
+        Task<string> GetAccessTokenFromPin(int pinId);
+        Task<OAuthPin> RequestPin();
+        Task<Uri> GetOAuthUrl(int pinId, string code, string websiteAddress = null);
+        Uri GetWizardOAuthUrl(int pinId, string code, string websiteAddress);
+        Task<PlexAccount> GetAccount(string accessToken);
+    }
+}

src/Ombi.Core/Models/Search/SearchViewModel.cs

@@ -10,6 +10,7 @@ namespace Ombi.Core.Models.Search
         public bool Requested { get; set; }
         public bool Available { get; set; }
         public string PlexUrl { get; set; }
+        public string EmbyUrl { get; set; }
         public string Quality { get; set; }
         public abstract RequestType Type { get; }
 

src/Ombi.Core/Ombi.Core.csproj

@@ -11,12 +11,12 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.1.1" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="3.0.1" />
-    <PackageReference Include="Hangfire" Version="1.6.17" />
+    <PackageReference Include="Hangfire" Version="1.6.19" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.5" />
     <PackageReference Include="MiniProfiler.AspNetCore" Version="4.0.0-alpha6-79" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
   </ItemGroup>
 

src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs

@@ -44,6 +44,7 @@ namespace Ombi.Core.Rule.Rules.Search
             if (item != null)
             {
                 obj.Available = true;
+                obj.EmbyUrl = item.Url;
 
                 if (obj.Type == RequestType.TvShow)
                 {

src/Ombi.DependencyInjection/IocExtensions.cs

@@ -51,6 +51,7 @@ using Ombi.Store.Repository.Requests;
 using Ombi.Updater;
 using PlexContentCacher = Ombi.Schedule.Jobs.Plex;
 using Ombi.Api.Telegram;
+using Ombi.Core.Authentication;
 using Ombi.Core.Processor;
 using Ombi.Schedule.Jobs.Plex.Interfaces;
 using Ombi.Schedule.Jobs.SickRage;
@@ -82,6 +83,7 @@ namespace Ombi.DependencyInjection
             services.AddTransient<IRecentlyAddedEngine, RecentlyAddedEngine>();
             services.AddTransient<ITvSender, TvSender>();
             services.AddTransient<IMassEmailSender, MassEmailSender>();
+            services.AddTransient<IPlexOAuthManager, PlexOAuthManager>();
         }
         public static void RegisterHttp(this IServiceCollection services)
         {
@@ -175,7 +177,6 @@ namespace Ombi.DependencyInjection
             services.AddTransient<ISickRageSync, SickRageSync>();
             services.AddTransient<IRefreshMetadata, RefreshMetadata>();
             services.AddTransient<INewsletterJob, NewsletterJob>();
-            services.AddTransient<IPlexRecentlyAddedSync, PlexRecentlyAddedSync>();
         }
     }
 }

src/Ombi.Helpers/EmbyHelper.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Globalization;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Ombi.Helpers
+{
+    public class EmbyHelper
+    {
+        public static string GetEmbyMediaUrl(string mediaId)
+        {
+            var url =
+                $"http://app.emby.media/itemdetails.html?id={mediaId}";
+            return url;
+        }
+    }
+}

src/Ombi.Helpers/LinqHelpers.cs

@@ -14,5 +14,12 @@ namespace Ombi.Helpers
                     yield return source1;
             }
         }
+
+        public static HashSet<T> ToHashSet<T>(
+            this IEnumerable<T> source,
+            IEqualityComparer<T> comparer = null)
+        {
+            return new HashSet<T>(source, comparer);
+        }
     }
 }

src/Ombi.Helpers/Ombi.Helpers.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="EasyCrypto" Version="3.3.2" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="Nito.AsyncEx" Version="5.0.0-pre-05" />
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
   </ItemGroup>

src/Ombi.Helpers/PosterPathHelper.cs

@@ -18,5 +18,19 @@ namespace Ombi.Helpers
 
             return poster;
         }
+
+        public static string FixBackgroundPath(string background)
+        {
+            // https://image.tmdb.org/t/p/w1280/fJAvGOitU8y53ByeHnM4avtKFaG.jpg 
+
+            if (background.Contains("image.tmdb.org", CompareOptions.IgnoreCase))
+            {
+                // Somehow we have a full path here for the poster, we only want the last segment
+                var backgroundSegments = background.Split('/');
+                return backgroundSegments.Last();
+            }
+
+            return background;
+        }
     }
 }

src/Ombi.Helpers/StringHelper.cs

@@ -65,5 +65,15 @@ namespace Ombi.Helpers
             securePassword.MakeReadOnly();
             return securePassword;
         }
+
+        public static int IntParseLinq(string stringIn)
+        {
+            if (int.TryParse(stringIn, out var result))
+            {
+                return result;
+            }
+
+            return -1;
+        }
     }
 }

src/Ombi.Helpers/UriHelper.cs

@@ -112,6 +112,7 @@ namespace Ombi.Helpers
 
             return uriBuilder.Uri;
         }
+        
     }
 
     public class ApplicationSettingsException : Exception

src/Ombi.Mapping/Profiles/MovieProfile.cs

@@ -24,6 +24,19 @@ namespace Ombi.Mapping.Profiles
                 .ForMember(dest => dest.VoteAverage, opts => opts.MapFrom(src => src.vote_average))
                 .ForMember(dest => dest.VoteCount, opts => opts.MapFrom(src => src.vote_count));
 
+            CreateMap<SearchResult, TvSearchResult>()
+                .ForMember(dest => dest.BackdropPath, opts => opts.MapFrom(src => src.backdrop_path))
+                .ForMember(dest => dest.Id, opts => opts.MapFrom(src => src.id))
+                .ForMember(dest => dest.OriginalLanguage, opts => opts.MapFrom(src => src.original_language))
+                .ForMember(dest => dest.OriginalName, opts => opts.MapFrom(src => src.original_name))
+                .ForMember(dest => dest.Overview, opts => opts.MapFrom(src => src.overview))
+                .ForMember(dest => dest.Popularity, opts => opts.MapFrom(src => src.popularity))
+                .ForMember(dest => dest.PosterPath, opts => opts.MapFrom(src => src.poster_path))
+                .ForMember(dest => dest.ReleaseDate, opts => opts.MapFrom(src => src.first_air_date))
+                .ForMember(dest => dest.Name, opts => opts.MapFrom(src => src.name))
+                .ForMember(dest => dest.VoteAverage, opts => opts.MapFrom(src => src.vote_average))
+                .ForMember(dest => dest.VoteCount, opts => opts.MapFrom(src => src.vote_count));
+
             CreateMap<MovieResponse, MovieResponseDto>()
                 .ForMember(dest => dest.Adult, opts => opts.MapFrom(src => src.adult))
                 .ForMember(dest => dest.BackdropPath, opts => opts.MapFrom(src => src.backdrop_path))

src/Ombi.Notifications/Ombi.Notifications.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ensure.That" Version="7.0.0-pre32" />
-    <PackageReference Include="MailKit" Version="1.20.0" />
+    <PackageReference Include="MailKit" Version="2.0.3" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Schedule/JobSetup.cs

@@ -19,7 +19,7 @@ namespace Ombi.Schedule
             IOmbiAutomaticUpdater updater, IEmbyContentSync embySync, IPlexUserImporter userImporter,
             IEmbyUserImporter embyUserImporter, ISonarrSync cache, ICouchPotatoSync cpCache,
             ISettingsService<JobSettings> jobsettings, ISickRageSync srSync, IRefreshMetadata refresh,
-            INewsletterJob newsletter, IPlexRecentlyAddedSync recentlyAddedSync)
+            INewsletterJob newsletter)
         {
             _plexContentSync = plexContentSync;
             _radarrSync = radarrSync;
@@ -33,7 +33,6 @@ namespace Ombi.Schedule
             _srSync = srSync;
             _refreshMetadata = refresh;
             _newsletter = newsletter;
-            _plexRecentlyAddedSync = recentlyAddedSync;
         }
 
         private readonly IPlexContentSync _plexContentSync;
@@ -48,7 +47,6 @@ namespace Ombi.Schedule
         private readonly ISettingsService<JobSettings> _jobSettings;
         private readonly IRefreshMetadata _refreshMetadata;
         private readonly INewsletterJob _newsletter;
-        private readonly IPlexRecentlyAddedSync _plexRecentlyAddedSync;
 
         public void Setup()
         {
@@ -68,6 +66,8 @@ namespace Ombi.Schedule
             RecurringJob.AddOrUpdate(() => _embyUserImporter.Start(), JobSettingsHelper.UserImporter(s));
             RecurringJob.AddOrUpdate(() => _plexUserImporter.Start(), JobSettingsHelper.UserImporter(s));
             RecurringJob.AddOrUpdate(() => _newsletter.Start(), JobSettingsHelper.Newsletter(s));
+
+            BackgroundJob.Enqueue(() => _refreshMetadata.Start());
         }
 
 

src/Ombi.Schedule/Jobs/Emby/EmbyContentSync.cs

@@ -114,6 +114,7 @@ namespace Ombi.Schedule.Jobs.Emby
                         Title = tvInfo.Name,
                         Type = EmbyMediaType.Series,
                         EmbyId = tvShow.Id,
+                        Url = EmbyHelper.GetEmbyMediaUrl(tvShow.Id),
                         AddedAt = DateTime.UtcNow
                     });
             }
@@ -135,6 +136,7 @@ namespace Ombi.Schedule.Jobs.Emby
                     Title = movieInfo.Name,
                     Type = EmbyMediaType.Movie,
                     EmbyId = movieInfo.Id,
+                    Url = EmbyHelper.GetEmbyMediaUrl(movieInfo.Id),
                     AddedAt = DateTime.UtcNow,
                 });
         }

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

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 using MailKit;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using Ombi.Api.TheMovieDb;
 using Ombi.Api.TheMovieDb.Models;
 using Ombi.Api.TvMaze;
@@ -26,7 +29,7 @@ namespace Ombi.Schedule.Jobs.Ombi
         public NewsletterJob(IPlexContentRepository plex, IEmbyContentRepository emby, IRepository<RecentlyAddedLog> addedLog,
             IMovieDbApi movieApi, ITvMazeApi tvApi, IEmailProvider email, ISettingsService<CustomizationSettings> custom,
             ISettingsService<EmailNotificationSettings> emailSettings, INotificationTemplatesRepository templateRepo,
-            UserManager<OmbiUser> um, ISettingsService<NewsletterSettings> newsletter)
+            UserManager<OmbiUser> um, ISettingsService<NewsletterSettings> newsletter, ILogger<NewsletterJob> log)
         {
             _plex = plex;
             _emby = emby;
@@ -42,6 +45,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             _emailSettings.ClearCache();
             _customizationSettings.ClearCache();
             _newsletterSettings.ClearCache();
+            _log = log;
         }
 
         private readonly IPlexContentRepository _plex;
@@ -55,6 +59,7 @@ namespace Ombi.Schedule.Jobs.Ombi
         private readonly ISettingsService<EmailNotificationSettings> _emailSettings;
         private readonly ISettingsService<NewsletterSettings> _newsletterSettings;
         private readonly UserManager<OmbiUser> _userManager;
+        private readonly ILogger _log;
 
         public async Task Start(NewsletterSettings settings, bool test)
         {
@@ -74,152 +79,172 @@ namespace Ombi.Schedule.Jobs.Ombi
                 return;
             }
 
-            var customization = await _customizationSettings.GetSettingsAsync();
+            try
+            {
 
-            // 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 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 addedPlexEpisodesLogIds = addedLog.Where(x => x.Type == RecentlyAddedType.Plex && x.ContentType == ContentType.Episode).Select(x => x.ContentId);
-            var addedEmbyEpisodesLogIds = addedLog.Where(x => x.Type == RecentlyAddedType.Emby && x.ContentType == ContentType.Episode).Select(x => x.ContentId);
+                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);
 
-            // Filter out the ones that we haven't sent yet
-            var plexContentMoviesToSend = plexContent.Where(x => x.Type == PlexMediaTypeEntity.Movie && !addedPlexMovieLogIds.Contains(x.Id));
-            var embyContentMoviesToSend = embyContent.Where(x => x.Type == EmbyMediaType.Movie && !addedEmbyMoviesLogIds.Contains(x.Id));
+                var addedPlexEpisodesLogIds =
+                addedLog.Where(x => x.Type == RecentlyAddedType.Plex && x.ContentType == ContentType.Episode);
+                var addedEmbyEpisodesLogIds =
+                    addedLog.Where(x => x.Type == RecentlyAddedType.Emby && x.ContentType == ContentType.Episode);
 
-            var plexEpisodesToSend = _plex.GetAllEpisodes().Include(x => x.Series).Where(x => !addedPlexEpisodesLogIds.Contains(x.Id)).AsNoTracking();
-            var embyEpisodesToSend = _emby.GetAllEpisodes().Include(x => x.Series).Where(x => !addedEmbyEpisodesLogIds.Contains(x.Id)).AsNoTracking();
+                // Filter out the ones that we haven't sent yet
+                var plexContentMoviesToSend = plexContent.Where(x => x.Type == PlexMediaTypeEntity.Movie && !addedPlexMovieLogIds.Contains(StringHelper.IntParseLinq(x.TheMovieDbId)));
+                var embyContentMoviesToSend = embyContent.Where(x => x.Type == EmbyMediaType.Movie && !addedEmbyMoviesLogIds.Contains(StringHelper.IntParseLinq(x.TheMovieDbId)));
+                _log.LogInformation("Plex Movies to send: {0}", plexContentMoviesToSend.Count());
+                _log.LogInformation("Emby Movies to send: {0}", embyContentMoviesToSend.Count());
 
-            var body = string.Empty;
-            if (test)
-            {
-                var plexm = plexContent.Where(x => x.Type == PlexMediaTypeEntity.Movie).OrderByDescending(x => x.AddedAt).Take(10);
-                var embym = embyContent.Where(x => x.Type == EmbyMediaType.Movie).OrderByDescending(x => x.AddedAt).Take(10);
-                var plext = _plex.GetAllEpisodes().Include(x => x.Series).OrderByDescending(x => x.Series.AddedAt).Take(10);
-                var embyt = _emby.GetAllEpisodes().Include(x => x.Series).OrderByDescending(x => x.AddedAt).Take(10);
-                body = await BuildHtml(plexm, embym, plext, embyt, settings);
-            }
-            else
-            {
-                body = await BuildHtml(plexContentMoviesToSend, embyContentMoviesToSend, plexEpisodesToSend, embyEpisodesToSend, settings);
-                if (body.IsNullOrEmpty())
-                {
-                    return;
-                }
-
-            }
+                var plexEpisodesToSend =
+                    FilterPlexEpisodes(_plex.GetAllEpisodes().Include(x => x.Series).AsNoTracking(), addedPlexEpisodesLogIds);
+                var embyEpisodesToSend = FilterEmbyEpisodes(_emby.GetAllEpisodes().Include(x => x.Series).AsNoTracking(),
+                    addedEmbyEpisodesLogIds);
 
-            if (!test)
-            {
-                // Get the users to send it to
-                var users = await _userManager.GetUsersInRoleAsync(OmbiRoles.RecievesNewsletter);
-                if (!users.Any())
+                _log.LogInformation("Plex Episodes to send: {0}", plexEpisodesToSend.Count());
+                _log.LogInformation("Emby Episodes to send: {0}", embyEpisodesToSend.Count());
+                var body = string.Empty;
+                if (test)
                 {
-                    return;
+                    var plexm = plexContent.Where(x => x.Type == PlexMediaTypeEntity.Movie).OrderByDescending(x => x.AddedAt).Take(10);
+                    var embym = embyContent.Where(x => x.Type == EmbyMediaType.Movie).OrderByDescending(x => x.AddedAt).Take(10);
+                    var plext = _plex.GetAllEpisodes().Include(x => x.Series).OrderByDescending(x => x.Series.AddedAt).Take(10).ToHashSet();
+                    var embyt = _emby.GetAllEpisodes().Include(x => x.Series).OrderByDescending(x => x.AddedAt).Take(10).ToHashSet();
+                    body = await BuildHtml(plexm, embym, plext, embyt, settings);
                 }
-
-                foreach (var emails in settings.ExternalEmails)
+                else
                 {
-                    users.Add(new OmbiUser
+                    body = await BuildHtml(plexContentMoviesToSend, embyContentMoviesToSend, plexEpisodesToSend, embyEpisodesToSend, settings);
+                    if (body.IsNullOrEmpty())
                     {
-                        UserName = emails,
-                        Email = emails
-                    });
+                        return;
+                    }
                 }
-                var emailTasks = new List<Task>();
-                foreach (var user in users)
+
+                if (!test)
                 {
-                    if (user.Email.IsNullOrEmpty())
+                    // Get the users to send it to
+                    var users = await _userManager.GetUsersInRoleAsync(OmbiRoles.RecievesNewsletter);
+                    if (!users.Any())
                     {
-                        continue;
+                        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)
+                    {
+                        // Get the users to send it to
+                        if (user.Email.IsNullOrEmpty())
+                        {
+                            continue;
+                        }
 
-                    var messageContent = ParseTemplate(template, customization, user);
-                    var email = new NewsletterTemplate();
+                        var messageContent = ParseTemplate(template, customization, user);
+                        var email = new NewsletterTemplate();
 
-                    var html = email.LoadTemplate(messageContent.Subject, messageContent.Message, body, customization.Logo);
+                        var html = email.LoadTemplate(messageContent.Subject, messageContent.Message, body, customization.Logo);
 
-                    emailTasks.Add(_email.Send(
-                        new NotificationMessage { Message = html, Subject = messageContent.Subject, To = user.Email },
-                        emailSettings));
-                }
+                        emailTasks.Add(_email.Send(
+                            new NotificationMessage { Message = html, Subject = messageContent.Subject, To = user.Email },
+                            emailSettings));
+                    }
 
-                // Now add all of this to the Recently Added log
-                var recentlyAddedLog = new HashSet<RecentlyAddedLog>();
-                foreach (var p in plexContentMoviesToSend)
-                {
-                    recentlyAddedLog.Add(new RecentlyAddedLog
+                    // Now add all of this to the Recently Added log
+                    var recentlyAddedLog = new HashSet<RecentlyAddedLog>();
+                    foreach (var p in plexContentMoviesToSend)
                     {
-                        AddedAt = DateTime.Now,
-                        Type = RecentlyAddedType.Plex,
-                        ContentType = ContentType.Parent,
-                        ContentId = p.Id
-                    });
+                        recentlyAddedLog.Add(new RecentlyAddedLog
+                        {
+                            AddedAt = DateTime.Now,
+                            Type = RecentlyAddedType.Plex,
+                            ContentType = ContentType.Parent,
+                            ContentId = StringHelper.IntParseLinq(p.TheMovieDbId),
+                        });
 
-                }
+                    }
 
-                foreach (var p in plexEpisodesToSend)
-                {
-                    recentlyAddedLog.Add(new RecentlyAddedLog
+                    foreach (var p in plexEpisodesToSend)
                     {
-                        AddedAt = DateTime.Now,
-                        Type = RecentlyAddedType.Plex,
-                        ContentType = ContentType.Episode,
-                        ContentId = p.Id
-                    });
-                }
+                        recentlyAddedLog.Add(new RecentlyAddedLog
+                        {
+                            AddedAt = DateTime.Now,
+                            Type = RecentlyAddedType.Plex,
+                            ContentType = ContentType.Episode,
+                            ContentId = StringHelper.IntParseLinq(p.Series.TvDbId),
+                            EpisodeNumber = p.EpisodeNumber,
+                            SeasonNumber = p.SeasonNumber
+                        });
+                    }
+                    foreach (var e in embyContentMoviesToSend)
+                    {
+                        if (e.Type == EmbyMediaType.Movie)
+                        {
+                            recentlyAddedLog.Add(new RecentlyAddedLog
+                            {
+                                AddedAt = DateTime.Now,
+                                Type = RecentlyAddedType.Emby,
+                                ContentType = ContentType.Parent,
+                                ContentId = StringHelper.IntParseLinq(e.TheMovieDbId),
+                            });
+                        }
+                    }
 
-                foreach (var e in embyContentMoviesToSend)
-                {
-                    if (e.Type == EmbyMediaType.Movie)
+                    foreach (var p in embyEpisodesToSend)
                     {
                         recentlyAddedLog.Add(new RecentlyAddedLog
                         {
                             AddedAt = DateTime.Now,
                             Type = RecentlyAddedType.Emby,
-                            ContentType = ContentType.Parent,
-                            ContentId = e.Id
+                            ContentType = ContentType.Episode,
+                            ContentId = StringHelper.IntParseLinq(p.Series.TvDbId),
+                            EpisodeNumber = p.EpisodeNumber,
+                            SeasonNumber = p.SeasonNumber
                         });
                     }
+                    await _recentlyAddedLog.AddRange(recentlyAddedLog);
+                    await Task.WhenAll(emailTasks.ToArray());
                 }
-
-                foreach (var p in embyEpisodesToSend)
-                {
-                    recentlyAddedLog.Add(new RecentlyAddedLog
-                    {
-                        AddedAt = DateTime.Now,
-                        Type = RecentlyAddedType.Emby,
-                        ContentType = ContentType.Episode,
-                        ContentId = p.Id
-                    });
-                }
-                await _recentlyAddedLog.AddRange(recentlyAddedLog);
-
-                await Task.WhenAll(emailTasks.ToArray());
-            }
-            else
-            {
-                var admins = await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin);
-                foreach (var a in admins)
+                else
                 {
-                    if (a.Email.IsNullOrEmpty())
+                    var admins = await _userManager.GetUsersInRoleAsync(OmbiRoles.Admin);
+                    foreach (var a in admins)
                     {
-                        continue;
-                    }
-                    var messageContent = ParseTemplate(template, customization, a);
+                        if (a.Email.IsNullOrEmpty())
+                        {
+                            continue;
+                        }
+                        var messageContent = ParseTemplate(template, customization, a);
 
-                    var email = new NewsletterTemplate();
+                        var email = new NewsletterTemplate();
 
-                    var html = email.LoadTemplate(messageContent.Subject, messageContent.Message, body, customization.Logo);
+                        var html = email.LoadTemplate(messageContent.Subject, messageContent.Message, body, customization.Logo);
 
-                    await _email.Send(
-                        new NotificationMessage { Message = html, Subject = messageContent.Subject, To = a.Email },
-                        emailSettings);
+                        await _email.Send(
+                            new NotificationMessage { Message = html, Subject = messageContent.Subject, To = a.Email },
+                            emailSettings);
+                    }
                 }
+
+            }
+            catch (Exception e)
+            {
+                _log.LogError(e, "Error when attempting to create newsletter");
+                throw;
             }
         }
 
@@ -229,6 +254,40 @@ namespace Ombi.Schedule.Jobs.Ombi
             await Start(newsletterSettings, false);
         }
 
+        private HashSet<PlexEpisode> FilterPlexEpisodes(IEnumerable<PlexEpisode> source, IQueryable<RecentlyAddedLog> recentlyAdded)
+        {
+            var itemsToReturn = new HashSet<PlexEpisode>();
+            foreach (var ep in source)
+            {
+                var tvDbId = StringHelper.IntParseLinq(ep.Series.TvDbId);
+                if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber))
+                {
+                    continue;
+                }
+
+                itemsToReturn.Add(ep);
+            }
+
+            return itemsToReturn;
+        }
+
+        private HashSet<EmbyEpisode> FilterEmbyEpisodes(IEnumerable<EmbyEpisode> source, IQueryable<RecentlyAddedLog> recentlyAdded)
+        {
+            var itemsToReturn = new HashSet<EmbyEpisode>();
+            foreach (var ep in source)
+            {
+                var tvDbId = StringHelper.IntParseLinq(ep.Series.TvDbId);
+                if (recentlyAdded.Any(x => x.ContentId == tvDbId && x.EpisodeNumber == ep.EpisodeNumber && x.SeasonNumber == ep.SeasonNumber))
+                {
+                    continue;
+                }
+
+                itemsToReturn.Add(ep);
+            }
+
+            return itemsToReturn;
+        }
+
         private NotificationMessageContent ParseTemplate(NotificationTemplates template, CustomizationSettings settings, OmbiUser username)
         {
             var resolver = new NotificationMessageResolver();
@@ -239,7 +298,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             return resolver.ParseMessage(template, curlys);
         }
 
-        private async Task<string> BuildHtml(IQueryable<PlexServerContent> plexContentToSend, IQueryable<EmbyContent> embyContentToSend, IQueryable<PlexEpisode> plexEpisodes, IQueryable<EmbyEpisode> embyEp, NewsletterSettings settings)
+        private async Task<string> BuildHtml(IQueryable<PlexServerContent> plexContentToSend, IQueryable<EmbyContent> embyContentToSend, HashSet<PlexEpisode> plexEpisodes, HashSet<EmbyEpisode> embyEp, NewsletterSettings settings)
         {
             var sb = new StringBuilder();
 
@@ -285,8 +344,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
                 catch (Exception e)
                 {
-                    Console.WriteLine(e);
-                    throw;
+                    _log.LogError(e, "Error when Processing Plex Movies {0}", info.Title);
                 }
                 finally
                 {
@@ -316,7 +374,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                     theMovieDbId = result.id.ToString();
                 }
 
-                var info = await _movieApi.GetMovieInformationWithExtraInfo(int.Parse(theMovieDbId));
+                var info = await _movieApi.GetMovieInformationWithExtraInfo(StringHelper.IntParseLinq(theMovieDbId));
                 if (info == null)
                 {
                     continue;
@@ -327,8 +385,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
                 catch (Exception e)
                 {
-                    Console.WriteLine(e);
-                    throw;
+                    _log.LogError(e, "Error when processing Emby Movies {0}", info.Title);
                 }
                 finally
                 {
@@ -366,7 +423,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             AddParagraph(sb, info.Overview);
         }
 
-        private async Task ProcessPlexTv(IQueryable<PlexEpisode> plexContent, StringBuilder sb)
+        private async Task ProcessPlexTv(HashSet<PlexEpisode> plexContent, StringBuilder sb)
         {
             var series = new List<PlexServerContent>();
             foreach (var plexEpisode in plexContent)
@@ -483,7 +540,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
                 catch (Exception e)
                 {
-                    //Log.Error(e);
+                    _log.LogError(e, "Error when processing Plex TV {0}", t.Title);
                 }
                 finally
                 {
@@ -494,7 +551,7 @@ namespace Ombi.Schedule.Jobs.Ombi
 
         }
 
-        private async Task ProcessEmbyTv(IQueryable<EmbyEpisode> embyContent, StringBuilder sb)
+        private async Task ProcessEmbyTv(HashSet<EmbyEpisode> embyContent, StringBuilder sb)
         {
             var series = new List<EmbyContent>();
             foreach (var episode in embyContent)
@@ -584,7 +641,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 }
                 catch (Exception e)
                 {
-                    //Log.Error(e);
+                    _log.LogError(e, "Error when processing Emby TV {0}", t.Title);
                 }
                 finally
                 {

src/Ombi.Schedule/Jobs/Plex/Interfaces/IPlexRecentlyAddedSync.cs

@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Ombi.Schedule.Jobs.Plex
-{
-    public interface IPlexRecentlyAddedSync : IBaseJob
-    {
-        Task Start();
-    }
-}

src/Ombi.Schedule/Jobs/Plex/PlexRecentlyAddedSync.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Ombi.Api.Plex;
-
-namespace Ombi.Schedule.Jobs.Plex
-{
-    public class PlexRecentlyAddedSync : IPlexRecentlyAddedSync
-    {
-        public PlexRecentlyAddedSync(IPlexContentSync contentSync)
-        {
-            _sync = contentSync;
-        }
-
-        private readonly IPlexContentSync _sync;
-
-        public async Task Start()
-        {
-            await _sync.CacheContent(true);
-        }
-
-        private bool _disposed;
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-                return;
-
-            if (disposing)
-            {
-                _sync?.Dispose();
-            }
-            _disposed = true;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}

src/Ombi.Schedule/Ombi.Schedule.csproj

@@ -10,9 +10,9 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.2" />
-    <PackageReference Include="Hangfire" Version="1.6.17" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.6.17" />
-    <PackageReference Include="Hangfire.Console" Version="1.3.7" />
+    <PackageReference Include="Hangfire" Version="1.6.19" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.6.19" />
+    <PackageReference Include="Hangfire.Console" Version="1.3.10" />
     <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
     <PackageReference Include="Hangfire.RecurringJobExtensions" Version="1.1.6" />
     <PackageReference Include="Hangfire.SQLite" Version="1.4.2" />

src/Ombi.Settings/Ombi.Settings.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Ombi.Settings/Settings/Models/AuthenticationSettings.cs

@@ -12,5 +12,6 @@ namespace Ombi.Settings.Settings.Models
         public bool RequireLowercase { get; set; }
         public bool RequireNonAlphanumeric { get; set; }
         public bool RequireUppercase { get; set; }
+        public bool EnableOAuth { get; set; } // Plex OAuth
     }
 }

src/Ombi.Settings/Settings/Models/External/PlexSettings.cs

@@ -7,7 +7,6 @@ namespace Ombi.Core.Settings.Models.External
     {
         public bool Enable { get; set; }
         public List<PlexServers> Servers { get; set; }
-
     }
 
     public class PlexServers : ExternalSettings

src/Ombi.Settings/Settings/Models/Notifications/NewsletterSettings.cs

@@ -7,6 +7,6 @@ namespace Ombi.Settings.Settings.Models.Notifications
         public bool DisableTv { get; set; }
         public bool DisableMovies { get; set; }
         public bool Enabled { get; set; }
-        public List<string> ExternalEmails { get; set; }
+        public List<string> ExternalEmails { get; set; } = new List<string>();
     }
 }

src/Ombi.Store/Context/OmbiContext.cs

@@ -123,7 +123,23 @@ namespace Ombi.Store.Context
                 {
                     NormalizedName = OmbiRoles.RecievesNewsletter.ToUpper()
                 });
+                SaveChanges();
             }
+
+            // Make sure we have the API User
+            var apiUserExists = Users.Any(x => x.UserName.Equals("Api", StringComparison.CurrentCultureIgnoreCase));
+            if (!apiUserExists)
+            {
+                Users.Add(new OmbiUser
+                {
+                    UserName = "Api",
+                    UserType = UserType.SystemUser,
+                    NormalizedUserName = "API",
+
+                });
+                SaveChanges();
+            }
+
             //Check if templates exist
             var templates = NotificationTemplates.ToList();
 

src/Ombi.Store/Entities/EmbyContent.cs

@@ -48,6 +48,7 @@ namespace Ombi.Store.Entities
         public string TheMovieDbId { get; set; }
         public string TvDbId { get; set; }
 
+        public string Url { get; set; }
 
         public ICollection<EmbyEpisode> Episodes { get; set; }
     }

src/Ombi.Store/Entities/RecentlyAddedLog.cs

@@ -8,7 +8,9 @@ namespace Ombi.Store.Entities
     {
         public RecentlyAddedType Type { get; set; }
         public ContentType ContentType { get; set; }
-        public int ContentId { get; set; } // This is dependant on the type
+        public int ContentId { get; set; } // This is dependant on the type, it's either TMDBID or TVDBID
+        public int? EpisodeNumber { get; set; }
+        public int? SeasonNumber { get; set; }
         public DateTime AddedAt { get; set; }
     }
 

src/Ombi.Store/Entities/Requests/TvRequests.cs

@@ -13,6 +13,7 @@ namespace Ombi.Store.Entities.Requests
         public string Overview { get; set; }
         public string Title { get; set; }
         public string PosterPath { get; set; }
+        public string Background { get; set; }
         public DateTime ReleaseDate { get; set; }
         public string Status { get; set; }
         /// <summary>

src/Ombi.Store/Entities/User.cs

@@ -29,6 +29,7 @@ namespace Ombi.Store.Entities
 {
     public enum UserType
     {
+        SystemUser = 0,
         LocalUser = 1,
         PlexUser = 2,
         EmbyUser = 3,

src/Ombi.Store/Migrations/20180413021646_tvrequestsbackground.Designer.cs

@@ -0,0 +1,950 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using Ombi.Helpers;
+using Ombi.Store.Context;
+using Ombi.Store.Entities;
+using Ombi.Store.Entities.Requests;
+using System;
+
+namespace Ombi.Store.Migrations
+{
+    [DbContext(typeof(OmbiContext))]
+    [Migration("20180413021646_tvrequestsbackground")]
+    partial class tvrequestsbackground
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.ApplicationConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ApplicationConfiguration");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Audit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AuditArea");
+
+                    b.Property<int>("AuditType");
+
+                    b.Property<DateTime>("DateTime");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("User");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Audit");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CouchPotatoCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("EmbyId")
+                        .IsRequired();
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.Property<int>("Type");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmbyContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("EmbyId");
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("ParentId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("EmbyEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.GlobalSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Content");
+
+                    b.Property<string>("SettingsName");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("GlobalSettings");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationTemplates", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Agent");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("Message");
+
+                    b.Property<int>("NotificationType");
+
+                    b.Property<string>("Subject");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NotificationTemplates");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("PlayerId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("Alias");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<string>("EmbyConnectUserId");
+
+                    b.Property<int?>("EpisodeRequestLimit");
+
+                    b.Property<DateTime?>("LastLoggedIn");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<int?>("MovieRequestLimit");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<string>("ProviderUserId");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserAccessToken");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.Property<int>("UserType");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<int>("GrandparentKey");
+
+                    b.Property<int>("Key");
+
+                    b.Property<int>("ParentKey");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GrandparentKey");
+
+                    b.ToTable("PlexEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("ParentKey");
+
+                    b.Property<int>("PlexContentId");
+
+                    b.Property<int?>("PlexServerContentId");
+
+                    b.Property<int>("SeasonKey");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PlexServerContentId");
+
+                    b.ToTable("PlexSeasonsContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<int>("Key");
+
+                    b.Property<string>("Quality");
+
+                    b.Property<string>("ReleaseYear");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexServerContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RadarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("HasFile");
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RadarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RecentlyAddedLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<int>("ContentId");
+
+                    b.Property<int>("ContentType");
+
+                    b.Property<int>("Type");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RecentlyAddedLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<int>("ParentRequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<int>("SeriesType");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentRequestId");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("ChildRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IssueCategory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Comment");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<int?>("IssuesId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IssuesId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("IssueComments");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("IssueCategoryId");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<int?>("RequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime?>("ResovledDate");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("Subject");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("UserReportedId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IssueCategoryId");
+
+                    b.HasIndex("IssueId");
+
+                    b.HasIndex("UserReportedId");
+
+                    b.ToTable("Issues");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("Background");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<DateTime?>("DigitalReleaseDate");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<string>("Overview");
+
+                    b.Property<string>("PosterPath");
+
+                    b.Property<int>("QualityOverride");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<int>("RootPathOverride");
+
+                    b.Property<string>("Status");
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("MovieRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeCount");
+
+                    b.Property<DateTime>("RequestDate");
+
+                    b.Property<int>("RequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Background");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("Overview");
+
+                    b.Property<string>("PosterPath");
+
+                    b.Property<int?>("QualityOverride");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int?>("RootFolder");
+
+                    b.Property<string>("Status");
+
+                    b.Property<string>("Title");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TvRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<bool>("HasFile");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Token");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Tokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AirDate");
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<bool>("Requested");
+
+                    b.Property<int>("SeasonId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SeasonId");
+
+                    b.ToTable("EpisodeRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("ChildRequestId");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChildRequestId");
+
+                    b.ToTable("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.EmbyContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("EmbyId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("NotificationUserIds")
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("GrandparentKey")
+                        .HasPrincipalKey("Key")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent")
+                        .WithMany("Seasons")
+                        .HasForeignKey("PlexServerContentId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.TvRequests", "ParentRequest")
+                        .WithMany("ChildRequests")
+                        .HasForeignKey("ParentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.Issues", "Issues")
+                        .WithMany("Comments")
+                        .HasForeignKey("IssuesId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.IssueCategory", "IssueCategory")
+                        .WithMany()
+                        .HasForeignKey("IssueCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests")
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.Requests.MovieRequests")
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "UserReported")
+                        .WithMany()
+                        .HasForeignKey("UserReportedId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Repository.Requests.SeasonRequests", "Season")
+                        .WithMany("Episodes")
+                        .HasForeignKey("SeasonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", "ChildRequest")
+                        .WithMany("SeasonRequests")
+                        .HasForeignKey("ChildRequestId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/20180413021646_tvrequestsbackground.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace Ombi.Store.Migrations
+{
+    public partial class tvrequestsbackground : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Background",
+                table: "TvRequests",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Background",
+                table: "TvRequests");
+        }
+    }
+}

src/Ombi.Store/Migrations/20180419054711_EmbyButton.Designer.cs

@@ -0,0 +1,950 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using Ombi.Helpers;
+using Ombi.Store.Context;
+using Ombi.Store.Entities;
+using Ombi.Store.Entities.Requests;
+using System;
+
+namespace Ombi.Store.Migrations
+{
+    [DbContext(typeof(OmbiContext))]
+    [Migration("20180419054711_EmbyButton")]
+    partial class EmbyButton
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.ApplicationConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ApplicationConfiguration");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Audit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AuditArea");
+
+                    b.Property<int>("AuditType");
+
+                    b.Property<DateTime>("DateTime");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("User");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Audit");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CouchPotatoCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("EmbyId")
+                        .IsRequired();
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmbyContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("EmbyId");
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("ParentId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("EmbyEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.GlobalSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Content");
+
+                    b.Property<string>("SettingsName");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("GlobalSettings");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationTemplates", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Agent");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("Message");
+
+                    b.Property<int>("NotificationType");
+
+                    b.Property<string>("Subject");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NotificationTemplates");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("PlayerId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("Alias");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<string>("EmbyConnectUserId");
+
+                    b.Property<int?>("EpisodeRequestLimit");
+
+                    b.Property<DateTime?>("LastLoggedIn");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<int?>("MovieRequestLimit");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<string>("ProviderUserId");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserAccessToken");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.Property<int>("UserType");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<int>("GrandparentKey");
+
+                    b.Property<int>("Key");
+
+                    b.Property<int>("ParentKey");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GrandparentKey");
+
+                    b.ToTable("PlexEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("ParentKey");
+
+                    b.Property<int>("PlexContentId");
+
+                    b.Property<int?>("PlexServerContentId");
+
+                    b.Property<int>("SeasonKey");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PlexServerContentId");
+
+                    b.ToTable("PlexSeasonsContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<int>("Key");
+
+                    b.Property<string>("Quality");
+
+                    b.Property<string>("ReleaseYear");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexServerContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RadarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("HasFile");
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RadarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RecentlyAddedLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<int>("ContentId");
+
+                    b.Property<int>("ContentType");
+
+                    b.Property<int>("Type");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RecentlyAddedLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<int>("ParentRequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<int>("SeriesType");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentRequestId");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("ChildRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IssueCategory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Comment");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<int?>("IssuesId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IssuesId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("IssueComments");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("IssueCategoryId");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<int?>("RequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime?>("ResovledDate");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("Subject");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("UserReportedId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IssueCategoryId");
+
+                    b.HasIndex("IssueId");
+
+                    b.HasIndex("UserReportedId");
+
+                    b.ToTable("Issues");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("Background");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<DateTime?>("DigitalReleaseDate");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<string>("Overview");
+
+                    b.Property<string>("PosterPath");
+
+                    b.Property<int>("QualityOverride");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<int>("RootPathOverride");
+
+                    b.Property<string>("Status");
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("MovieRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeCount");
+
+                    b.Property<DateTime>("RequestDate");
+
+                    b.Property<int>("RequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("Overview");
+
+                    b.Property<string>("PosterPath");
+
+                    b.Property<int?>("QualityOverride");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int?>("RootFolder");
+
+                    b.Property<string>("Status");
+
+                    b.Property<string>("Title");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TvRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<bool>("HasFile");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Token");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Tokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AirDate");
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<bool>("Requested");
+
+                    b.Property<int>("SeasonId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SeasonId");
+
+                    b.ToTable("EpisodeRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("ChildRequestId");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChildRequestId");
+
+                    b.ToTable("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.EmbyContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("EmbyId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("NotificationUserIds")
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("GrandparentKey")
+                        .HasPrincipalKey("Key")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent")
+                        .WithMany("Seasons")
+                        .HasForeignKey("PlexServerContentId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.TvRequests", "ParentRequest")
+                        .WithMany("ChildRequests")
+                        .HasForeignKey("ParentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.Issues", "Issues")
+                        .WithMany("Comments")
+                        .HasForeignKey("IssuesId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.IssueCategory", "IssueCategory")
+                        .WithMany()
+                        .HasForeignKey("IssueCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests")
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.Requests.MovieRequests")
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "UserReported")
+                        .WithMany()
+                        .HasForeignKey("UserReportedId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Repository.Requests.SeasonRequests", "Season")
+                        .WithMany("Episodes")
+                        .HasForeignKey("SeasonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", "ChildRequest")
+                        .WithMany("SeasonRequests")
+                        .HasForeignKey("ChildRequestId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/20180419054711_EmbyButton.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace Ombi.Store.Migrations
+{
+    public partial class EmbyButton : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Url",
+                table: "EmbyContent",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Url",
+                table: "EmbyContent");
+        }
+    }
+}

src/Ombi.Store/Migrations/20180420225638_NewsletterChanges.Designer.cs

@@ -0,0 +1,956 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
+using Ombi.Helpers;
+using Ombi.Store.Context;
+using Ombi.Store.Entities;
+using Ombi.Store.Entities.Requests;
+using System;
+
+namespace Ombi.Store.Migrations
+{
+    [DbContext(typeof(OmbiContext))]
+    [Migration("20180420225638_NewsletterChanges")]
+    partial class NewsletterChanges
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("ClaimType");
+
+                    b.Property<string>("ClaimValue");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("ProviderKey");
+
+                    b.Property<string>("ProviderDisplayName");
+
+                    b.Property<string>("UserId")
+                        .IsRequired();
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("RoleId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId");
+
+                    b.Property<string>("LoginProvider");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.ApplicationConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ApplicationConfiguration");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Audit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AuditArea");
+
+                    b.Property<int>("AuditType");
+
+                    b.Property<DateTime>("DateTime");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("User");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Audit");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.CouchPotatoCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CouchPotatoCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("EmbyId")
+                        .IsRequired();
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmbyContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("EmbyId");
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("ParentId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("EmbyEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.GlobalSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Content");
+
+                    b.Property<string>("SettingsName");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("GlobalSettings");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationTemplates", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Agent");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("Message");
+
+                    b.Property<int>("NotificationType");
+
+                    b.Property<string>("Subject");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NotificationTemplates");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("PlayerId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("AccessFailedCount");
+
+                    b.Property<string>("Alias");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken();
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed");
+
+                    b.Property<string>("EmbyConnectUserId");
+
+                    b.Property<int?>("EpisodeRequestLimit");
+
+                    b.Property<DateTime?>("LastLoggedIn");
+
+                    b.Property<bool>("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd");
+
+                    b.Property<int?>("MovieRequestLimit");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash");
+
+                    b.Property<string>("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed");
+
+                    b.Property<string>("ProviderUserId");
+
+                    b.Property<string>("SecurityStamp");
+
+                    b.Property<bool>("TwoFactorEnabled");
+
+                    b.Property<string>("UserAccessToken");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256);
+
+                    b.Property<int>("UserType");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<int>("GrandparentKey");
+
+                    b.Property<int>("Key");
+
+                    b.Property<int>("ParentKey");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GrandparentKey");
+
+                    b.ToTable("PlexEpisode");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("ParentKey");
+
+                    b.Property<int>("PlexContentId");
+
+                    b.Property<int?>("PlexServerContentId");
+
+                    b.Property<int>("SeasonKey");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PlexServerContentId");
+
+                    b.ToTable("PlexSeasonsContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexServerContent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<int>("Key");
+
+                    b.Property<string>("Quality");
+
+                    b.Property<string>("ReleaseYear");
+
+                    b.Property<string>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TvDbId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PlexServerContent");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RadarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("HasFile");
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RadarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RecentlyAddedLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AddedAt");
+
+                    b.Property<int>("ContentId");
+
+                    b.Property<int>("ContentType");
+
+                    b.Property<int?>("EpisodeNumber");
+
+                    b.Property<int?>("SeasonNumber");
+
+                    b.Property<int>("Type");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RecentlyAddedLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<int>("ParentRequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<int>("SeriesType");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentRequestId");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("ChildRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IssueCategory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Comment");
+
+                    b.Property<DateTime>("Date");
+
+                    b.Property<int?>("IssuesId");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IssuesId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("IssueComments");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Description");
+
+                    b.Property<int>("IssueCategoryId");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<string>("ProviderId");
+
+                    b.Property<int?>("RequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime?>("ResovledDate");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("Subject");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("UserReportedId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IssueCategoryId");
+
+                    b.HasIndex("IssueId");
+
+                    b.HasIndex("UserReportedId");
+
+                    b.ToTable("Issues");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("Background");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<DateTime?>("DigitalReleaseDate");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<int?>("IssueId");
+
+                    b.Property<string>("Overview");
+
+                    b.Property<string>("PosterPath");
+
+                    b.Property<int>("QualityOverride");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<int>("RootPathOverride");
+
+                    b.Property<string>("Status");
+
+                    b.Property<int>("TheMovieDbId");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("MovieRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeCount");
+
+                    b.Property<DateTime>("RequestDate");
+
+                    b.Property<int>("RequestId");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Background");
+
+                    b.Property<string>("ImdbId");
+
+                    b.Property<string>("Overview");
+
+                    b.Property<string>("PosterPath");
+
+                    b.Property<int?>("QualityOverride");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int?>("RootFolder");
+
+                    b.Property<string>("Status");
+
+                    b.Property<string>("Title");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TvRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SickRageEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SickRageEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.SonarrEpisodeCache", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<bool>("HasFile");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.Property<int>("TvDbId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SonarrEpisodeCache");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Token");
+
+                    b.Property<string>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Tokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("AirDate");
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<int>("EpisodeNumber");
+
+                    b.Property<bool>("Requested");
+
+                    b.Property<int>("SeasonId");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("Url");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SeasonId");
+
+                    b.ToTable("EpisodeRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("ChildRequestId");
+
+                    b.Property<int>("SeasonNumber");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChildRequestId");
+
+                    b.ToTable("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.EmbyEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.EmbyContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("ParentId")
+                        .HasPrincipalKey("EmbyId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("NotificationUserIds")
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexEpisode", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent", "Series")
+                        .WithMany("Episodes")
+                        .HasForeignKey("GrandparentKey")
+                        .HasPrincipalKey("Key")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.PlexSeasonsContent", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.PlexServerContent")
+                        .WithMany("Seasons")
+                        .HasForeignKey("PlexServerContentId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.TvRequests", "ParentRequest")
+                        .WithMany("ChildRequests")
+                        .HasForeignKey("ParentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.Issues", "Issues")
+                        .WithMany("Comments")
+                        .HasForeignKey("IssuesId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.IssueCategory", "IssueCategory")
+                        .WithMany()
+                        .HasForeignKey("IssueCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests")
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.Requests.MovieRequests")
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "UserReported")
+                        .WithMany()
+                        .HasForeignKey("UserReportedId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Repository.Requests.SeasonRequests", "Season")
+                        .WithMany("Episodes")
+                        .HasForeignKey("SeasonId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", "ChildRequest")
+                        .WithMany("SeasonRequests")
+                        .HasForeignKey("ChildRequestId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Ombi.Store/Migrations/20180420225638_NewsletterChanges.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.Collections.Generic;
+
+namespace Ombi.Store.Migrations
+{
+    public partial class NewsletterChanges : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "EpisodeNumber",
+                table: "RecentlyAddedLog",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "SeasonNumber",
+                table: "RecentlyAddedLog",
+                nullable: true);
+
+            migrationBuilder.Sql("DELETE FROM RecentlyAddedLog");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EpisodeNumber",
+                table: "RecentlyAddedLog");
+
+            migrationBuilder.DropColumn(
+                name: "SeasonNumber",
+                table: "RecentlyAddedLog");
+        }
+    }
+}

src/Ombi.Store/Migrations/OmbiContextModelSnapshot.cs

@@ -197,6 +197,8 @@ namespace Ombi.Store.Migrations
 
                     b.Property<int>("Type");
 
+                    b.Property<string>("Url");
+
                     b.HasKey("Id");
 
                     b.ToTable("EmbyContent");
@@ -453,6 +455,10 @@ namespace Ombi.Store.Migrations
 
                     b.Property<int>("ContentType");
 
+                    b.Property<int?>("EpisodeNumber");
+
+                    b.Property<int?>("SeasonNumber");
+
                     b.Property<int>("Type");
 
                     b.HasKey("Id");
@@ -645,6 +651,8 @@ namespace Ombi.Store.Migrations
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd();
 
+                    b.Property<string>("Background");
+
                     b.Property<string>("ImdbId");
 
                     b.Property<string>("Overview");

src/Ombi.Store/Ombi.Store.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.9" />
   </ItemGroup>
   <ItemGroup>

src/Ombi.Store/Repository/SettingsJsonRepository.cs

@@ -81,6 +81,7 @@ namespace Ombi.Store.Repository
 
         public void Update(GlobalSettings entity)
         {
+            Db.Update(entity);
             //_cache.Remove(GetName(entity.SettingsName));
             Db.SaveChanges();
         }

src/Ombi.TheMovieDbApi/IMovieDbApi.cs

@@ -12,6 +12,7 @@ namespace Ombi.Api.TheMovieDb
         Task<List<MovieSearchResult>> NowPlaying();
         Task<List<MovieSearchResult>> PopularMovies();
         Task<List<MovieSearchResult>> SearchMovie(string searchTerm);
+        Task<List<TvSearchResult>> SearchTv(string searchTerm);
         Task<List<MovieSearchResult>> TopRated();
         Task<List<MovieSearchResult>> Upcoming();
         Task<List<MovieSearchResult>> SimilarMovies(int movieId);

src/Ombi.TheMovieDbApi/Models/SearchResult.cs

@@ -32,9 +32,12 @@ namespace Ombi.TheMovieDbApi.Models
         public bool adult { get; set; }
         public string overview { get; set; }
         public string release_date { get; set; }
+        public string first_air_date { get; set; }
         public int?[] genre_ids { get; set; }
         public int id { get; set; }
         public string original_title { get; set; }
+        public string original_name { get; set; }
+        public string name { get; set; }
         public string original_language { get; set; }
         public string title { get; set; }
         public string backdrop_path { get; set; }

src/Ombi.TheMovieDbApi/Models/TvSearchResult.cs

@@ -0,0 +1,18 @@
+namespace Ombi.Api.TheMovieDb.Models
+{
+    public class TvSearchResult
+    {
+        public string PosterPath { get; set; }
+        public string Overview { get; set; }
+        public string ReleaseDate { get; set; }
+        public int?[] GenreIds { get; set; }
+        public int Id { get; set; }
+        public string OriginalName { get; set; }
+        public string OriginalLanguage { get; set; }
+        public string Name { get; set; }
+        public string BackdropPath { get; set; }
+        public float Popularity { get; set; }
+        public int VoteCount { get; set; }
+        public float VoteAverage { get; set; }
+    }
+}

src/Ombi.TheMovieDbApi/TheMovieDbApi.cs

@@ -43,6 +43,17 @@ namespace Ombi.Api.TheMovieDb
             return await Api.Request<FindResult>(request);
         }
 
+        public async Task<List<TvSearchResult>> SearchTv(string searchTerm)
+        {
+            var request = new Request($"search/tv", BaseUri, HttpMethod.Get);
+            request.FullUri = request.FullUri.AddQueryParameter("api_key", ApiToken);
+            request.FullUri = request.FullUri.AddQueryParameter("query", searchTerm);
+            AddRetry(request);
+
+            var result = await Api.Request<TheMovieDbContainer<SearchResult>>(request);
+            return Mapper.Map<List<TvSearchResult>>(result.results);
+        }
+
         public async Task<TvExternals> GetTvExternals(int theMovieDbId)
         {
             var request = new Request($"/tv/{theMovieDbId}/external_ids", BaseUri, HttpMethod.Get);

src/Ombi/ClientApp/app/app.module.ts

@@ -24,6 +24,7 @@ import { CookieComponent } from "./auth/cookie.component";
 import { PageNotFoundComponent } from "./errors/not-found.component";
 import { LandingPageComponent } from "./landingpage/landingpage.component";
 import { LoginComponent } from "./login/login.component";
+import { LoginOAuthComponent } from "./login/loginoauth.component";
 import { ResetPasswordComponent } from "./login/resetpassword.component";
 import { TokenResetPasswordComponent } from "./login/tokenresetpassword.component";
 
@@ -41,6 +42,7 @@ const routes: Routes = [
     { path: "*", component: PageNotFoundComponent },
     { path: "", redirectTo: "/search", pathMatch: "full" },
     { path: "login", component: LoginComponent },
+    { path: "Login/OAuth/:pin", component: LoginOAuthComponent },
     { path: "login/:landing", component: LoginComponent },
     { path: "reset", component: ResetPasswordComponent },
     { path: "token", component: TokenResetPasswordComponent },
@@ -116,6 +118,7 @@ export function HttpLoaderFactory(http: HttpClient, platformLocation: PlatformLo
         ResetPasswordComponent,
         TokenResetPasswordComponent,
         CookieComponent,
+        LoginOAuthComponent,
         ],
     providers: [
         NotificationService,

src/Ombi/ClientApp/app/auth/IUserLogin.ts

@@ -2,6 +2,7 @@
     username: string;
     password: string;
     rememberMe: boolean;
+    usePlexOAuth: boolean;
 }
 
 export interface ILocalUser {

src/Ombi/ClientApp/app/auth/auth.service.ts

@@ -18,6 +18,10 @@ export class AuthService extends ServiceHelpers {
         return this.http.post(`${this.url}/`, JSON.stringify(login), {headers: this.headers});
     }
 
+    public oAuth(pin: number): Observable<any> {
+        return this.http.get<any>(`${this.url}/${pin}`, {headers: this.headers});
+    }
+
     public requiresPassword(login: IUserLogin): Observable<boolean> {
         return this.http.post<boolean>(`${this.url}/requirePassword`, JSON.stringify(login), {headers: this.headers});
     }

src/Ombi/ClientApp/app/interfaces/IPlex.ts

@@ -2,6 +2,10 @@
     user: IPlexUser;
 }
 
+export interface IPlexOAuthAccessToken {
+    accessToken: string;
+}
+
 export interface IPlexUser {
     email: string;
     uuid: string;

src/Ombi/ClientApp/app/interfaces/ISearchMovieResult.ts

@@ -21,6 +21,7 @@
     requested: boolean;
     available: boolean;
     plexUrl: string;
+    embyUrl: string;
     quality: string;
     digitalReleaseDate: Date;
 

src/Ombi/ClientApp/app/interfaces/ISearchTvResult.ts

@@ -27,6 +27,7 @@ export interface ISearchTvResult {
     requested: boolean;
     available: boolean;
     plexUrl: string;
+    embyUrl: string;
     firstSeason: boolean;
     latestSeason: boolean;
 }

src/Ombi/ClientApp/app/interfaces/ISettings.ts

@@ -145,6 +145,7 @@ export interface IAuthenticationSettings extends ISettings {
   requiredLowercase: boolean;
   requireNonAlphanumeric: boolean;
   requireUppercase: boolean;
+  enableOAuth: boolean;
 }
 
 export interface IUserManagementSettings extends ISettings {

src/Ombi/ClientApp/app/issues/issueDetails.component.html

@@ -1,5 +1,5 @@
 <div *ngIf="issue">
-    <div class="row">
+    <div class="row issue-details">
         <div class="myBg backdrop" [style.background-image]="backgroundPath"></div>
         <div class="tint" style="background-image: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%);"></div>
         <h1>{{issue.title}} </h1>

src/Ombi/ClientApp/app/issues/issueDetails.component.ts

@@ -98,7 +98,11 @@ export class IssueDetailsComponent implements OnInit {
                     ("url(" + x + ")");
             });
             this.imageService.getMoviePoster(issue.providerId).subscribe(x => {
-                this.posterPath = x.toString();
+                if (x.length === 0) {
+                    this.posterPath = "../../../images/default_movie_poster.png";
+                } else {
+                    this.posterPath = x.toString();
+                }
             });
 
         } else {
@@ -107,7 +111,11 @@ export class IssueDetailsComponent implements OnInit {
                     ("url(" + x + ")");
             });
             this.imageService.getTvPoster(Number(issue.providerId)).subscribe(x => {
-                this.posterPath = x.toString();
+                if (x.length === 0) {
+                    this.posterPath = "../../../images/default_tv_poster.png";
+                } else {
+                    this.posterPath = x.toString();
+                }
             });
         }
 

src/Ombi/ClientApp/app/issues/issuestable.component.html

@@ -1,25 +1,25 @@
 <table class="table table-striped table-hover table-responsive table-condensed">
         <thead>
             <tr>
-                <th (click)="setOrder('title')">
+                <th (click)="setOrder('title', $event)">
                     <a [translate]="'Issues.ColumnTitle'"></a>
                     <span *ngIf="order === 'title'">
                         <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
                     </span>
                 </th>
-                <th (click)="setOrder('issueCategory.value')">
+                <th (click)="setOrder('issueCategory.value', $event)">
                     <a [translate]="'Issues.Category'"></a>
                     <span *ngIf="order === 'issueCategory.value'">
                             <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
                     </span>
                 </th>
-                <th (click)="setOrder('status')">
+                <th (click)="setOrder('status', $event)">
                     <a [translate]="'Issues.Status'"></a>
                     <span *ngIf="order === 'status'">
                             <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
                     </span>
                 </th>
-                <th (click)="setOrder('reportedUser')">
+                <th (click)="setOrder('reportedUser', $event)">
                     <a [translate]="'Issues.ReportedBy'"></a>
                     <span *ngIf="order === 'reportedUser'">
                             <span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>

src/Ombi/ClientApp/app/issues/issuestable.component.ts

@@ -20,9 +20,23 @@ export class IssuesTableComponent  {
 
     public rowCount = 10;
 
-    public setOrder(value: string) {
+    public setOrder(value: string, el: any) {
+        el = el.toElement || el.relatedTarget || el.target || el.srcElement;
+
+        if (el.nodeName === "A") {
+            el = el.parentElement;
+        }
+
+        const parent = el.parentElement;
+        const previousFilter = parent.querySelector(".active");
+
         if (this.order === value) {
-          this.reverse = !this.reverse;
+            this.reverse = !this.reverse;
+        } else {
+            if (previousFilter) {
+                previousFilter.className = "";
+            }
+            el.className = "active";
         }
 
         this.order = value;

src/Ombi/ClientApp/app/login/login.component.html

@@ -7,29 +7,53 @@ include the remember me checkbox
     <div *ngIf="background" @fadeInOut class="bg" [style.background-image]="background"></div>
     <div class="container" id="login">
         <div class="card card-container">
+
             <!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> -->
-            <div *ngIf="!customizationSettings.logo"><img id="profile-img" class="profile-img-card" src="{{baseUrl}}/images/logo.png"/></div>
-            <div *ngIf="customizationSettings.logo"><img id="profile-img" class="center" [src]="customizationSettings.logo" /></div>
+            <div *ngIf="!customizationSettings.logo">
+                <img id="profile-img" class="profile-img-card" src="{{baseUrl}}/images/logo.png" />
+            </div>
+            <div *ngIf="customizationSettings.logo">
+                <img id="profile-img" class="center" [src]="customizationSettings.logo" />
+            </div>
             <p id="profile-name" class="profile-name-card"></p>
 
-            <form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
+            <div *ngIf="!authenticationSettings.enableOAuth || loginWithOmbi">
+                <form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
 
 
-                <input type="email" id="inputEmail" class="form-control" formControlName="username" [attr.placeholder]="'Login.UsernamePlaceholder' | translate" autofocus>
-                <input *ngIf="!authenticationSettings.allowNoPassword" type="password" id="inputPassword" class="form-control" formControlName="password" [attr.placeholder]="'Login.PasswordPlaceholder' | translate">
-                <div class="form-group">
-                    <div class="checkbox">
-                        <input type="checkbox" id="RememberMe" formControlName="rememberMe" >
+                    <input type="email" id="inputEmail" class="form-control" formControlName="username" [attr.placeholder]="'Login.UsernamePlaceholder' | translate"
+                        autofocus>
+                    <input *ngIf="!authenticationSettings.allowNoPassword" type="password" id="inputPassword" class="form-control" formControlName="password"
+                        [attr.placeholder]="'Login.PasswordPlaceholder' | translate">
+                    <div class="form-group">
+                        <div class="checkbox">
+                            <input type="checkbox" id="RememberMe" formControlName="rememberMe">
 
-                        <label for="RememberMe" [translate]="'Login.RememberMe'"></label>
+                            <label for="RememberMe" [translate]="'Login.RememberMe'"></label>
 
+                        </div>
                     </div>
-                </div>
-                <button class="btn btn-success" type="submit" [translate]="'Login.SignInButton'"></button>
-            </form><!-- /form -->
-            <a [routerLink]="['/reset']" class="forgot-password col-md-12">
-                <b [translate]="'Login.ForgottenPassword'"></b>
-            </a>
-        </div><!-- /card-container -->
-    </div><!-- /container -->
+                    <button class="btn btn-success" type="submit" [translate]="'Login.SignInButton'"></button>
+                    <a [routerLink]="['/reset']" class="forgot-password col-md-12">
+                        <b [translate]="'Login.ForgottenPassword'"></b>
+                    </a>
+                </form>
+                <!-- /form -->
+            </div>
+            <!-- Main OAuth Flow -->
+            <div *ngIf="authenticationSettings.enableOAuth && !loginWithOmbi">
+            <div class="form-signin">
+                <button class="btn btn-success" type="button" (click)="loginWithOmbi = true">
+                    Sign In With {{appName}}</button>
+            </div>
+            <div class="form-signin">
+                <button class="btn btn-primary" type="button" (click)="oauth()">
+                    Sign In With Plex</button>
+            </div>
+        </div>
+
+        </div>
+        <!-- /card-container -->
+    </div>
+    <!-- /container -->
 </div>

src/Ombi/ClientApp/app/login/login.component.ts

@@ -25,9 +25,20 @@ export class LoginComponent implements OnDestroy, OnInit {
     public form: FormGroup;
     public customizationSettings: ICustomizationSettings;
     public authenticationSettings: IAuthenticationSettings;
+    public plexEnabled: boolean;
     public background: any;
     public landingFlag: boolean;
     public baseUrl: string;
+    public loginWithOmbi: boolean;
+   
+    public get appName(): string {
+        if(this.customizationSettings.applicationName) {
+            return this.customizationSettings.applicationName;
+        } else {
+            return "Ombi";
+        }
+    }
+
     private timer: any;
     
     private errorBody: string;
@@ -90,7 +101,7 @@ export class LoginComponent implements OnDestroy, OnInit {
             return;
         }
         const value = form.value;
-        const user = { password: value.password, username: value.username, rememberMe:value.rememberMe };
+        const user = { password: value.password, username: value.username, rememberMe: value.rememberMe, usePlexOAuth: false };
         this.authService.requiresPassword(user).subscribe(x => {
             if(x && this.authenticationSettings.allowNoPassword) {
                 // Looks like this user requires a password
@@ -111,6 +122,18 @@ export class LoginComponent implements OnDestroy, OnInit {
         });
     }
 
+    public oauth() {
+        this.authService.login({usePlexOAuth: true, password:"",rememberMe:true,username:""}).subscribe(x => {
+            if (window.frameElement) {
+                // in frame
+                window.open(x.url, "_blank");
+              } else {
+                // not in frame
+                window.location.href = x.url;
+              }
+        });
+    }
+
     public ngOnDestroy() {
         clearInterval(this.timer);
     }
@@ -124,5 +147,4 @@ export class LoginComponent implements OnDestroy, OnInit {
                     .bypassSecurityTrustStyle("linear-gradient(-10deg, transparent 20%, rgba(0,0,0,0.7) 20.0%, rgba(0,0,0,0.7) 80.0%, transparent 80%), url(" + x.url + ")");
             });
     }
-
 }

src/Ombi/ClientApp/app/login/loginoauth.component.html

@@ -0,0 +1,16 @@
+
+<div >
+
+   <div class="container" id="login">
+        <div class="card card-container">
+          <label>Please Wait...</label>
+
+          <div *ngIf="error">
+            <label>{{error}}</label>
+            
+            <a [routerLink]="['/login']">
+               Back </a>
+          </div>
+        </div><!-- /card-container -->
+    </div><!-- /container -->
+</div>

src/Ombi/ClientApp/app/login/loginoauth.component.ts

@@ -0,0 +1,47 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+
+import { AuthService } from "../auth/auth.service";
+import { NotificationService } from "../services";
+
+@Component({
+    templateUrl: "./loginoauth.component.html",
+})
+export class LoginOAuthComponent implements OnInit {
+    public pin: number;
+    public error: string;
+
+    constructor(private authService: AuthService, private router: Router,
+                private route: ActivatedRoute, private notify: NotificationService) {
+        this.route.params
+            .subscribe((params: any) => {
+                this.pin = params.pin;
+                
+            });
+    }
+
+    public ngOnInit(): void {
+        this.auth();
+    }
+
+    public auth() {
+      this.authService.oAuth(this.pin).subscribe(x => {
+          if(x.access_token) {
+            localStorage.setItem("id_token", x.access_token);
+
+            if (this.authService.loggedIn()) {
+                this.router.navigate(["search"]);
+                return;
+            } 
+        }
+          if(x.errorMessage) {
+            this.error = x.errorMessage;
+        }
+
+        }, err => {
+            this.notify.error(err.statusText);
+            
+            this.router.navigate(["login"]);
+        });
+    }
+}

src/Ombi/ClientApp/app/requests/movierequests.component.html

@@ -56,7 +56,7 @@
 <br />
 
 
-<div infinite-scroll [infiniteScrollDistance]="1" [infiniteScrollThrottle]="100" (scrolled)="loadMore()">
+<div>
 
 
     <div *ngFor="let request of movieRequests | orderBy: order : reverse : 'case-insensitive'">
@@ -67,7 +67,7 @@
             <div class="tint" style="background-image: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%);"></div>
             <div class="col-sm-2 small-padding">
 
-                <img class="img-responsive poster" src="https://image.tmdb.org/t/p/w300/{{request.posterPath}}" alt="poster">
+                <img class="img-responsive poster" src="{{request.posterPath}}" alt="poster">
 
             </div>
 
@@ -212,6 +212,8 @@
 
 
     </div>
+    
+    <p-paginator [rows]="10" [totalRecords]="totalMovies" (onPageChange)="paginate($event)"></p-paginator>
 </div>
 
 
@@ -222,42 +224,43 @@
 <p-sidebar [(visible)]="filterDisplay" styleClass="ui-sidebar-md side-back side-small">
     <h3>{{ 'Requests.Filter' | translate }}</h3>
     <hr>
-
-    <h4>{{ 'Filter.FilterHeaderAvailability' | translate }}</h4>
-    <div class="form-group">
-        <div class="radio">
-            <input type="radio" id="Available" name="Availability" (click)="filterAvailability(filterType.Available)">
-            <label for="Available">{{ 'Common.Available' | translate }}</label>
+    <div>
+        <h4>{{ 'Filter.FilterHeaderAvailability' | translate }}</h4>
+        <div class="form-group">
+            <div class="radio">
+                <input type="radio" id="Available" name="Availability" (click)="filterAvailability(filterType.Available, $event)">
+                <label for="Available">{{ 'Common.Available' | translate }}</label>
+            </div>
         </div>
-    </div>
-    <div class="form-group">
-        <div class="radio">
-            <input type="radio" id="notAvailable" name="Availability" (click)="filterAvailability(filterType.NotAvailable)">
-            <label for="notAvailable">{{ 'Common.NotAvailable' | translate }}</label>
+        <div class="form-group">
+            <div class="radio">
+                <input type="radio" id="notAvailable" name="Availability" (click)="filterAvailability(filterType.NotAvailable, $event)">
+                <label for="notAvailable">{{ 'Common.NotAvailable' | translate }}</label>
+            </div>
         </div>
     </div>
-
-    <h4>{{ 'Filter.FilterHeaderRequestStatus' | translate }}</h4>
-    <div class="form-group">
-        <div class="radio">
-            <input type="radio" id="approved" name="Status" (click)="filterStatus(filterType.Approved)">
-            <label for="approved">{{ 'Filter.Approved' | translate }}</label>
+    <div>
+        <h4>{{ 'Filter.FilterHeaderRequestStatus' | translate }}</h4>
+        <div class="form-group">
+            <div class="radio">
+                <input type="radio" id="approved" name="Status" (click)="filterStatus(filterType.Approved, $event)">
+                <label for="approved">{{ 'Filter.Approved' | translate }}</label>
+            </div>
         </div>
-    </div>
-    <div class="form-group">
-        <div class="radio">
-            <input type="radio" id="Processing" name="Status" (click)="filterStatus(filterType.Processing)">
-            <label for="Processing">{{ 'Common.ProcessingRequest' | translate }}</label>
+        <div class="form-group">
+            <div class="radio">
+                <input type="radio" id="Processing" name="Status" (click)="filterStatus(filterType.Processing, $event)">
+                <label for="Processing">{{ 'Common.ProcessingRequest' | translate }}</label>
+            </div>
         </div>
-    </div>
-    <div class="form-group">
-        <div class="radio">
-            <input type="radio" id="pendingApproval" name="Status" (click)="filterStatus(filterType.PendingApproval, $event)">
-            <label for="pendingApproval">{{ 'Filter.PendingApproval' | translate }}</label>
+        <div class="form-group">
+            <div class="radio">
+                <input type="radio" id="pendingApproval" name="Status" (click)="filterStatus(filterType.PendingApproval, $event)">
+                <label for="pendingApproval">{{ 'Filter.PendingApproval' | translate }}</label>
+            </div>
         </div>
     </div>
 
-
-    <button class="btn btn-sm btn-primary-outline" (click)="clearFilter()">
+    <button class="btn btn-sm btn-primary-outline" (click)="clearFilter($event)">
         <i class="fa fa-filter"></i> {{ 'Filter.ClearFilter' | translate }}</button>
 </p-sidebar>

src/Ombi/ClientApp/app/requests/movierequests.component.ts

@@ -8,7 +8,7 @@ import { Subject } from "rxjs/Subject";
 import { AuthService } from "../auth/auth.service";
 import { NotificationService, RadarrService, RequestService } from "../services";
 
-import { FilterType, IFilter, IIssueCategory, IMovieRequests, IRadarrProfile, IRadarrRootFolder } from "../interfaces";
+import { FilterType, IFilter, IIssueCategory, IMovieRequests, IPagenator, IRadarrProfile, IRadarrRootFolder } from "../interfaces";
 
 @Component({
     selector: "movie-requests",
@@ -39,6 +39,7 @@ export class MovieRequestsComponent implements OnInit {
     public order: string = "requestedDate";
     public reverse = false;
 
+    public totalMovies: number = 100;
     private currentlyLoaded: number;
     private amountToLoad: number;
 
@@ -65,8 +66,8 @@ export class MovieRequestsComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.amountToLoad = 100;
-        this.currentlyLoaded = 100;
+        this.amountToLoad = 10;
+        this.currentlyLoaded = 10;
         this.loadInit();
         this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser");
         this.filter = {
@@ -74,8 +75,10 @@ export class MovieRequestsComponent implements OnInit {
             statusFilter: FilterType.None};
     }
 
-    public loadMore() {
-        this.loadRequests(this.amountToLoad, this.currentlyLoaded);
+    public paginate(event: IPagenator) {
+        const skipAmount = event.first;
+        
+        this.loadRequests(this.amountToLoad, skipAmount);
     }
 
     public search(text: any) {
@@ -149,7 +152,16 @@ export class MovieRequestsComponent implements OnInit {
         event.preventDefault();
     }
 
-    public clearFilter() {
+    public clearFilter(el: any) {
+        el = el.toElement || el.relatedTarget || el.target || el.srcElement;
+
+        el = el.parentElement;
+        el = el.querySelectorAll("INPUT");
+        for (el of el) {
+            el.checked = false;
+            el.parentElement.classList.remove("active");
+        }
+
         this.filterDisplay = false;
         this.filter.availabilityFilter = FilterType.None;
         this.filter.statusFilter = FilterType.None;
@@ -157,7 +169,8 @@ export class MovieRequestsComponent implements OnInit {
         this.resetSearch();
     }
 
-    public filterAvailability(filter: FilterType) {
+    public filterAvailability(filter: FilterType, el: any) {
+        this.filterActiveStyle(el);
         this.filter.availabilityFilter = filter;
         this.requestService.filterMovies(this.filter)
         .subscribe(x => {
@@ -166,7 +179,8 @@ export class MovieRequestsComponent implements OnInit {
         });
     }
 
-    public filterStatus(filter: FilterType) {
+    public filterStatus(filter: FilterType, el: any) {
+        this.filterActiveStyle(el);
         this.filter.statusFilter = filter;
         this.requestService.filterMovies(this.filter)
         .subscribe(x => {
@@ -190,6 +204,24 @@ export class MovieRequestsComponent implements OnInit {
         this.order = value;
       }
 
+    private filterActiveStyle(el: any) {
+        el = el.toElement || el.relatedTarget || el.target || el.srcElement;
+
+        el = el.parentElement; //gets radio div
+        el = el.parentElement; //gets form group div
+        el = el.parentElement; //gets status filter div
+        el = el.querySelectorAll("INPUT");
+        for (el of el) {
+            if (el.checked) {
+                if (!el.parentElement.classList.contains("active")) {
+                    el.parentElement.className += " active";
+                }
+            } else {
+                el.parentElement.classList.remove("active");
+            }
+        }
+    }
+
     private loadRequests(amountToLoad: number, currentlyLoaded: number) {
         this.requestService.getMovieRequests(amountToLoad, currentlyLoaded + 1)
             .subscribe(x => {
@@ -197,7 +229,7 @@ export class MovieRequestsComponent implements OnInit {
                 if(!this.movieRequests) {
                     this.movieRequests = [];
                 }
-                this.movieRequests.push.apply(this.movieRequests, x);
+                this.movieRequests = x;
                 this.currentlyLoaded = currentlyLoaded + amountToLoad;
             });
     }
@@ -238,12 +270,14 @@ export class MovieRequestsComponent implements OnInit {
     }
 
     private loadInit() {
+        this.requestService.getTotalMovies().subscribe(x => this.totalMovies = x);
         this.requestService.getMovieRequests(this.amountToLoad, 0)
             .subscribe(x => {
                 this.movieRequests = x;
 
                 this.movieRequests.forEach((req) => {
-                    this.movieRequests.forEach((req) => this.setBackground(req));
+                     this.setBackground(req);
+                     this.setPoster(req);
                 });
                 this.radarrService.getQualityProfilesFromSettings().subscribe(c => {
                     this.radarrProfiles = c;
@@ -296,11 +330,20 @@ export class MovieRequestsComponent implements OnInit {
     }
 
     private setOverride(req: IMovieRequests): void {
+        this.setPoster(req);
         this.setBackground(req);
         this.setQualityOverrides(req);
         this.setRootFolderOverrides(req);
     }
 
+    private setPoster(req: IMovieRequests): void {
+        if (req.posterPath === null) {
+            req.posterPath = "../../../images/default_movie_poster.png";
+        } else {
+            req.posterPath = "https://image.tmdb.org/t/p/w300/" + req.posterPath;
+        }
+    }
+
     private setBackground(req: IMovieRequests): void {
         req.backgroundPath = this.sanitizer.bypassSecurityTrustStyle
         ("url(" + "https://image.tmdb.org/t/p/w1280" + req.background + ")");

src/Ombi/ClientApp/app/requests/requests.module.ts

@@ -6,7 +6,7 @@ import { OrderModule } from "ngx-order-pipe";
 
 import { InfiniteScrollModule } from "ngx-infinite-scroll";
 
-import { ButtonModule, DialogModule } from "primeng/primeng";
+import { ButtonModule, DialogModule, PaginatorModule } from "primeng/primeng";
 import { MovieRequestsComponent } from "./movierequests.component";
 // Request
 import { RequestComponent } from "./request.component";
@@ -36,6 +36,7 @@ const routes: Routes = [
         SharedModule,
         SidebarModule,
         OrderModule,
+        PaginatorModule,
     ],
     declarations: [
         RequestComponent,

src/Ombi/ClientApp/app/requests/tvrequest-children.component.html

@@ -22,15 +22,7 @@
            
                     <button id="removeBtn" type="button" (click)="removeRequest(child)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> {{ 'Requests.Remove' | translate }}</button>
                 </div>
-                <div class="dropdown" *ngIf="issueCategories && issuesEnabled" id="issueBtn">
-                        <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                            <i class="fa fa-plus"></i> {{ 'Requests.ReportIssue' | translate }}
-                            <span class="caret"></span>
-                        </button>
-                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                            <li *ngFor="let cat of issueCategories"><a [routerLink]="" (click)="reportIssue(cat, child)">{{cat.value}}</a></li>
-                        </ul>
-                    </div>
+                
                 
             </div>
         </div>
@@ -101,8 +93,3 @@
     </div>
 
 </div>
-
-
-
-<issue-report [movie]="false" [visible]="issuesBarVisible" [title]="issueRequest?.title"
-[issueCategory]="issueCategorySelected" [id]="issueRequest?.id" [providerId]="issueProviderId" (visibleChange)="issuesBarVisible = $event;"></issue-report>

src/Ombi/ClientApp/app/requests/tvrequest-children.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { IChildRequests, IIssueCategory } from "../interfaces";
+import { IChildRequests } from "../interfaces";
 
 import { NotificationService, RequestService } from "../services";
 
@@ -13,13 +13,6 @@ export class TvRequestChildrenComponent {
 
     @Output() public requestDeleted = new EventEmitter<number>();
 
-    @Input() public issueCategories: IIssueCategory[];
-    @Input() public issuesEnabled: boolean;
-    @Input() public issueProviderId: string;
-    public issuesBarVisible = false;
-    public issueRequest: IChildRequests;
-    public issueCategorySelected: IIssueCategory;
-
     constructor(private requestService: RequestService,
                 private notificationService: NotificationService) { }
 
@@ -101,13 +94,6 @@ export class TvRequestChildrenComponent {
             });
     }
 
-    public reportIssue(catId: IIssueCategory, req: IChildRequests) {
-        this.issueRequest = req;
-        this.issueCategorySelected = catId;
-        this.issuesBarVisible = true;
-        this.issueProviderId = req.id.toString();
-    }
-
     private removeRequestFromUi(key: IChildRequests) {
         const index = this.childRequests.indexOf(key, 0);
         if (index > -1) {

src/Ombi/ClientApp/app/requests/tvrequests.component.html

@@ -64,51 +64,64 @@
                         </div>
                         <div class="col-sm-3 col-sm-push-3  small-padding">
 
-                            <button  style="text-align: right" class="btn btn-sm btn-success-outline" (click)="openClosestTab($event)"><i class="fa fa-plus"></i> View</button>
+                            <button style="text-align: right" class="btn btn-sm btn-success-outline" (click)="openClosestTab($event)"><i class="fa fa-plus"></i> View</button>
                             <div *ngIf="isAdmin">
-                                 <!--Sonarr Root Folder-->
-                        <div *ngIf="sonarrRootFolders" class="btn-group btn-split" id="rootFolderBtn">
-                                <button type="button" class="btn btn-sm btn-warning-outline">
-                                    <i class="fa fa-plus"></i> {{ 'Requests.ChangeRootFolder' | translate }}</button>
-                                <button type="button" class="btn btn-warning-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <span class="caret"></span>
-                                    <span class="sr-only">Toggle Dropdown</span>
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li *ngFor="let folder of sonarrRootFolders">
-                                        <a href="#" (click)="selectRootFolder(node.data, folder, $event)">{{folder.path}}</a>
-                                    </li>
-                                </ul>
-                            </div>
+                                <!--Sonarr Root Folder-->
+                                <div *ngIf="sonarrRootFolders" class="btn-group btn-split" id="rootFolderBtn">
+                                    <button type="button" class="btn btn-sm btn-warning-outline">
+                                        <i class="fa fa-plus"></i> {{ 'Requests.ChangeRootFolder' | translate }}
+                                    </button>
+                                    <button type="button" class="btn btn-warning-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        <span class="caret"></span>
+                                        <span class="sr-only">Toggle Dropdown</span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li *ngFor="let folder of sonarrRootFolders">
+                                            <a href="#" (click)="selectRootFolder(node.data, folder, $event)">{{folder.path}}</a>
+                                        </li>
+                                    </ul>
+                                </div>
 
-                            <!--Sonarr Quality Profiles -->
-                            <div *ngIf="sonarrProfiles" class="btn-group btn-split" id="changeQualityBtn">
-                                <button type="button" class="btn btn-sm btn-warning-outline">
-                                    <i class="fa fa-plus"></i> {{ 'Requests.ChangeQualityProfile' | translate }}</button>
-                                <button type="button" class="btn btn-warning-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <!--Sonarr Quality Profiles -->
+                                <div *ngIf="sonarrProfiles" class="btn-group btn-split" id="changeQualityBtn">
+                                    <button type="button" class="btn btn-sm btn-warning-outline">
+                                        <i class="fa fa-plus"></i> {{ 'Requests.ChangeQualityProfile' | translate }}
+                                    </button>
+                                    <button type="button" class="btn btn-warning-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        <span class="caret"></span>
+                                        <span class="sr-only">Toggle Dropdown</span>
+                                    </button>
+                                    <ul class="dropdown-menu">
+                                        <li *ngFor="let profile of sonarrProfiles">
+                                            <a href="#" (click)="selectQualityProfile(node.data, profile, $event)">{{profile.name}}</a>
+                                        </li>
+                                    </ul>
+                                </div>
+
+                            </div>
+                            <div class="dropdown" *ngIf="issueCategories && issuesEnabled" id="issueBtn">
+                                <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                    <i class="fa fa-plus"></i> {{ 'Requests.ReportIssue' | translate }}
                                     <span class="caret"></span>
-                                    <span class="sr-only">Toggle Dropdown</span>
                                 </button>
-                                <ul class="dropdown-menu">
-                                    <li *ngFor="let profile of sonarrProfiles">
-                                        <a href="#" (click)="selectQualityProfile(node.data, profile, $event)">{{profile.name}}</a>
-                                    </li>
+                                <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                                    <li *ngFor="let cat of issueCategories"><a [routerLink]="" (click)="reportIssue(cat, node.data)">{{cat.value}}</a></li>
                                 </ul>
                             </div>
-    
-                            </div>
                         </div>
                     </div>
                 </div>
                 <!--This is the section that holds the child seasons if they want to specify specific episodes-->
                 <div *ngIf="node.leaf">
                     <tvrequests-children [childRequests]="node.data" [isAdmin] ="isAdmin" 
-                    (requestDeleted)="childRequestDeleted($event)" 
-                    [issueCategories]="issueCategories" [issuesEnabled]="issuesEnabled" 
-                    [issueProviderId]="node.data.tvDbId"></tvrequests-children>
+                    (requestDeleted)="childRequestDeleted($event)"></tvrequests-children>
                 </div>
             </ng-template>
         </p-column>
     </p-treeTable>
 
+    <p-paginator [rows]="10" [totalRecords]="totalTv" (onPageChange)="paginate($event)"></p-paginator>
 </div>
+
+    <issue-report [movie]="false" [visible]="issuesBarVisible" [title]="issueRequest?.title"
+                  [issueCategory]="issueCategorySelected" [id]="issueRequest?.id" [providerId]="issueProviderId" (visibleChange)="issuesBarVisible = $event;"></issue-report>

src/Ombi/ClientApp/app/requests/tvrequests.component.ts

@@ -14,7 +14,7 @@ import { AuthService } from "../auth/auth.service";
 import { NotificationService, RequestService, SonarrService } from "../services";
 
 import { TreeNode } from "primeng/primeng";
-import { IIssueCategory, ISonarrProfile,  ISonarrRootFolder, ITvRequests } from "../interfaces";
+import { IIssueCategory, IPagenator,  ISonarrProfile, ISonarrRootFolder, ITvRequests } from "../interfaces";
 
 @Component({
     selector: "tv-requests",
@@ -33,10 +33,14 @@ export class TvRequestsComponent implements OnInit {
     @Input() public issueCategories: IIssueCategory[];
     @Input() public issuesEnabled: boolean;
     public issueProviderId: string;
+    public issuesBarVisible = false;
+    public issueRequest: ITvRequests;
+    public issueCategorySelected: IIssueCategory;
 
     public sonarrProfiles: ISonarrProfile[] = [];
     public sonarrRootFolders: ISonarrRootFolder[] = [];
 
+    public totalTv: number = 100;
     private currentlyLoaded: number;
     private amountToLoad: number;
 
@@ -102,25 +106,22 @@ export class TvRequestsComponent implements OnInit {
     }
 
     public ngOnInit() {
-        this.amountToLoad = 1000;
-        this.currentlyLoaded = 1000;
+        this.amountToLoad = 10;
+        this.currentlyLoaded = 10;
         this.tvRequests = [];
         this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser");
         
         this.loadInit();
     }
 
-    public loadMore() {
-        //TODO: I believe this +1 is causing off by one error skipping loading of tv shows
-        //When removed and scrolling very slowly everything works as expected, however
-        //if you scroll really quickly then you start getting duplicates of movies
-        //since it's async and some subsequent results return first and then incrementer
-        //is increased so you see movies which had already been gotten show up...
-        this.requestService.getTvRequestsTree(this.amountToLoad, this.currentlyLoaded + 1)
-            .subscribe(x => {
-                this.tvRequests = x;
-                this.currentlyLoaded = this.currentlyLoaded + this.amountToLoad;
-            });
+    public paginate(event: IPagenator) {
+        const skipAmount = event.first;
+
+        this.requestService.getTvRequestsTree(this.amountToLoad, skipAmount)
+        .subscribe(x => {
+            this.tvRequests = x;
+            this.currentlyLoaded = this.currentlyLoaded + this.amountToLoad;
+        });
     }
 
     public search(text: any) {
@@ -151,6 +152,13 @@ export class TvRequestsComponent implements OnInit {
         this.updateRequest(searchResult);
     }
 
+    public reportIssue(catId: IIssueCategory, req: ITvRequests) {
+        this.issueRequest = req;
+        this.issueCategorySelected = catId;
+        this.issuesBarVisible = true;
+        this.issueProviderId = req.id.toString();
+    }
+
     private setOverride(req: ITvRequests): void {
         this.setQualityOverrides(req);
         this.setRootFolderOverrides(req);
@@ -187,10 +195,12 @@ export class TvRequestsComponent implements OnInit {
     }
 
     private loadInit() {
+        this.requestService.getTotalTv().subscribe(x => this.totalTv = x);
         this.requestService.getTvRequestsTree(this.amountToLoad, 0)
             .subscribe(x => {
                 this.tvRequests = x;
                 this.tvRequests.forEach((val, index) => {
+                    this.setDefaults(val);
                     this.loadBackdrop(val);
                     this.setOverride(val.data);
             });     
@@ -209,10 +219,22 @@ export class TvRequestsComponent implements OnInit {
         this.currentlyLoaded = 5;
         this.loadInit();
     }
+
+    private setDefaults(val: any) {
+        if (val.data.posterPath === null) {
+            val.data.posterPath = "../../../images/default_tv_poster.png";
+        }
+    }
+
     private loadBackdrop(val: TreeNode): void {
-        this.imageService.getTvBanner(val.data.tvDbId).subscribe(x => {
+        if (val.data.background != null) {
             val.data.background = this.sanitizer.bypassSecurityTrustStyle
-                ("url(" + x + ")");
+                ("url(https://image.tmdb.org/t/p/w1280" + val.data.background + ")");
+        } else {
+            this.imageService.getTvBanner(val.data.tvDbId).subscribe(x => {
+                val.data.background = this.sanitizer.bypassSecurityTrustStyle
+                    ("url(" + x + ")");
             });
+        }
     }
 }

src/Ombi/ClientApp/app/search/moviesearch.component.html

@@ -33,7 +33,7 @@
                     <div class="myBg backdrop" [style.background-image]="result.background"></div>
                     <div class="tint" style="background-image: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%);"></div>
                 <div class="col-sm-2 small-padding">
-                    <img *ngIf="result.posterPath"  class="img-responsive poster" src="https://image.tmdb.org/t/p/w300/{{result.posterPath}}" alt="poster">
+                    <img *ngIf="result.posterPath"  class="img-responsive poster" src="{{result.posterPath}}" alt="poster">
 
                 </div>
                 <div class="col-sm-8 small-padding">
@@ -85,6 +85,7 @@
                     <br/>
                     <div *ngIf="result.available">
                         <a *ngIf="result.plexUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{result.plexUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Plex</a>
+                        <a *ngIf="result.embyUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{result.embyUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Emby</a>
                     </div>
                     <div class="dropdown" *ngIf="result.available && issueCategories && issuesEnabled">
                         <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">

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

@@ -157,12 +157,15 @@ export class MovieSearchComponent implements OnInit {
 
    private getExtraInfo() {
 
-        this.movieResults.forEach((val, index) => {
-           
-            val.background = this.sanitizer.
-            bypassSecurityTrustStyle
-            ("url(" + "https://image.tmdb.org/t/p/w1280" + val.backdropPath + ")");
-            this.searchService.getMovieInformation(val.id)
+       this.movieResults.forEach((val, index) => {
+           if (val.posterPath === null) {
+               val.posterPath = "../../../images/default_movie_poster.png";
+           } else {
+               val.posterPath = "https://image.tmdb.org/t/p/w300/" + val.posterPath;
+           }
+           val.background = this.sanitizer.bypassSecurityTrustStyle
+           ("url(" + "https://image.tmdb.org/t/p/w1280" + val.backdropPath + ")");
+           this.searchService.getMovieInformation(val.id)
                 .subscribe(m => {
                     this.updateItem(val, m);
                 });
@@ -175,6 +178,7 @@ export class MovieSearchComponent implements OnInit {
             const copy = { ...this.movieResults[index] };
             this.movieResults[index] = updated;  
             this.movieResults[index].background = copy.background;
+            this.movieResults[index].posterPath = copy.posterPath;
         }
     }
     private clearResults() {

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

@@ -62,7 +62,7 @@
                             <div class="col-sm-8 small-padding">
                                 <div>
 
-                                    <a *ngIf="node.data.imdbId" href="http://www.imdb.com/title/{{node.data.imdbId}}/" target="_blank">
+                                    <a *ngIf="node.data.imdbId" href="{{node.data.imdbId}}" target="_blank">
                                         <h4>{{node.data.title}} ({{node.data.firstAired | date: 'yyyy'}})</h4>
 
                                     </a>
@@ -118,17 +118,25 @@
 
                                 <div *ngIf="node.data.fullyAvailable">
                                     <button style="text-align: right" class="btn btn-success-outline disabled" disabled>
-                                        <i class="fa fa-check"></i> {{ 'Common.Available' | translate }}</button>
+                                        <i class="fa fa-check"></i> {{ 'Common.Available' | translate }}
+                                    </button>
                                 </div>
                                 <br />
                                 <div *ngIf="node.data.plexUrl && node.data.available">
-                                    <a  style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.plexUrl}}"
-                                        target="_blank">
-                                        <i class="fa fa-eye"></i> {{ 'Search.ViewOnPlex' | translate }}</a>
-  </div>
+                                    <a style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.plexUrl}}"
+                                       target="_blank">
+                                        <i class="fa fa-eye"></i> {{ 'Search.ViewOnPlex' | translate }}
+                                    </a>
+                                </div>
+                                <div *ngIf="node.data.embyUrl && node.data.available">
+                                    <a style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.embyUrl}}"
+                                       target="_blank">
+                                        <i class="fa fa-eye"></i> {{ 'Search.ViewOnEmby' | translate }}
+                                    </a>
+                                </div>
                                 <div class="dropdown" *ngIf="issueCategories && issuesEnabled">
                                     <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true"
-                                        aria-expanded="true">
+                                            aria-expanded="true">
                                         <i class="fa fa-plus"></i> {{ 'Requests.ReportIssue' | translate }}
                                         <span class="caret"></span>
                                     </button>
@@ -139,8 +147,8 @@
                                     </ul>
                                 </div>
                                 <div *ngIf="!node.data.available">
-                                    <br/>
-                                    <br/>
+                                    <br />
+                                    <br />
                                 </div>
 
                             </div>

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

@@ -130,7 +130,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.
                 bypassSecurityTrustStyle
                 ("url(" + x + ")");
@@ -138,6 +137,7 @@ export class TvSearchComponent implements OnInit {
             this.searchService.getShowInformationTreeNode(val.data.id)
                 .subscribe(x => {
                     if (x.data) {
+                        this.setDefaults(x);
                         this.updateItem(val, x);
                     } else {
                         const index = this.tvResults.indexOf(val, 0);
@@ -216,6 +216,7 @@ export class TvSearchComponent implements OnInit {
         const index = this.tvResults.indexOf(key, 0);
         if (index > -1) {
             // Update certain properties, otherwise we will loose some data
+            this.tvResults[index].data.title = updated.data.title;
             this.tvResults[index].data.banner = updated.data.banner;
             this.tvResults[index].data.imdbId = updated.data.imdbId;
             this.tvResults[index].data.seasonRequests = updated.data.seasonRequests;
@@ -225,6 +226,18 @@ export class TvSearchComponent implements OnInit {
         }
     }
 
+    private setDefaults(x: any) {
+        if (x.data.banner === null) {
+            x.data.banner = "../../../images/default_tv_poster.png";
+        }
+
+        if (x.data.imdbId === null) {
+            x.data.imdbId = "https://www.tvmaze.com/shows/" + x.data.seriesId;
+        } else {
+            x.data.imdbId = "http://www.imdb.com/title/" + x.data.imdbId + "/";
+        }
+    }
+
     private clearResults() {
         this.tvResults = [];
         this.searchApplied = false;

src/Ombi/ClientApp/app/services/applications/index.ts

@@ -4,3 +4,4 @@ export * from "./plex.service";
 export * from "./radarr.service";
 export * from "./sonarr.service";
 export * from "./tester.service";
+export * from "./plexoauth.service";

src/Ombi/ClientApp/app/services/applications/plex.service.ts

@@ -29,4 +29,8 @@ export class PlexService extends ServiceHelpers {
     public getFriends(): Observable<IUsersModel[]> {
         return this.http.get<IUsersModel[]>(`${this.url}Friends`,  {headers: this.headers});
     }
+
+    public oAuth(wizard: boolean): Observable<any> {
+        return this.http.get<any>(`${this.url}oauth/${wizard}`,  {headers: this.headers});
+    }
 }

src/Ombi/ClientApp/app/services/applications/plexoauth.service.ts

@@ -0,0 +1,20 @@
+import { PlatformLocation } from "@angular/common";
+import { HttpClient } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+
+import { Observable } from "rxjs/Rx";
+
+import { ServiceHelpers } from "../service.helpers";
+
+import { IPlexOAuthAccessToken } from "../../interfaces";
+
+@Injectable()
+export class PlexOAuthService extends ServiceHelpers {
+    constructor(http: HttpClient, public platformLocation: PlatformLocation) {
+        super(http, "/api/v1/PlexOAuth/", platformLocation);
+    }
+
+    public oAuth(pin: number): Observable<IPlexOAuthAccessToken> {
+        return this.http.get<IPlexOAuthAccessToken>(`${this.url}${pin}`,  {headers: this.headers});
+    }
+}

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

@@ -20,6 +20,14 @@ export class RequestService extends ServiceHelpers {
         return this.http.post<IRequestEngineResult>(`${this.url}Movie/`, JSON.stringify(movie),  {headers: this.headers});
     }
 
+    public getTotalMovies(): Observable<number> {
+        return this.http.get<number>(`${this.url}Movie/total`, {headers: this.headers});
+    }    
+    
+    public getTotalTv(): Observable<number> {
+        return this.http.get<number>(`${this.url}tv/total`, {headers: this.headers});
+    }
+
     public requestTv(tv: ITvRequestViewModel): Observable<IRequestEngineResult> {
         return this.http.post<IRequestEngineResult>(`${this.url}TV/`, JSON.stringify(tv), {headers: this.headers});
     }

src/Ombi/ClientApp/app/settings/authentication/authentication.component.html

@@ -14,6 +14,13 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div class="checkbox">
+                    <input type="checkbox" id="enableOAuth" name="enableOAuth" formControlName="enableOAuth">
+                    <label for="enableOAuth" >Enable Plex OAuth</label>
+                </div>
+            </div>
+
             <!-- <hr/>
             <div class="form-group">
                 <div class="checkbox">

src/Ombi/ClientApp/app/settings/authentication/authentication.component.ts

@@ -24,6 +24,7 @@ export class AuthenticationComponent implements OnInit {
                 requiredLowercase: [x.requiredLowercase],
                 requireNonAlphanumeric: [x.requireNonAlphanumeric],
                 requireUppercase: [x.requireUppercase],
+                enableOAuth: [x.enableOAuth],
             });
         });
     }

src/Ombi/ClientApp/app/settings/jobs/jobs.component.html

@@ -59,7 +59,7 @@
                 </div>
                 <div class="form-group">
                     <label for="plexRecentlyAddedSync" class="control-label">Plex Recently Added Sync</label>              
-                        <input type="text" class="form-control form-control-custom" [ngClass]="{'form-error': form.get('plexRecentlyAddedSync').hasError('required')}" id="plexRecentlyAddedSync" name="plexContentSync" formControlName="plexContentSync">
+                        <input type="text" class="form-control form-control-custom" [ngClass]="{'form-error': form.get('plexRecentlyAddedSync').hasError('required')}" id="plexRecentlyAddedSync" name="plexRecentlyAddedSync" formControlName="plexRecentlyAddedSync">
                         <small *ngIf="form.get('plexRecentlyAddedSync').hasError('required')" class="error-text">The Plex Sync is required</small>
                         <button type="button" class="btn btn-sm btn-primary-outline" (click)="testCron(form.get('plexRecentlyAddedSync')?.value)">Test</button>
                 </div>

src/Ombi/ClientApp/app/wizard/createadmin/createadmin.component.ts

@@ -21,7 +21,7 @@ export class CreateAdminComponent {
         this.identityService.createWizardUser({username: this.username, password: this.password, usePlexAdminAccount: false}).subscribe(x => {
             if (x) {
                 // Log me in.
-                this.auth.login({ username: this.username, password: this.password, rememberMe:false }).subscribe(c => {
+                this.auth.login({ username: this.username, password: this.password, rememberMe: false, usePlexOAuth:false }).subscribe(c => {
 
                     localStorage.setItem("id_token", c.access_token);
 

src/Ombi/ClientApp/app/wizard/plex/plex.component.html

@@ -17,9 +17,16 @@
 <small>Please note we do not store this information, we only store your Plex Authorization Token that will allow Ombi to view your media and friends</small>
 <div class="form-group">
     <div style="text-align: center; margin-top: 20px">
-        <button (click)="requestAuthToken()" class="btn btn-primary-outline">Request Token <i class="fa fa-key"></i></button>
+        <button (click)="requestAuthToken()" class="btn btn-success-outline">Request Token <i class="fa fa-key"></i></button>
     </div>
 </div>
+<p class="text-center">OR</p>
+<div class="form-group">
+    <div style="text-align: center; margin-top: 20px">
+        <button (click)="oauth()" class="btn btn-primary" type="button">Continue With Plex</button>
+    </div>
+</div>
+
 </div>
 </div>
 </div>

src/Ombi/ClientApp/app/wizard/plex/plex.component.ts

@@ -1,8 +1,6 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
-import { ConfirmationService } from "primeng/primeng";
-
 import { PlexService } from "../../services";
 import { IdentityService, NotificationService, SettingsService } from "../../services";
 import { AuthService } from "./../../auth/auth.service";
@@ -17,7 +15,6 @@ export class PlexComponent {
 
     constructor(private plexService: PlexService, private router: Router,
                 private notificationService: NotificationService,
-                private confirmationService: ConfirmationService,
                 private identityService: IdentityService,
                 private settings: SettingsService,
                 private auth: AuthService) { }
@@ -28,25 +25,21 @@ export class PlexComponent {
                 this.notificationService.error("Username or password was incorrect. Could not authenticate with Plex.");
                 return;
             }
-            this.confirmationService.confirm({
-              message: "Do you want your Plex user to be the main admin account on Ombi?",
-              header: "Use Plex Account",
-              icon: "fa fa-check",
-              accept: () => {
-                  this.identityService.createWizardUser({
+            
+            this.identityService.createWizardUser({
                     username: "",
                     password: "",
                     usePlexAdminAccount: true,
-                  }).subscribe(x => {
-                    if (x) {
-                        this.auth.login({ username: this.login, password: this.password, rememberMe:false }).subscribe(c => {
+                  }).subscribe(y => {
+                    if (y) {
+                        this.auth.login({ username: this.login, password: this.password, rememberMe: false, usePlexOAuth: false }).subscribe(c => {
                             localStorage.setItem("id_token", c.access_token);
                   
                             // Mark that we have done the settings now
                             this.settings.getOmbi().subscribe(ombi => {
                                 ombi.wizard = true;
 
-                                this.settings.saveOmbi(ombi).subscribe(x => {
+                                this.settings.saveOmbi(ombi).subscribe(s => {
                                     this.settings.getUserManagementSettings().subscribe(usr => {
 
                                         usr.importPlexAdmin = true;
@@ -64,10 +57,14 @@ export class PlexComponent {
                     }
                   });
               },
-              reject: () => {
-                this.router.navigate(["Wizard/CreateAdmin"]);
-              },
-            });  
+        );
+    }
+
+    public oauth() {
+        this.plexService.oAuth(true).subscribe(x => {
+            if(x.url) {
+                window.location.href = x.url;
+            }
         });
     }
 }

src/Ombi/ClientApp/app/wizard/plex/plexoauth.component.html

@@ -0,0 +1,14 @@
+
+<img class="landing-header" src="/images/logo.png" width="300" />
+<div class="landing-block shadow">
+<div class="media">
+<div id="contentBody" class="media-body">
+<h4 class="media-heading landing-title">Plex Authentication</h4>
+<div class="form-group">
+    <label for="username" class="control-label">Please Wait</label>
+</div>
+</div>
+</div>
+</div>
+
+<p-confirmDialog></p-confirmDialog>

src/Ombi/ClientApp/app/wizard/plex/plexoauth.component.ts

@@ -0,0 +1,67 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+
+import { IdentityService, PlexOAuthService, SettingsService } from "../../services";
+import { AuthService } from "./../../auth/auth.service";
+
+@Component({
+    templateUrl: "./plexoauth.component.html",
+})
+export class PlexOAuthComponent implements OnInit {
+    public pinId: number;
+
+    constructor(private route: ActivatedRoute,
+                private plexOauth: PlexOAuthService,
+                private identityService: IdentityService,
+                private settings: SettingsService,
+                private router: Router,
+                private auth: AuthService) {
+
+        this.route.params
+            .subscribe((params: any) => {
+                this.pinId = params.pin;
+            });
+    }
+            
+    public ngOnInit(): void {
+        this.plexOauth.oAuth(this.pinId).subscribe(x => {
+            if(!x.accessToken) {
+                return;
+                // RETURN
+            }
+            
+            this.identityService.createWizardUser({
+                      username: "",
+                      password: "",
+                      usePlexAdminAccount: true,
+                    }).subscribe(u => {
+                      if (u) {
+                          this.auth.oAuth(this.pinId).subscribe(c => {
+                              localStorage.setItem("id_token", c.access_token);
+                    
+                              // Mark that we have done the settings now
+                              this.settings.getOmbi().subscribe(ombi => {
+                                  ombi.wizard = true;
+  
+                                  this.settings.saveOmbi(ombi).subscribe(s => {
+                                      this.settings.getUserManagementSettings().subscribe(usr => {
+  
+                                          usr.importPlexAdmin = true;
+                                          this.settings.saveUserManagementSettings(usr).subscribe(saved => {
+                                              this.router.navigate(["login"]);
+                                          });
+                                      });
+  
+                                  });
+                              });
+                      });
+                      } else {
+                        //this.notificationService.error("Could not get the Plex Admin Information");
+                        return;
+                      }
+                    });
+                 
+        });
+    }
+    
+}

src/Ombi/ClientApp/app/wizard/wizard.module.ts

@@ -14,6 +14,8 @@ import { WelcomeComponent } from "./welcome/welcome.component";
 import { EmbyService } from "../services";
 import { PlexService } from "../services";
 import { IdentityService } from "../services";
+import { PlexOAuthService } from "../services";
+import { PlexOAuthComponent } from "./plex/plexoauth.component";
 
 const routes: Routes = [
     { path: "", component: WelcomeComponent},
@@ -21,6 +23,7 @@ const routes: Routes = [
     { path: "Plex", component: PlexComponent},
     { path: "Emby", component: EmbyComponent},
     { path: "CreateAdmin", component: CreateAdminComponent},
+    { path: "OAuth/:pin", component: PlexOAuthComponent},
 ];
 @NgModule({
     imports: [
@@ -33,6 +36,7 @@ const routes: Routes = [
         WelcomeComponent,
         MediaServerComponent,
         PlexComponent,
+        PlexOAuthComponent,
         CreateAdminComponent,
         EmbyComponent,
     ],
@@ -44,6 +48,7 @@ const routes: Routes = [
         IdentityService,
         EmbyService,
         ConfirmationService,
+        PlexOAuthService,
     ],
 
 })

src/Ombi/ClientApp/styles/Themes/plex.scss

@@ -351,5 +351,5 @@ button.list-group-item:focus {
     position: absolute;
  }
  table.table > thead > tr > th.active {
-    background-color: transparent;
+    background-color: $primary-colour;
 }

src/Ombi/ClientApp/styles/base.scss

@@ -541,6 +541,10 @@ $border-radius: 10px;
     cursor: pointer;
 }
 
+.table-usermanagement {
+    margin-top: 20px;
+}
+
 .input-group-sm {
     padding-top: 2px;
     padding-bottom: 2px;
@@ -955,3 +959,7 @@ a > h4:hover {
     width: 94%;
 }
 
+.ui-state-active {
+    background-color: $primary-colour-outline $i;
+    color: black $i;
+}

src/Ombi/Controllers/External/PlexController.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Logging;
 using Ombi.Api.Plex;
 using Ombi.Api.Plex.Models;
 using Ombi.Attributes;
+using Ombi.Core.Authentication;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
@@ -21,16 +22,18 @@ namespace Ombi.Controllers.External
     public class PlexController : Controller
     {
         public PlexController(IPlexApi plexApi, ISettingsService<PlexSettings> plexSettings,
-            ILogger<PlexController> logger)
+            ILogger<PlexController> logger, IPlexOAuthManager manager)
         {
             PlexApi = plexApi;
             PlexSettings = plexSettings;
             _log = logger;
+            _plexOAuthManager = manager;
         }
 
         private IPlexApi PlexApi { get; }
         private ISettingsService<PlexSettings> PlexSettings { get; }
         private readonly ILogger<PlexController> _log;
+        private readonly IPlexOAuthManager _plexOAuthManager;
 
         /// <summary>
         /// Signs into the Plex API.
@@ -173,5 +176,37 @@ namespace Ombi.Controllers.External
             // Filter out any dupes
             return vm.DistinctBy(x => x.Id);
         }
+
+        [HttpGet("oauth/{wizard:bool}")]
+        [AllowAnonymous]
+        public async Task<IActionResult> OAuth(bool wizard)
+        {
+            //https://app.plex.tv/auth#?forwardUrl=http://google.com/&clientID=Ombi-Test&context%5Bdevice%5D%5Bproduct%5D=Ombi%20SSO&pinID=798798&code=4lgfd
+            // Plex OAuth
+            // Redirect them to Plex
+            // We need a PIN first
+            var pin = await _plexOAuthManager.RequestPin();
+
+            Uri url;
+            if (!wizard)
+            {
+                url = await _plexOAuthManager.GetOAuthUrl(pin.id, pin.code);
+            }
+            else
+            {
+                var websiteAddress =$"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";
+                url = _plexOAuthManager.GetWizardOAuthUrl(pin.id, pin.code, websiteAddress);
+            }
+
+            if (url == null)
+            {
+                return new JsonResult(new
+                {
+                    error = "Application URL has not been set"
+                });
+            }
+
+            return new JsonResult(new {url = url.ToString()});
+        }
     }
 }

src/Ombi/Controllers/IdentityController.cs

@@ -213,7 +213,7 @@ namespace Ombi.Controllers
         [PowerUser]
         public async Task<IEnumerable<UserViewModel>> GetAllUsers()
         {
-            var users = await UserManager.Users
+            var users = await UserManager.Users.Where(x => x.UserType != UserType.SystemUser)
                 .ToListAsync();
 
             var model = new List<UserViewModel>();