From 412063c9828083182d98a372ff02d21fbac727bd Mon Sep 17 00:00:00 2001
From: Victor Usoltsev <bernarden@mail.ru>
Date: Sat, 27 Mar 2021 00:51:36 +1300
Subject: [PATCH 01/39] Capitalizes V for tv show notification type. Refactors
 notification message curlys class.

---
 src/Ombi.Notifications/BaseNotification.cs    |   1 -
 .../NotificationMessageCurlys.cs              | 349 ++++++++----------
 2 files changed, 144 insertions(+), 206 deletions(-)

diff --git a/src/Ombi.Notifications/BaseNotification.cs b/src/Ombi.Notifications/BaseNotification.cs
index c9404eb2c..9d8bbb776 100644
--- a/src/Ombi.Notifications/BaseNotification.cs
+++ b/src/Ombi.Notifications/BaseNotification.cs
@@ -209,7 +209,6 @@ namespace Ombi.Notifications
             if (model.RequestType == RequestType.Movie)
             {
                 _log.LogDebug("Notification options: {@model}, Req: {@MovieRequest}, Settings: {@Customization}", model, MovieRequest, Customization);
-
                 curlys.Setup(model, MovieRequest, Customization, preference);
             }
             else if (model.RequestType == RequestType.TvShow)
diff --git a/src/Ombi.Notifications/NotificationMessageCurlys.cs b/src/Ombi.Notifications/NotificationMessageCurlys.cs
index 54e85080b..4c4aa01ef 100644
--- a/src/Ombi.Notifications/NotificationMessageCurlys.cs
+++ b/src/Ombi.Notifications/NotificationMessageCurlys.cs
@@ -14,228 +14,164 @@ namespace Ombi.Notifications
 {
     public class NotificationMessageCurlys
     {
-        public void Setup(NotificationOptions opts, MovieRequests req, CustomizationSettings s, UserNotificationPreferences pref)
+        public void SetupNewsletter(CustomizationSettings s)
         {
-            LoadIssues(opts);
+            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s.ApplicationName;
+            ApplicationUrl = s?.ApplicationUrl.HasValue() ?? false ? s.ApplicationUrl : string.Empty;
+        }
 
-            RequestId = req?.Id.ToString();
+        public void Setup(OmbiUser user, CustomizationSettings s)
+        {
+            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s.ApplicationName;
+            ApplicationUrl = s?.ApplicationUrl.HasValue() ?? false ? s.ApplicationUrl : string.Empty;
+            RequestedUser = user.UserName;
+            Alias = user.UserAlias;
+            UserName = user.UserName;
+        }
+
+        public void Setup(NotificationOptions opts, MovieRequests req, CustomizationSettings s,
+            UserNotificationPreferences pref)
+        {
+            LoadIssues(opts);
+            LoadCommon(req, s, pref);
+            LoadTitle(opts, req);
             ProviderId = req?.TheMovieDbId.ToString() ?? string.Empty;
-            string title;
-            if (req == null)
-            {
-                opts.Substitutes.TryGetValue("Title", out title);
-            }
-            else
-            {
-                title = req?.Title;
-            }
-            ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
-            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
-            RequestedUser = req?.RequestedUser?.UserName;
-            if (UserName.IsNullOrEmpty())
-            {
-                // Can be set if it's an issue
-                UserName = req?.RequestedUser?.UserName;
-            }
+            Year = req?.ReleaseDate.Year.ToString();
+            Overview = req?.Overview;
+            AdditionalInformation = opts?.AdditionalInformation ?? string.Empty;
 
-            if (Alias.IsNullOrEmpty())
+            if (!string.IsNullOrEmpty(req?.PosterPath))
             {
-                // Can be set if it's an issue
-                Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
+                PosterImage = $"https://image.tmdb.org/t/p/w300/{req.PosterPath.TrimStart('/')}";
             }
 
-            if (pref != null)
-            {
-                UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
-            }
-            Title = title;
-            RequestedDate = req?.RequestedDate.ToString("D");
-            if (Type.IsNullOrEmpty())
-            {
-                Type = req?.RequestType.Humanize();
-            }
-            Overview = req?.Overview;
-            Year = req?.ReleaseDate.Year.ToString();
-            DenyReason = req?.DeniedReason;
-            AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
-            if (req?.RequestType == RequestType.Movie)
-            {
-                PosterImage = string.Format((req?.PosterPath ?? string.Empty).StartsWith("/", StringComparison.InvariantCultureIgnoreCase)
-                    ? "https://image.tmdb.org/t/p/w300{0}" : "https://image.tmdb.org/t/p/w300/{0}", req?.PosterPath);
-            }
-            else
+            CalculateRequestStatus(req);
+        }
+
+        public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s,
+            UserNotificationPreferences pref)
+        {
+            LoadIssues(opts);
+            LoadCommon(req, s, pref);
+            LoadTitle(opts, req);
+            ProviderId = req?.ParentRequest?.ExternalProviderId.ToString() ?? string.Empty;
+            Year = req?.ParentRequest?.ReleaseDate.Year.ToString();
+            Overview = req?.ParentRequest?.Overview;
+            AdditionalInformation = opts.AdditionalInformation;
+
+            if (!string.IsNullOrEmpty(req?.ParentRequest?.PosterPath))
             {
-                PosterImage = req?.PosterPath;
+                PosterImage = $"https://image.tmdb.org/t/p/w300/{req.ParentRequest?.PosterPath.TrimStart('/')}";
             }
 
-            AdditionalInformation = opts?.AdditionalInformation ?? string.Empty;
+            // Generate episode list.
+            StringBuilder epSb = new StringBuilder();
+            IEnumerable<EpisodeRequests> episodes = req?.SeasonRequests?
+                .SelectMany(x => x.Episodes) ?? new List<EpisodeRequests>();
+            episodes
+                .OrderBy(x => x.EpisodeNumber)
+                .ToList()
+                .ForEach(ep => epSb.Append($"{ep.EpisodeNumber},"));
+            if (epSb.Length > 0) epSb.Remove(epSb.Length - 1, 1);
+            EpisodesList = epSb.ToString();
 
+            // Generate season list.
+            StringBuilder seasonSb = new StringBuilder();
+            List<SeasonRequests> seasons = req?.SeasonRequests ?? new List<SeasonRequests>();
+            seasons
+                .OrderBy(x => x.SeasonNumber)
+                .ToList()
+                .ForEach(ep => seasonSb.Append($"{ep.SeasonNumber},"));
+            if (seasonSb.Length > 0) seasonSb.Remove(seasonSb.Length - 1, 1);
+            SeasonsList = seasonSb.ToString();
             CalculateRequestStatus(req);
         }
 
-        public void Setup(NotificationOptions opts, AlbumRequest req, CustomizationSettings s, UserNotificationPreferences pref)
+        public void Setup(NotificationOptions opts, AlbumRequest req, CustomizationSettings s,
+            UserNotificationPreferences pref)
         {
             LoadIssues(opts);
-
-            RequestId = req?.Id.ToString();
+            LoadCommon(req, s, pref);
+            LoadTitle(opts, req);
             ProviderId = req?.ForeignArtistId ?? string.Empty;
-
-            string title;
-            if (req == null)
-            {
-                opts.Substitutes.TryGetValue("Title", out title);
-            }
-            else
-            {
-                title = req?.Title;
-            }
-            ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
-            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
-            RequestedUser = req?.RequestedUser?.UserName;
-            if (UserName.IsNullOrEmpty())
-            {
-                // Can be set if it's an issue
-                UserName = req?.RequestedUser?.UserName;
-            }
-
-            AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
-            DenyReason = req?.DeniedReason;
-            if (Alias.IsNullOrEmpty())
-            {
-                Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
-            }
-            if (pref != null)
-            {
-                UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
-            }
-            Title = title;
-            RequestedDate = req?.RequestedDate.ToString("D");
-            if (Type.IsNullOrEmpty())
-            {
-                Type = req?.RequestType.Humanize();
-            }
             Year = req?.ReleaseDate.Year.ToString();
-            PosterImage = (req?.Cover.HasValue() ?? false) ? req.Cover : req?.Disk ?? string.Empty;
-
             AdditionalInformation = opts?.AdditionalInformation ?? string.Empty;
+            PosterImage = req?.Cover.HasValue() ?? false ? req.Cover : req?.Disk ?? string.Empty;
             CalculateRequestStatus(req);
         }
 
-        public void SetupNewsletter(CustomizationSettings s)
+        private void LoadIssues(NotificationOptions opts)
         {
-            ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
-            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
+            IssueDescription = opts.Substitutes.TryGetValue("IssueDescription", out string val) ? val : string.Empty;
+            IssueCategory = opts.Substitutes.TryGetValue("IssueCategory", out val) ? val : string.Empty;
+            IssueStatus = opts.Substitutes.TryGetValue("IssueStatus", out val) ? val : string.Empty;
+            IssueSubject = opts.Substitutes.TryGetValue("IssueSubject", out val) ? val : string.Empty;
+            NewIssueComment = opts.Substitutes.TryGetValue("NewIssueComment", out val) ? val : string.Empty;
+            UserName = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
+            Alias = opts.Substitutes.TryGetValue("IssueUserAlias", out val) ? val : string.Empty;
+            Type = opts.Substitutes.TryGetValue("RequestType", out val) && Enum.TryParse(val, out RequestType type)
+                ? HumanizeReturnType(type)
+                : string.Empty;
         }
 
-        public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s, UserNotificationPreferences pref)
+        private void LoadCommon(BaseRequest req, CustomizationSettings s, UserNotificationPreferences pref)
         {
-            LoadIssues(opts);
-            RequestId = req?.Id.ToString();
-            ProviderId = req?.ParentRequest?.ExternalProviderId.ToString() ?? string.Empty;
-            string title;
-            if (req == null)
-            {
-                opts.Substitutes.TryGetValue("Title", out title);
-            }
-            else
-            {
-                title = req?.ParentRequest.Title;
-            }
+            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s.ApplicationName;
+            ApplicationUrl = s?.ApplicationUrl.HasValue() ?? false ? s.ApplicationUrl : string.Empty;
+            AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
             DenyReason = req?.DeniedReason;
-            ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
-            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
+            RequestId = req?.Id.ToString();
             RequestedUser = req?.RequestedUser?.UserName;
-            if (UserName.IsNullOrEmpty())
-            {
-                // Can be set if it's an issue
-                UserName = req?.RequestedUser?.UserName;
-            }
-            AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
-            if (Alias.IsNullOrEmpty())
-            {
-                Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
-            }
-            if (pref != null)
-            {
-                UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
-            }
-            Title = title;
             RequestedDate = req?.RequestedDate.ToString("D");
+
             if (Type.IsNullOrEmpty())
             {
-                Type = req?.RequestType.Humanize();
+                Type = HumanizeReturnType(req?.RequestType);
             }
 
-            Overview = req?.ParentRequest.Overview;
-            Year = req?.ParentRequest.ReleaseDate.Year.ToString();
-            if (req?.RequestType == RequestType.Movie)
-            {
-                PosterImage = string.Format((req?.ParentRequest.PosterPath ?? string.Empty).StartsWith("/", StringComparison.InvariantCultureIgnoreCase)
-                    ? "https://image.tmdb.org/t/p/w300{0}" : "https://image.tmdb.org/t/p/w300/{0}", req?.ParentRequest.PosterPath);
-            }
-            else
+            if (UserName.IsNullOrEmpty())
             {
-                PosterImage = req?.ParentRequest.PosterPath;
+                UserName = req?.RequestedUser?.UserName;
             }
-            AdditionalInformation = opts.AdditionalInformation;
-            // DO Episode and Season Lists
 
-            var episodes = req?.SeasonRequests?.SelectMany(x => x.Episodes) ?? new List<EpisodeRequests>();
-            var seasons = req?.SeasonRequests?.OrderBy(x => x.SeasonNumber).ToList() ?? new List<SeasonRequests>();
-            var orderedEpisodes = episodes.OrderBy(x => x.EpisodeNumber).ToList();
-            var epSb = new StringBuilder();
-            var seasonSb = new StringBuilder();
-            for (var i = 0; i < orderedEpisodes.Count; i++)
+            if (Alias.IsNullOrEmpty())
             {
-                var ep = orderedEpisodes[i];
-                if (i < orderedEpisodes.Count - 1)
-                {
-                    epSb.Append($"{ep.EpisodeNumber},");
-                }
-                else
-                {
-                    epSb.Append($"{ep.EpisodeNumber}");
-                }
+                Alias = req?.RequestedUser?.Alias.HasValue() ?? false
+                    ? req.RequestedUser?.Alias
+                    : req?.RequestedUser?.UserName;
             }
 
-            for (var i = 0; i < seasons.Count; i++)
+            if (pref != null)
             {
-                var ep = seasons[i];
-                if (i < seasons.Count - 1)
-                {
-                    seasonSb.Append($"{ep.SeasonNumber},");
-                }
-                else
-                {
-                    seasonSb.Append($"{ep.SeasonNumber}");
-                }
+                UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
             }
-
-            EpisodesList = epSb.ToString();
-            SeasonsList = seasonSb.ToString();
-            CalculateRequestStatus(req);
         }
 
-        public void Setup(OmbiUser user, CustomizationSettings s)
+        private static string HumanizeReturnType(RequestType? requestType)
         {
-            ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
-            ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
-            RequestedUser = user.UserName;
-            Alias = user.UserAlias;
-            UserName = user.UserName;
+            return requestType switch
+            {
+                null => string.Empty,
+                RequestType.TvShow => "TV Show",
+                _ => requestType.Humanize()
+            };
         }
 
-        private void LoadIssues(NotificationOptions opts)
+        private void LoadTitle(NotificationOptions opts, BaseRequest req)
         {
-            var val = string.Empty;
-            IssueDescription = opts.Substitutes.TryGetValue("IssueDescription", out val) ? val : string.Empty;
-            IssueCategory = opts.Substitutes.TryGetValue("IssueCategory", out val) ? val : string.Empty;
-            IssueStatus = opts.Substitutes.TryGetValue("IssueStatus", out val) ? val : string.Empty;
-            IssueSubject = opts.Substitutes.TryGetValue("IssueSubject", out val) ? val : string.Empty;
-            NewIssueComment = opts.Substitutes.TryGetValue("NewIssueComment", out val) ? val : string.Empty;
-            UserName = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
-            Alias = opts.Substitutes.TryGetValue("IssueUserAlias", out val) ? val : string.Empty;
-            Type = opts.Substitutes.TryGetValue("RequestType", out val) ? val.Humanize() : string.Empty;
+            switch (req)
+            {
+                case null:
+                    opts.Substitutes.TryGetValue("Title", out string title);
+                    Title = title;
+                    break;
+                case ChildRequests tvShowRequest:
+                    Title = tvShowRequest.ParentRequest?.Title;
+                    break;
+                default:
+                    Title = req.Title;
+                    break;
+            }
         }
 
         private void CalculateRequestStatus(BaseRequest req)
@@ -248,16 +184,19 @@ namespace Ombi.Notifications
                     RequestStatus = "Available";
                     return;
                 }
+
                 if (req.Denied ?? false)
                 {
                     RequestStatus = "Denied";
                     return;
                 }
+
                 if (!req.Available && req.Approved)
                 {
                     RequestStatus = "Processing Request";
                     return;
                 }
+
                 RequestStatus = "Pending Approval";
             }
         }
@@ -298,36 +237,36 @@ namespace Ombi.Notifications
 
         public Dictionary<string, string> Curlys => new Dictionary<string, string>
         {
-            {nameof(RequestId), RequestId },
-            {nameof(RequestedUser), RequestedUser },
-            {nameof(Title), Title },
-            {nameof(RequestedDate), RequestedDate },
-            {nameof(Type), Type },
-            {nameof(AdditionalInformation), AdditionalInformation },
-            {nameof(LongDate),LongDate},
-            {nameof(ShortDate),ShortDate},
-            {nameof(LongTime),LongTime},
-            {nameof(ShortTime),ShortTime},
-            {nameof(Overview),Overview},
-            {nameof(Year),Year},
-            {nameof(EpisodesList),EpisodesList},
-            {nameof(SeasonsList),SeasonsList},
-            {nameof(PosterImage),PosterImage},
-            {nameof(ApplicationName),ApplicationName},
-            {nameof(ApplicationUrl),ApplicationUrl},
-            {nameof(IssueDescription),IssueDescription},
-            {nameof(IssueCategory),IssueCategory},
-            {nameof(IssueStatus),IssueStatus},
-            {nameof(IssueSubject),IssueSubject},
-            {nameof(NewIssueComment),NewIssueComment},
-            {nameof(IssueUser),IssueUser},
-            {nameof(UserName),UserName},
-            {nameof(Alias),Alias},
-            {nameof(UserPreference),UserPreference},
-            {nameof(DenyReason),DenyReason},
-            {nameof(AvailableDate),AvailableDate},
-            {nameof(RequestStatus),RequestStatus},
-            {nameof(ProviderId),ProviderId},
+            { nameof(RequestId), RequestId },
+            { nameof(RequestedUser), RequestedUser },
+            { nameof(Title), Title },
+            { nameof(RequestedDate), RequestedDate },
+            { nameof(Type), Type },
+            { nameof(AdditionalInformation), AdditionalInformation },
+            { nameof(LongDate), LongDate },
+            { nameof(ShortDate), ShortDate },
+            { nameof(LongTime), LongTime },
+            { nameof(ShortTime), ShortTime },
+            { nameof(Overview), Overview },
+            { nameof(Year), Year },
+            { nameof(EpisodesList), EpisodesList },
+            { nameof(SeasonsList), SeasonsList },
+            { nameof(PosterImage), PosterImage },
+            { nameof(ApplicationName), ApplicationName },
+            { nameof(ApplicationUrl), ApplicationUrl },
+            { nameof(IssueDescription), IssueDescription },
+            { nameof(IssueCategory), IssueCategory },
+            { nameof(IssueStatus), IssueStatus },
+            { nameof(IssueSubject), IssueSubject },
+            { nameof(NewIssueComment), NewIssueComment },
+            { nameof(IssueUser), IssueUser },
+            { nameof(UserName), UserName },
+            { nameof(Alias), Alias },
+            { nameof(UserPreference), UserPreference },
+            { nameof(DenyReason), DenyReason },
+            { nameof(AvailableDate), AvailableDate },
+            { nameof(RequestStatus), RequestStatus },
+            { nameof(ProviderId), ProviderId },
         };
     }
 }
\ No newline at end of file

From ea54f52325f058e3f57c74e9606b5aa3b72b2f9b Mon Sep 17 00:00:00 2001
From: Emil Kitti <emil@cx.gs>
Date: Wed, 31 Mar 2021 19:49:16 +0200
Subject: [PATCH 02/39] fixes movie keywords

---
 src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs b/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs
index edc0c7e23..1ab33990e 100644
--- a/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs
+++ b/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs
@@ -97,6 +97,8 @@ namespace Ombi.Api.TheMovieDb.Models
     {
         [JsonProperty("results")]
         public List<KeywordsValue> KeywordsValue { get; set; }
+        [JsonProperty("keywords")]
+        private List<KeywordsValue> _movieKeywordValue { set { KeywordsValue = value; }}
     }
 
     public class KeywordsValue

From b59a792fdf722854200cce52d11eaa87a970c02f Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 1 Apr 2021 23:21:13 +0100
Subject: [PATCH 03/39] Added unit tests around the notification subsuitution

---
 .../NotificationMessageCurlysTests.cs         | 342 ++++++++++++++++++
 .../Ombi.Notifications.Tests.csproj           |   1 +
 2 files changed, 343 insertions(+)
 create mode 100644 src/Ombi.Notifications.Tests/NotificationMessageCurlysTests.cs

diff --git a/src/Ombi.Notifications.Tests/NotificationMessageCurlysTests.cs b/src/Ombi.Notifications.Tests/NotificationMessageCurlysTests.cs
new file mode 100644
index 000000000..655ffeb23
--- /dev/null
+++ b/src/Ombi.Notifications.Tests/NotificationMessageCurlysTests.cs
@@ -0,0 +1,342 @@
+using AutoFixture;
+using NUnit.Framework;
+using Ombi.Notifications.Models;
+using Ombi.Settings.Settings.Models;
+using Ombi.Store.Entities;
+using Ombi.Store.Entities.Requests;
+using Ombi.Store.Repository.Requests;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ombi.Notifications.Tests
+{
+    public class NotificationMessageCurlysTests
+    {
+        private NotificationMessageCurlys sut { get; set; }
+        private Fixture F { get; set; }
+
+        [SetUp]
+        public void Setup()
+        {
+            F = new Fixture();
+            F.Behaviors.OfType<ThrowingRecursionBehavior>().ToList()
+                .ForEach(b => F.Behaviors.Remove(b));
+            F.Behaviors.Add(new OmitOnRecursionBehavior());
+            sut = new NotificationMessageCurlys();
+        }
+
+        [Test]
+        public void MovieNotificationTests()
+        {
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<MovieRequests>()
+                .With(x => x.RequestType, RequestType.Movie)
+                .With(x => x.Available, true)
+                .Create();
+            var customization = new CustomizationSettings
+            {
+                ApplicationUrl = "url",
+                ApplicationName = "name"
+            };
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+
+            Assert.That(req.Id.ToString(), Is.EqualTo(sut.RequestId));
+            Assert.That(req.TheMovieDbId.ToString(), Is.EqualTo(sut.ProviderId));
+            Assert.That(req.Title.ToString(), Is.EqualTo(sut.Title));
+            Assert.That(req.RequestedUser.UserName, Is.EqualTo(sut.RequestedUser));
+            Assert.That(req.RequestedUser.Alias, Is.EqualTo(sut.Alias));
+            Assert.That(req.RequestedDate.ToString("D"), Is.EqualTo(sut.RequestedDate));
+            Assert.That("Movie", Is.EqualTo(sut.Type));
+            Assert.That(req.Overview, Is.EqualTo(sut.Overview));
+            Assert.That(req.ReleaseDate.Year.ToString(), Is.EqualTo(sut.Year));
+            Assert.That(req.DeniedReason, Is.EqualTo(sut.DenyReason));
+            Assert.That(req.MarkedAsAvailable?.ToString("D"), Is.EqualTo(sut.AvailableDate));
+            Assert.That("https://image.tmdb.org/t/p/w300/" + req.PosterPath, Is.EqualTo(sut.PosterImage));
+            Assert.That(req.DeniedReason, Is.EqualTo(sut.DenyReason));
+            Assert.That(req.RequestedUser.Alias, Is.EqualTo(sut.UserPreference));
+            Assert.That(string.Empty, Is.EqualTo(sut.AdditionalInformation));
+            Assert.That("Available", Is.EqualTo(sut.RequestStatus));
+            Assert.That("url", Is.EqualTo(sut.ApplicationUrl));
+            Assert.That("name", Is.EqualTo(sut.ApplicationName));
+        }
+
+        [Test]
+        public void MovieIssueNotificationTests()
+        {
+            var notificationOptions = new NotificationOptions
+            {
+                Substitutes = new Dictionary<string, string>
+                {
+                    { "IssueDescription", "Desc" },
+                    { "IssueCategory", "Cat" },
+                    { "IssueStatus", "state" },
+                    { "IssueSubject", "sub" },
+                    { "NewIssueComment", "a" },
+                    { "IssueUser", "User" },
+                    { "IssueUserAlias", "alias" },
+                    { "RequestType", "Movie" },
+                }
+            };
+            var req = F.Build<MovieRequests>()
+                .With(x => x.RequestType, RequestType.Movie)
+                .Create();
+            var customization = new CustomizationSettings();
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+
+            Assert.That("Desc", Is.EqualTo(sut.IssueDescription));
+            Assert.That("Cat", Is.EqualTo(sut.IssueCategory));
+            Assert.That("state", Is.EqualTo(sut.IssueStatus));
+            Assert.That("a", Is.EqualTo(sut.NewIssueComment));
+            Assert.That("User", Is.EqualTo(sut.UserName));
+            Assert.That("alias", Is.EqualTo(sut.Alias));
+            Assert.That("Movie", Is.EqualTo(sut.Type));
+        }
+
+        [Test]
+        public void MovieNotificationUserPreferences()
+        {
+            var notificationOptions = new NotificationOptions
+            {
+                AdditionalInformation = "add"
+            };
+            var req = F.Build<MovieRequests>()
+                .With(x => x.RequestType, RequestType.Movie)
+                .Without(x => x.MarkedAsAvailable)
+                .Create();
+            var customization = new CustomizationSettings();
+            var userPrefs = new UserNotificationPreferences
+            {
+                Value = "PrefValue"
+            };
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+
+            Assert.That("PrefValue", Is.EqualTo(sut.UserPreference));
+            Assert.That(string.Empty, Is.EqualTo(sut.AvailableDate));
+            Assert.That("add", Is.EqualTo(sut.AdditionalInformation));
+        }
+
+        [TestCaseSource(nameof(RequestStatusData))]
+        public string MovieNotificationTests_RequestStatus(bool available, bool denied, bool approved)
+        {
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<MovieRequests>()
+                .With(x => x.RequestType, RequestType.Movie)
+                .With(x => x.Available, available)
+                .With(x => x.Denied, denied)
+                .With(x => x.Approved, approved)
+                .Create();
+            var customization = new CustomizationSettings();
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+            return sut.RequestStatus;
+        }
+
+        private static IEnumerable<TestCaseData> RequestStatusData
+        {
+            get
+            {
+                yield return new TestCaseData(true, false, false).Returns("Available");
+                yield return new TestCaseData(false, true, false).Returns("Denied");
+                yield return new TestCaseData(false, false, true).Returns("Processing Request");
+                yield return new TestCaseData(false, false, false).Returns("Pending Approval");
+            }
+        }
+
+
+        [Test]
+        public void NewsletterTests()
+        {
+            var customization = new CustomizationSettings
+            {
+                ApplicationUrl = "url",
+                ApplicationName = "name"
+            };
+            sut.SetupNewsletter(customization);
+
+            Assert.That("url", Is.EqualTo(sut.ApplicationUrl));
+            Assert.That("name", Is.EqualTo(sut.ApplicationName));
+        }
+
+        [Test]
+        public void MusicNotificationTests()
+        {
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<AlbumRequest>()
+                .With(x => x.RequestType, RequestType.Album)
+                .With(x => x.Available, true)
+                .Create();
+            var customization = new CustomizationSettings
+            {
+                ApplicationUrl = "url",
+                ApplicationName = "name"
+            };
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+
+            Assert.That(req.Id.ToString(), Is.EqualTo(sut.RequestId));
+            Assert.That(req.ForeignArtistId.ToString(), Is.EqualTo(sut.ProviderId));
+            Assert.That(req.Title.ToString(), Is.EqualTo(sut.Title));
+            Assert.That(req.RequestedUser.UserName, Is.EqualTo(sut.RequestedUser));
+            Assert.That(req.RequestedUser.Alias, Is.EqualTo(sut.Alias));
+            Assert.That(req.RequestedDate.ToString("D"), Is.EqualTo(sut.RequestedDate));
+            Assert.That("Album", Is.EqualTo(sut.Type));
+            Assert.That(req.ReleaseDate.Year.ToString(), Is.EqualTo(sut.Year));
+            Assert.That(req.DeniedReason, Is.EqualTo(sut.DenyReason));
+            Assert.That(req.MarkedAsAvailable?.ToString("D"), Is.EqualTo(sut.AvailableDate));
+            Assert.That(req.Cover, Is.EqualTo(sut.PosterImage));
+            Assert.That(req.DeniedReason, Is.EqualTo(sut.DenyReason));
+            Assert.That(req.RequestedUser.Alias, Is.EqualTo(sut.UserPreference));
+            Assert.That(string.Empty, Is.EqualTo(sut.AdditionalInformation));
+            Assert.That("Available", Is.EqualTo(sut.RequestStatus));
+            Assert.That("url", Is.EqualTo(sut.ApplicationUrl));
+            Assert.That("name", Is.EqualTo(sut.ApplicationName));
+        }
+
+        [TestCaseSource(nameof(RequestStatusData))]
+        public string MusicNotificationTests_RequestStatus(bool available, bool denied, bool approved)
+        {
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<AlbumRequest>()
+                .With(x => x.RequestType, RequestType.Album)
+                .With(x => x.Available, available)
+                .With(x => x.Denied, denied)
+                .With(x => x.Approved, approved)
+                .Create();
+            var customization = new CustomizationSettings();
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+            return sut.RequestStatus;
+        }
+
+        [Test]
+        public void TvNotificationTests()
+        {
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<ChildRequests>()
+                .With(x => x.RequestType, RequestType.TvShow)
+                .With(x => x.Available, true)
+                .Create();
+            var customization = new CustomizationSettings
+            {
+                ApplicationUrl = "url",
+                ApplicationName = "name"
+            };
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+
+            Assert.That(req.Id.ToString(), Is.EqualTo(sut.RequestId));
+            Assert.That(req.ParentRequest.ExternalProviderId.ToString(), Is.EqualTo(sut.ProviderId));
+            Assert.That(req.ParentRequest.Title.ToString(), Is.EqualTo(sut.Title));
+            Assert.That(req.RequestedUser.UserName, Is.EqualTo(sut.RequestedUser));
+            Assert.That(req.RequestedUser.Alias, Is.EqualTo(sut.Alias));
+            Assert.That(req.RequestedDate.ToString("D"), Is.EqualTo(sut.RequestedDate));
+            Assert.That("TV Show", Is.EqualTo(sut.Type));
+            Assert.That(req.ParentRequest.Overview, Is.EqualTo(sut.Overview));
+            Assert.That(req.ParentRequest.ReleaseDate.Year.ToString(), Is.EqualTo(sut.Year));
+            Assert.That(req.DeniedReason, Is.EqualTo(sut.DenyReason));
+            Assert.That(req.MarkedAsAvailable?.ToString("D"), Is.EqualTo(sut.AvailableDate));
+            Assert.That("https://image.tmdb.org/t/p/w300/" + req.ParentRequest.PosterPath, Is.EqualTo(sut.PosterImage));
+            Assert.That(req.DeniedReason, Is.EqualTo(sut.DenyReason));
+            Assert.That(req.RequestedUser.Alias, Is.EqualTo(sut.UserPreference));
+            Assert.That(null, Is.EqualTo(sut.AdditionalInformation));
+            Assert.That("Available", Is.EqualTo(sut.RequestStatus));
+            Assert.That("url", Is.EqualTo(sut.ApplicationUrl));
+            Assert.That("name", Is.EqualTo(sut.ApplicationName));
+        }
+
+        [Test]
+        public void TvNotification_EpisodeList()
+        {
+            var episodeRequests = new List<EpisodeRequests>
+            {
+                new EpisodeRequests
+                {
+                    EpisodeNumber = 1,
+                },
+                new EpisodeRequests
+                {
+                    EpisodeNumber = 2,
+                },
+                new EpisodeRequests
+                {
+                    EpisodeNumber = 3,
+                }
+            };
+            var seasonRequests = new List<SeasonRequests>
+            {
+                new SeasonRequests
+                {
+                    Episodes = episodeRequests,
+                    SeasonNumber = 1
+                },
+                new SeasonRequests
+                {
+                    Episodes = episodeRequests,
+                    SeasonNumber = 2
+                },
+                new SeasonRequests
+                {
+                    Episodes = episodeRequests,
+                    SeasonNumber = 3
+                }
+            };
+
+
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<ChildRequests>()
+                .With(x => x.RequestType, RequestType.TvShow)
+                .With(x => x.Available, true)
+                .With(x => x.SeasonRequests, seasonRequests)
+                .Create();
+            var customization = new CustomizationSettings
+            {
+                ApplicationUrl = "url",
+                ApplicationName = "name"
+            };
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+
+            Assert.That(sut.EpisodesList, Is.EqualTo("1,1,1,2,2,2,3,3,3"));
+            Assert.That(sut.SeasonsList, Is.EqualTo("1,2,3"));
+
+        }
+
+        [TestCaseSource(nameof(RequestStatusData))]
+        public string TvShowNotificationTests_RequestStatus(bool available, bool denied, bool approved)
+        {
+            var notificationOptions = new NotificationOptions();
+            var req = F.Build<ChildRequests>()
+                .With(x => x.RequestType, RequestType.TvShow)
+                .With(x => x.Available, available)
+                .With(x => x.Denied, denied)
+                .With(x => x.Approved, approved)
+                .Create();
+            var customization = new CustomizationSettings();
+            var userPrefs = new UserNotificationPreferences();
+            sut.Setup(notificationOptions, req, customization, userPrefs);
+            return sut.RequestStatus;
+        }
+
+
+        [Test]
+        public void EmailSetupTests()
+        {
+            var user = F.Create<OmbiUser>();
+            var customization = new CustomizationSettings
+            {
+                ApplicationUrl = "url",
+                ApplicationName = "name"
+            };
+            sut.Setup(user, customization);
+
+            Assert.That(user.UserName, Is.EqualTo(sut.RequestedUser));
+            Assert.That(user.UserName, Is.EqualTo(sut.UserName));
+            Assert.That(user.UserAlias, Is.EqualTo(sut.Alias));
+            Assert.That(sut.ApplicationUrl, Is.EqualTo("url"));
+            Assert.That(sut.ApplicationName, Is.EqualTo("name"));
+        }
+
+    }
+}
diff --git a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj
index 469611ac8..4964e8078 100644
--- a/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj
+++ b/src/Ombi.Notifications.Tests/Ombi.Notifications.Tests.csproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AutoFixture" Version="4.11.0" />
     <PackageReference Include="Nunit" Version="3.11.0" />
     <PackageReference Include="NUnit.ConsoleRunner" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />

From 9703d370561bab1b128b65084dcaf66727e2666b Mon Sep 17 00:00:00 2001
From: Victor Usoltsev <bernarden@mail.ru>
Date: Mon, 5 Apr 2021 00:00:19 +1200
Subject: [PATCH 04/39] User preferences page style improvements.

---
 .../user-preference.component.html            | 34 ++++++-------------
 .../user-preference.component.scss            | 17 ++++++++--
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
index e4c7758f6..e5fbc6c2f 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
@@ -1,30 +1,26 @@
 <div class="small-middle-container" *ngIf="username">
-  <div class="row h-100">
-    <div class="col-1">
-      <img class="profile-img" [src]="getProfileImage()">
-    </div>
-    <div class="col-11 align-middle">
-      <h2 id="usernameTitle">{{username}} <small id="emailTitle" *ngIf="user.emailAddress">({{user.emailAddress}})</small></h2>
-
-    </div>
+  <div class="d-flex">
+    <img class="profile-img" [src]="getProfileImage()">
+    <h2 id="usernameTitle">{{username}} 
+      <small id="emailTitle" *ngIf="user.emailAddress">({{user.emailAddress}})</small>
+    </h2>
   </div>
 
-
   <mat-tab-group>
     <mat-tab label="Profile">
       <div class="tab-content">
 
-        <div class="row">
-          <div class="col-1">
+        <div class="row user-type-row">
+          <div class="col-5 col-sm-3 col-md-2">
             User Type:
           </div>
-          <div class="col-11">
+          <div class="col-7 col-sm-9 col-md-10">
             {{UserType[user.userType]}}
           </div>
         </div>
 
         <div class="row">
-          <div class="col-4">
+          <div class="col-12 col-sm-6 col-xl-5">
             <div>
               <small>{{'UserPreferences.LanguageDescription' | translate}}</small>
               <br>
@@ -38,14 +34,9 @@
                 </mat-select>
               </mat-form-field>
             </div>
-            <div>
-
-            </div>
           </div>
-          <div class="col-1"></div>
 
-
-          <div class="col-4">
+          <div class="col-12 col-sm-6 col-xl-5">
             <div>
               <small>{{'UserPreferences.StreamingCountryDescription' | translate}}</small>
               <br>
@@ -58,13 +49,8 @@
                 </mat-select>
               </mat-form-field>
             </div>
-            <div>
-            </div>
           </div>
         </div>
-
-
-
       </div>
 
     </mat-tab>
diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.scss b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.scss
index faaef4fd5..b7085d2dc 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.scss
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.scss
@@ -5,9 +5,22 @@
 }
 
 .profile-img {
-    border-radius: 100%;
     width: 75px;
+    height: 75px; 
+    margin-right: 20px;
+    border-radius: 100%;
+}
+
+#usernameTitle {
+    margin: 0;
+    align-self: center;
+    overflow-wrap: anywhere;
 }
+
+.user-type-row {
+    padding-bottom: 1.25em;
+}
+
 .my-auto {
     margin-top: auto;
     margin-bottom: auto;
@@ -19,5 +32,5 @@
 }
 
 .tab-content {
-    margin-top: 1%;
+    margin-top: 1.5em;
 }
\ No newline at end of file

From 81f410d7828ecbe17f26241aa493b02c6f50b662 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 4 Apr 2021 23:35:38 +0100
Subject: [PATCH 05/39] Ombi will now tell you when there is an update
 available in the settings, clicking that will also provide you with the
 changelog and links to manually download the binaries.

Also removed references to the custom HTTP client implimentation and we now use the inbuilt IHttpClientFactory, this means we have removed the "Ignore Certificate Errors" option in Ombi as it's no longer needed.
---
 src/Ombi.Api/Api.cs                           |   4 +-
 src/Ombi.Api/IOmbiHttpClient.cs               |  14 --
 src/Ombi.Api/Ombi.Api.csproj                  |   1 +
 src/Ombi.Api/OmbiHttpClient.cs                | 110 -------------
 src/Ombi.DependencyInjection/IocExtensions.cs |  17 +-
 .../Ombi.DependencyInjection.csproj           |   1 +
 .../Ombi/Interfaces/IOmbiAutomaticUpdater.cs  |   2 +-
 .../Jobs/Ombi/OmbiAutomaticUpdater.cs         |   6 +-
 src/Ombi.Schedule/Processor/AppVeyor.cs       |   4 +-
 .../Processor/ChangeLogProcessor.cs           | 153 +++---------------
 .../Processor/IChangeLogProcessor.cs          |   2 +-
 .../Settings/Models/OmbiSettings.cs           |   1 -
 .../ClientApp/src/app/interfaces/ISettings.ts |  17 +-
 .../src/app/services/update.service.ts        |  18 +++
 .../app/settings/about/about.component.html   |   4 +-
 .../src/app/settings/about/about.component.ts |  30 ++--
 .../about/update-dialog.component.html        |  28 ++++
 .../about/update-dialog.component.scss        |  40 +++++
 .../settings/about/update-dialog.component.ts |  16 ++
 .../src/app/settings/ombi/ombi.component.html |   5 -
 .../src/app/settings/ombi/ombi.component.ts   |   1 -
 .../src/app/settings/settings.module.ts       |   8 +-
 src/Ombi/Controllers/V1/JobController.cs      |  12 +-
 src/Ombi/Controllers/V1/UpdateController.cs   |   6 +-
 src/Ombi/Ombi.csproj                          |   2 +
 src/Ombi/Program.cs                           |   7 +-
 src/Ombi/databadse.json                       |  14 ++
 27 files changed, 220 insertions(+), 303 deletions(-)
 delete mode 100644 src/Ombi.Api/IOmbiHttpClient.cs
 delete mode 100644 src/Ombi.Api/OmbiHttpClient.cs
 create mode 100644 src/Ombi/ClientApp/src/app/services/update.service.ts
 create mode 100644 src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
 create mode 100644 src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.scss
 create mode 100644 src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.ts
 create mode 100644 src/Ombi/databadse.json

diff --git a/src/Ombi.Api/Api.cs b/src/Ombi.Api/Api.cs
index 764da5a13..7a8e7678b 100644
--- a/src/Ombi.Api/Api.cs
+++ b/src/Ombi.Api/Api.cs
@@ -16,14 +16,14 @@ namespace Ombi.Api
 {
     public class Api : IApi
     {
-        public Api(ILogger<Api> log, IOmbiHttpClient client)
+        public Api(ILogger<Api> log, HttpClient client)
         {
             Logger = log;
             _client = client;
         }
 
         private ILogger<Api> Logger { get; }
-        private readonly IOmbiHttpClient _client;
+        private readonly HttpClient _client;
 
         public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
         {
diff --git a/src/Ombi.Api/IOmbiHttpClient.cs b/src/Ombi.Api/IOmbiHttpClient.cs
deleted file mode 100644
index 1f6ff9514..000000000
--- a/src/Ombi.Api/IOmbiHttpClient.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ombi.Api
-{
-    public interface IOmbiHttpClient
-    {
-        Task<HttpResponseMessage> SendAsync(HttpRequestMessage request);
-        Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken);
-        Task<string> GetStringAsync(Uri requestUri);
-    }
-}
\ No newline at end of file
diff --git a/src/Ombi.Api/Ombi.Api.csproj b/src/Ombi.Api/Ombi.Api.csproj
index 98da29c2a..91821c83b 100644
--- a/src/Ombi.Api/Ombi.Api.csproj
+++ b/src/Ombi.Api/Ombi.Api.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Polly" Version="7.1.0" />
diff --git a/src/Ombi.Api/OmbiHttpClient.cs b/src/Ombi.Api/OmbiHttpClient.cs
deleted file mode 100644
index 978476cf7..000000000
--- a/src/Ombi.Api/OmbiHttpClient.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2017 Jamie Rees
-//    File: OmbiHttpClient.cs
-//    Created By: Jamie Rees
-//   
-//    Permission is hereby granted, free of charge, to any person obtaining
-//    a copy of this software and associated documentation files (the
-//    "Software"), to deal in the Software without restriction, including
-//    without limitation the rights to use, copy, modify, merge, publish,
-//    distribute, sublicense, and/or sell copies of the Software, and to
-//    permit persons to whom the Software is furnished to do so, subject to
-//    the following conditions:
-//   
-//    The above copyright notice and this permission notice shall be
-//    included in all copies or substantial portions of the Software.
-//   
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//  ************************************************************************/
-#endregion
-
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Ombi.Core.Settings;
-using Ombi.Helpers;
-using Ombi.Settings.Settings.Models;
-
-namespace Ombi.Api
-{
-    /// <summary>
-    /// The purpose of this class is simple, keep one instance of the HttpClient in play.
-    /// There are many articles related to when using multiple HttpClient's keeping the socket in a WAIT state
-    /// https://blogs.msdn.microsoft.com/alazarev/2017/12/29/disposable-finalizers-and-httpclient/
-    /// https://aspnetmonsters.com/2016/08/2016-08-27-httpclientwrong/
-    /// </summary>
-    public class OmbiHttpClient : IOmbiHttpClient
-    {
-        public OmbiHttpClient(ICacheService cache, ISettingsService<OmbiSettings> s)
-        {
-            _cache = cache;
-            _settings = s;
-            _runtimeVersion = AssemblyHelper.GetRuntimeVersion();
-        }
-
-        private static HttpClient _client;
-        private static HttpMessageHandler _handler;
-
-        private readonly ICacheService _cache;
-        private readonly ISettingsService<OmbiSettings> _settings;
-        private readonly string _runtimeVersion;
-
-
-        public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request)
-        {
-            await Setup();
-            return await _client.SendAsync(request);
-        }
-
-        public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            await Setup();
-            return await _client.SendAsync(request, cancellationToken);
-        }
-
-        public async Task<string> GetStringAsync(Uri requestUri)
-        {
-            await Setup();
-            return await _client.GetStringAsync(requestUri);
-        }
-
-        private async Task Setup()
-        {
-            if (_client == null)
-            {
-                if (_handler == null)
-                {
-                    // Get the handler
-                    _handler = await GetHandler();
-                }
-                _client = new HttpClient(_handler);
-                _client.DefaultRequestHeaders.Add("User-Agent", $"Ombi/{_runtimeVersion} (https://ombi.io/)");
-            }
-        }
-
-        private async Task<HttpMessageHandler> GetHandler()
-        {
-            if (_cache == null)
-            {
-                return new HttpClientHandler();
-            }
-            var settings = await _cache.GetOrAdd(CacheKeys.OmbiSettings, async () => await _settings.GetSettingsAsync(), DateTime.Now.AddHours(1));
-            if (settings.IgnoreCertificateErrors)
-            {
-                return new HttpClientHandler
-                {
-                    ServerCertificateCustomValidationCallback = (message, certificate2, arg3, arg4) => true,
-                };
-            }
-            return new HttpClientHandler();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Ombi.DependencyInjection/IocExtensions.cs b/src/Ombi.DependencyInjection/IocExtensions.cs
index ef9c9230c..73a69203a 100644
--- a/src/Ombi.DependencyInjection/IocExtensions.cs
+++ b/src/Ombi.DependencyInjection/IocExtensions.cs
@@ -23,7 +23,6 @@ using Ombi.Notifications;
 using Ombi.Schedule;
 using Ombi.Schedule.Jobs;
 using Ombi.Settings.Settings;
-using Ombi.Store.Context;
 using Ombi.Store.Repository;
 using Ombi.Notifications.Agents;
 using Ombi.Schedule.Jobs.Radarr;
@@ -68,6 +67,8 @@ using Ombi.Api.MusicBrainz;
 using Ombi.Api.Twilio;
 using Ombi.Api.CloudService;
 using Ombi.Api.RottenTomatoes;
+using System.Net.Http;
+using Microsoft.Extensions.Logging;
 
 namespace Ombi.DependencyInjection
 {
@@ -119,14 +120,24 @@ namespace Ombi.DependencyInjection
 
         public static void RegisterHttp(this IServiceCollection services)
         {
+            var runtimeVersion = AssemblyHelper.GetRuntimeVersion();
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             services.AddScoped<IPrincipal>(sp => sp.GetService<IHttpContextAccessor>().HttpContext.User);
+            services.AddHttpClient("OmbiClient", client =>
+            {                
+                client.DefaultRequestHeaders.Add("User-Agent", $"Ombi/{runtimeVersion} (https://ombi.io/)");
+            }).ConfigurePrimaryHttpMessageHandler(() =>
+            {
+                var httpClientHandler = new HttpClientHandler();
+                httpClientHandler.ServerCertificateCustomValidationCallback = (message, certificate2, arg3, arg4) => true;
+
+                return httpClientHandler;
+            });
         }
 
         public static void RegisterApi(this IServiceCollection services)
         {
-            services.AddScoped<IApi, Api.Api>();
-            services.AddScoped<IOmbiHttpClient, OmbiHttpClient>(); // https://blogs.msdn.microsoft.com/alazarev/2017/12/29/disposable-finalizers-and-httpclient/
+            services.AddScoped<IApi, Api.Api>(s => new Api.Api(s.GetRequiredService<ILogger<Api.Api>>(), s.GetRequiredService<IHttpClientFactory>().CreateClient("OmbiClient")));
             services.AddTransient<IMovieDbApi, Api.TheMovieDb.TheMovieDbApi>();
             services.AddTransient<IPlexApi, PlexApi>();
             services.AddTransient<IEmbyApi, EmbyApi>();
diff --git a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj
index ed1e9e4a2..49d1dd194 100644
--- a/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj
+++ b/src/Ombi.DependencyInjection/Ombi.DependencyInjection.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="5.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IOmbiAutomaticUpdater.cs b/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IOmbiAutomaticUpdater.cs
index 85765b6c6..4c856c9cd 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IOmbiAutomaticUpdater.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/Interfaces/IOmbiAutomaticUpdater.cs
@@ -5,6 +5,6 @@ namespace Ombi.Schedule.Jobs.Ombi
     public interface IOmbiAutomaticUpdater : IBaseJob
     {
         string[] GetVersion();
-        Task<bool> UpdateAvailable(string branch, string currentVersion);
+        Task<bool> UpdateAvailable(string currentVersion);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
index e44728698..c2cf42441 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
@@ -49,10 +49,10 @@ namespace Ombi.Schedule.Jobs.Ombi
             var productArray = productVersion.Split('-');
             return productArray;
         }
-        public async Task<bool> UpdateAvailable(string branch, string currentVersion)
+        public async Task<bool> UpdateAvailable(string currentVersion)
         {
 
-            var updates = await Processor.Process(branch);
+            var updates = await Processor.Process();
             var serverVersion = updates.UpdateVersionString;
             return !serverVersion.Equals(currentVersion, StringComparison.CurrentCultureIgnoreCase);
 
@@ -88,7 +88,7 @@ namespace Ombi.Schedule.Jobs.Ombi
 
                 Logger.LogDebug(LoggingEvents.Updater, "Looking for updates now");
                 //TODO this fails because the branch = featureupdater when it should be feature/updater
-                var updates = await Processor.Process(branch);
+                var updates = await Processor.Process();
                 Logger.LogDebug(LoggingEvents.Updater, "Updates: {0}", updates);
 
 
diff --git a/src/Ombi.Schedule/Processor/AppVeyor.cs b/src/Ombi.Schedule/Processor/AppVeyor.cs
index 6bb4e001c..5a760c50c 100644
--- a/src/Ombi.Schedule/Processor/AppVeyor.cs
+++ b/src/Ombi.Schedule/Processor/AppVeyor.cs
@@ -109,8 +109,8 @@ namespace Ombi.Core.Processor
         public string UpdateVersionString { get; set; }
         public int UpdateVersion { get; set; }
         public DateTime UpdateDate { get; set; }
-
-        public List<ChangeLog> ChangeLogs { get; set; }
+        public bool UpdateAvailable { get; set; }
+        public string ChangeLogs { get; set; }
         public List<Downloads> Downloads { get; set; }
     }
 
diff --git a/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs b/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs
index a34bd89e1..89a6519e6 100644
--- a/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs
+++ b/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs
@@ -16,94 +16,41 @@ namespace Ombi.Schedule.Processor
 {
     public class ChangeLogProcessor : IChangeLogProcessor
     {
-        public ChangeLogProcessor(IApi api, IOmbiHttpClient client)
+        public ChangeLogProcessor(IApi api, IHttpClientFactory client)
         {
             _api = api;
-            _client = client;
+            _client = client.CreateClient("OmbiClient");
         }
 
         private readonly IApi _api;
-        private readonly IOmbiHttpClient _client;
+        private readonly HttpClient _client;
         private const string _changeLogUrl = "https://raw.githubusercontent.com/tidusjar/Ombi/{0}/CHANGELOG.md";
         private const string AppveyorApiUrl = "https://ci.appveyor.com/api";
         private string ChangeLogUrl(string branch) => string.Format(_changeLogUrl, branch);
 
-        public async Task<UpdateModel> Process(string branch)
+        public async Task<UpdateModel> Process()
         {
-            var masterBranch = branch.Equals("master", StringComparison.CurrentCultureIgnoreCase);
-            string githubChangeLog;
-
-            githubChangeLog = await _client.GetStringAsync(new Uri(ChangeLogUrl(branch)));
-
-
-            var html = Markdown.ToHtml(githubChangeLog);
-
-
-            var doc = new HtmlDocument();
-            doc.LoadHtml(html);
-
-            HtmlNode latestRelease;
-            if (masterBranch)
-            {
-                latestRelease = doc.DocumentNode.Descendants("h2")
-                    .FirstOrDefault(x => x.InnerText != "(unreleased)");
-            }
-            else
-            {
-                latestRelease = doc.DocumentNode.Descendants("h2")
-                    .FirstOrDefault(x => x.InnerText == "(unreleased)");
-
-                if (latestRelease == null)
-                {
-                    latestRelease = doc.DocumentNode.Descendants("h2")
-                        .FirstOrDefault(x => x.InnerText != "(unreleased)");
-                }
-            }
-
-            var newFeatureList = latestRelease.NextSibling.NextSibling.NextSibling.NextSibling;
-            var featuresString = newFeatureList.ChildNodes.Where(x => x.Name != "#text").Select(x => x.InnerText.Replace("\\n", "")).ToList();
-            var fixes = newFeatureList.NextSibling.NextSibling.NextSibling.NextSibling;
-            var fixesString = fixes.ChildNodes.Where(x => x.Name != "#text").Select(x => x.InnerText.Replace("\\n", "")).ToList();
-
-            // Cleanup
-            var featuresList = featuresString.Distinct().ToList();
-            var fixesList = fixesString.Distinct().ToList();
-
-            // Get release
             var release = new Release
             {
-                Version = latestRelease.InnerText,
-                Features = featuresList,
-                Fixes = fixesList,
                 Downloads = new List<Downloads>()
             };
 
-            if (masterBranch)
-            {
-                var releaseTag = latestRelease.InnerText.Substring(0, 9);
-                await GetGitubRelease(release, releaseTag);
-            }
-            else
-            {
-                // Get AppVeyor
-                await GetAppVeyorRelease(release, branch);
-            }
-
-
-            return TransformUpdate(release,!masterBranch);
-
+            await GetGitubRelease(release);
+            
+            return TransformUpdate(release);
         }
 
-        private UpdateModel TransformUpdate(Release release, bool develop)
+        private UpdateModel TransformUpdate(Release release)
         {
             var newUpdate = new UpdateModel
             {
-                UpdateVersionString = develop ? release.Version : release.Version.Substring(1,8),
-                UpdateVersion = release.Version == "(unreleased)" ? 0 : int.Parse(release.Version.Substring(1, 5).Replace(".", "")),
+                UpdateVersionString = release.Version,
+                UpdateVersion = int.Parse(release.Version.Substring(1, 5).Replace(".", "")),
                 UpdateDate = DateTime.Now,
-                ChangeLogs = new List<ChangeLog>(),
-                Downloads = new List<Downloads>()
-            };
+                ChangeLogs = release.Description,
+                Downloads = new List<Downloads>(),
+                UpdateAvailable = release.Version != AssemblyHelper.GetRuntimeVersion()
+        };
 
             foreach (var dl in release.Downloads)
             {
@@ -114,75 +61,16 @@ namespace Ombi.Schedule.Processor
                 });
             }
 
-            foreach (var f in release.Features)
-            {
-                var change = new ChangeLog
-                {
-                    Descripion = f,
-                    Type = "New",
-                };
-
-                newUpdate.ChangeLogs.Add(change);
-            }
-
-            foreach (var f in release.Fixes)
-            {
-                var change = new ChangeLog
-                {
-                    Descripion = f,
-                    Type = "Fixed",
-                };
-
-                newUpdate.ChangeLogs.Add(change);
-            }
-
             return newUpdate;
         }
 
-        private async Task GetAppVeyorRelease(Release release, string branch)
+        private async Task GetGitubRelease(Release release)
         {
-            var request = new Request($"/projects/tidusjar/requestplex/branch/{branch}", AppVeyorApi.AppveyorApiUrl, HttpMethod.Get);
-            request.ApplicationJsonContentType();
+            var client = new GitHubClient(Octokit.ProductHeaderValue.Parse("OmbiV4"));
 
-            var builds = await _api.Request<AppveyorBranchResult>(request);
-            var jobId = builds.build.jobs.FirstOrDefault()?.jobId ?? string.Empty;
+            var releases = await client.Repository.Release.GetAll("ombi-app", "ombi");
+            var latest = releases.OrderByDescending(x => x.CreatedAt).FirstOrDefault();
 
-            if (builds.build.finished == DateTime.MinValue || builds.build.status.Equals("failed"))
-            {
-                return;
-            }
-            release.Version = builds.build.version;
-            // get the artifacts
-            request = new Request($"/buildjobs/{jobId}/artifacts", AppVeyorApi.AppveyorApiUrl, HttpMethod.Get);
-            request.ApplicationJsonContentType();
-
-            var artifacts = await _api.Request<List<BuildArtifacts>>(request);
-
-            foreach (var item in artifacts)
-            {
-                var d = new Downloads
-                {
-                    Name = item.fileName,
-                    Url = $"{AppveyorApiUrl}/buildjobs/{jobId}/artifacts/{item.fileName}"
-                };
-                release.Downloads.Add(d);
-            }
-        }
-
-        private async Task GetGitubRelease(Release release, string releaseTag)
-        {
-            var client = new GitHubClient(Octokit.ProductHeaderValue.Parse("OmbiV3"));
-
-            var releases = await client.Repository.Release.GetAll("tidusjar", "ombi");
-            var latest = releases.FirstOrDefault(x => x.TagName.Equals(releaseTag, StringComparison.InvariantCultureIgnoreCase));
-            if (latest.Name.Contains("V2", CompareOptions.IgnoreCase))
-            {
-                latest = null;
-            }
-            if (latest == null)
-            {
-                latest = releases.OrderByDescending(x => x.CreatedAt).FirstOrDefault();
-            }
             foreach (var item in latest.Assets)
             {
                 var d = new Downloads
@@ -192,6 +80,8 @@ namespace Ombi.Schedule.Processor
                 };
                 release.Downloads.Add(d);
             }
+            release.Description = Markdown.ToHtml(latest.Body);
+            release.Version = latest.TagName;
         }
     }
     public class Release
@@ -199,8 +89,7 @@ namespace Ombi.Schedule.Processor
         public string Version { get; set; }
         public string CheckinVersion { get; set; }
         public List<Downloads> Downloads { get; set; }
-        public List<string> Features { get; set; }
-        public List<string> Fixes { get; set; }
+        public string Description { get; set; }
     }
 
     public class Downloads
diff --git a/src/Ombi.Schedule/Processor/IChangeLogProcessor.cs b/src/Ombi.Schedule/Processor/IChangeLogProcessor.cs
index 97780245f..434faedd2 100644
--- a/src/Ombi.Schedule/Processor/IChangeLogProcessor.cs
+++ b/src/Ombi.Schedule/Processor/IChangeLogProcessor.cs
@@ -4,6 +4,6 @@ namespace Ombi.Core.Processor
 {
     public interface IChangeLogProcessor
     {
-        Task<UpdateModel> Process(string branch);
+        Task<UpdateModel> Process();
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Settings/Settings/Models/OmbiSettings.cs b/src/Ombi.Settings/Settings/Models/OmbiSettings.cs
index 36b540026..6c622f2ce 100644
--- a/src/Ombi.Settings/Settings/Models/OmbiSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/OmbiSettings.cs
@@ -6,7 +6,6 @@
         public bool CollectAnalyticData { get; set; }
         public bool Wizard { get; set; }
         public string ApiKey { get; set; }
-        public bool IgnoreCertificateErrors { get; set; }
         public bool DoNotSendNotificationsForAutoApprove { get; set; }
         public bool HideRequestsUsers { get; set; }
         public bool DisableHealthChecks { get; set; }
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
index c5b29adff..7fa710248 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
@@ -12,7 +12,6 @@ export interface IOmbiSettings extends ISettings {
   collectAnalyticData: boolean;
   wizard: boolean;
   apiKey: string;
-  ignoreCertificateErrors: boolean;
   doNotSendNotificationsForAutoApprove: boolean;
   hideRequestsUsers: boolean;
   defaultLanguageCode: string;
@@ -285,3 +284,19 @@ export interface ITheMovieDbSettings extends ISettings {
     showAdultMovies: boolean;
     excludedKeywordIds: number[];
 }
+
+export interface IUpdateModel
+{
+  updateVersionString: string;
+  updateVersion: number;
+  updateDate: Date,
+  updateAvailable: boolean;
+  changeLogs: string;
+  downloads: IUpdateDonloads[];
+}
+
+export interface  IUpdateDonloads
+{
+    name: string;
+    url: string
+}
diff --git a/src/Ombi/ClientApp/src/app/services/update.service.ts b/src/Ombi/ClientApp/src/app/services/update.service.ts
new file mode 100644
index 000000000..d1e84cfaf
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/services/update.service.ts
@@ -0,0 +1,18 @@
+import { PlatformLocation, APP_BASE_HREF } from "@angular/common";
+import { Injectable, Inject } from "@angular/core";
+
+import { HttpClient } from "@angular/common/http";
+import { Observable } from "rxjs";
+
+import { ServiceHelpers } from "./service.helpers";
+import { IUpdateModel } from "../interfaces";
+
+@Injectable()
+export class UpdateService extends ServiceHelpers {
+    constructor(http: HttpClient, @Inject(APP_BASE_HREF) href:string) {
+        super(http, "/api/v1/Update/", href);
+    }
+    public checkForUpdate(): Observable<IUpdateModel> {
+        return this.http.get<IUpdateModel>(`${this.url}`, {headers: this.headers});
+    }
+}
diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.html b/src/Ombi/ClientApp/src/app/settings/about/about.component.html
index e6eb05cb4..f4872eda7 100644
--- a/src/Ombi/ClientApp/src/app/settings/about/about.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.html
@@ -13,8 +13,8 @@
     </div>
     <div class="mat-row">
       <div class="mat-cell">Version</div>
-      <div class="mat-cell">{{about.version}} <a [routerLink]="['/Settings/Update']" *ngIf="newUpdate"
-          style="color:#df691a"><b>(New Update Available)</b></a></div>
+      <div class="mat-cell">{{about.version}} <a (click)="openUpdate()" *ngIf="newUpdate"
+          style="color:#df691a; text-decoration: underline; cursor: pointer;"><b><i class="fas fa-code-branch"></i> (New Update Available)</b></a></div>
     </div>
 
     <!-- <div class="mat-row">
diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.ts b/src/Ombi/ClientApp/src/app/settings/about/about.component.ts
index c3fd4b056..688669c01 100644
--- a/src/Ombi/ClientApp/src/app/settings/about/about.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.ts
@@ -1,7 +1,10 @@
 import { Component, OnInit } from "@angular/core";
-import { IAbout } from "../../interfaces/ISettings";
-import { JobService, SettingsService, HubService, SystemService } from "../../services";
+import { IAbout, IUpdateModel } from "../../interfaces/ISettings";
+import { SettingsService, HubService, SystemService } from "../../services";
 import { IConnectedUser } from "../../interfaces";
+import { UpdateService } from "../../services/update.service";
+import { MatDialog } from "@angular/material/dialog";
+import { UpdateDialogComponent } from "./update-dialog.component";
 
 @Component({
     templateUrl: "./about.component.html",
@@ -14,22 +17,29 @@ export class AboutComponent implements OnInit {
     public connectedUsers: IConnectedUser[];
     public newsHtml: string;
 
+    private update: IUpdateModel;
+
     constructor(private readonly settingsService: SettingsService,
-        private readonly jobService: JobService,
+        private readonly jobService: UpdateService,
         private readonly hubService: HubService,
-        private readonly systemService: SystemService) { }
+        private readonly systemService: SystemService,
+        private readonly dialog: MatDialog) { }
 
     public async ngOnInit() {
         this.settingsService.about().subscribe(x => this.about = x);
         this.newsHtml = await this.systemService.getNews().toPromise();
 
-        // TODO
-        // this.jobService.getCachedUpdate().subscribe(x => {
-        //     if (x === true) {
-        //         // this.newUpdate = true; // TODO
-        //     }
-        // });
+        this.jobService.checkForUpdate().subscribe(x => {
+            this.update = x;
+            if (x.updateAvailable) {
+                this.newUpdate = true;
+            }
+        });
 
         this.connectedUsers = await this.hubService.getConnectedUsers();
     }
+
+    public openUpdate() {
+        this.dialog.open(UpdateDialogComponent, { width: "700px", data: this.update, panelClass: 'modal-panel' });
+    }
 }
diff --git a/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
new file mode 100644
index 000000000..77b053e0a
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.html
@@ -0,0 +1,28 @@
+
+
+<h1 mat-dialog-title><i class="fas fa-code-branch"></i> Latest Version: {{data.updateVersionString}}</h1>
+<mat-dialog-content>
+  <div [innerHTML]="data.changeLogs">
+  </div>
+
+
+  
+  <div class="mat-table">
+    <div class="mat-header-row">
+    <div class="mat-header-cell">Binary</div>
+    <div class="mat-header-cell">Download</div></div>
+    <div *ngFor="let d of data.downloads" class="mat-row" >
+      <div class="mat-cell">{{d.name}}</div>
+      <div class="mat-cell"><a href="{{d.url}}">Download</a></div>
+    </div>
+  </div>
+
+
+<small>Updated at {{data.updateDate | date}}</small>
+</mat-dialog-content>
+
+
+<div mat-dialog-actions class="right-buttons">
+  <button mat-raised-button id="cancelButton" [mat-dialog-close]="" color="warn"><i class="fas fa-times"></i> Close</button>
+</div>
+
diff --git a/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.scss b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.scss
new file mode 100644
index 000000000..8fd657887
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.scss
@@ -0,0 +1,40 @@
+.mat-table {
+  display: block;
+}
+
+.mat-row,
+.mat-header-row {
+  display: flex;
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  align-items: center;
+  min-height: 48px;
+  padding: 0 24px;
+}
+
+.mat-cell,
+.mat-header-cell {
+  flex: 1;
+  overflow: hidden;
+  word-wrap: break-word;
+}
+
+.small-middle-container{
+  margin: auto;
+  width: 85%;
+  margin-top:10px;
+}
+
+:host ::ng-deep strong {
+  color: #fff;
+  background-color: #007bff;
+  display: inline-block;
+    padding: 0.25em 0.4em;
+    font-size: 75%;
+    font-weight: 700;
+    line-height: 1;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: baseline;
+    border-radius: 0.25rem;
+}
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.ts b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.ts
new file mode 100644
index 000000000..c895a0a9b
--- /dev/null
+++ b/src/Ombi/ClientApp/src/app/settings/about/update-dialog.component.ts
@@ -0,0 +1,16 @@
+import { Component, OnInit, Inject } from "@angular/core";
+import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import { IUpdateModel } from "../../interfaces";
+
+
+@Component({
+  templateUrl: "update-dialog.component.html",
+  styleUrls: [ "update-dialog.component.scss" ]
+})
+export class UpdateDialogComponent {
+  constructor(
+    public dialogRef: MatDialogRef<UpdateDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: IUpdateModel
+  ) { }
+
+}
diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
index 79146fb1a..631180f8f 100644
--- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.html
@@ -41,11 +41,6 @@
                     <input matInput formControlName="autoDeleteAfterDays">
                 </mat-form-field>
             </div>
-            <div>
-                <mat-slide-toggle formControlName="ignoreCertificateErrors" matTooltip="Enable if you are having connectivity problems over SSL">
-                    Ignore any certificate errors (Please restart after changing)
-                </mat-slide-toggle>
-            </div>
             <div>
                 <mat-slide-toggle formControlName="collectAnalyticData" matTooltip="This will allow us to have a better understanding of the userbase so we know what we should be supporting (Uses Google Analytics)">
                     Allow us to collect anonymous analytical data e.g. browser used
diff --git a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts
index d2b7ba942..9681784b4 100644
--- a/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/ombi/ombi.component.ts
@@ -25,7 +25,6 @@ export class OmbiComponent implements OnInit {
             this.form = this.fb.group({
                 collectAnalyticData: [x.collectAnalyticData],
                 apiKey: [x.apiKey],
-                ignoreCertificateErrors: [x.ignoreCertificateErrors],
                 baseUrl: [x.baseUrl],
                 doNotSendNotificationsForAutoApprove: [x.doNotSendNotificationsForAutoApprove],
                 hideRequestsUsers: [x.hideRequestsUsers],
diff --git a/src/Ombi/ClientApp/src/app/settings/settings.module.ts b/src/Ombi/ClientApp/src/app/settings/settings.module.ts
index b7f4536b5..b486e5b26 100644
--- a/src/Ombi/ClientApp/src/app/settings/settings.module.ts
+++ b/src/Ombi/ClientApp/src/app/settings/settings.module.ts
@@ -68,6 +68,9 @@ import { TwilioComponent } from "./notifications/twilio/twilio.component";
 import { WhatsAppComponent } from "./notifications/twilio/whatsapp.component";
 import { CloudMobileComponent } from "./notifications/cloudmobile.coponent";
 import { CloudMobileService } from "../services/cloudmobile.service";
+import { UpdateService } from "../services/update.service";
+import { MatDialogModule } from "@angular/material/dialog";
+import { UpdateDialogComponent } from "./about/update-dialog.component";
 
 const routes: Routes = [
     { path: "Ombi", component: OmbiComponent, canActivate: [AuthGuard] },
@@ -126,7 +129,8 @@ const routes: Routes = [
         RadioButtonModule,
         DialogModule,
         SharedModule,
-        MatMenuModule
+        MatMenuModule,
+        MatDialogModule
     ],
     declarations: [
         SettingsMenuComponent,
@@ -169,6 +173,7 @@ const routes: Routes = [
         TwilioComponent,
         WhatsAppComponent,
         CloudMobileComponent,
+        UpdateDialogComponent,
     ],
     exports: [
         RouterModule,
@@ -195,6 +200,7 @@ const routes: Routes = [
         FileDownloadService,
         TheMovieDbService,
         CloudMobileService,
+        UpdateService,
     ],
 
 })
diff --git a/src/Ombi/Controllers/V1/JobController.cs b/src/Ombi/Controllers/V1/JobController.cs
index e182e1239..668a795a1 100644
--- a/src/Ombi/Controllers/V1/JobController.cs
+++ b/src/Ombi/Controllers/V1/JobController.cs
@@ -52,8 +52,7 @@ namespace Ombi.Controllers.V1
             {
                 var productArray = _updater.GetVersion();
                 var version = productArray[0];
-                var branch = productArray[1];
-                var updateAvailable = await _updater.UpdateAvailable(branch, version);
+                var updateAvailable = await _updater.UpdateAvailable(version);
 
                 return updateAvailable;
             }
@@ -70,12 +69,11 @@ namespace Ombi.Controllers.V1
             var val = await _memCache.GetOrAdd(CacheKeys.Update, async () =>
             {
                 var productArray = _updater.GetVersion();
-                if (productArray.Length > 1)
-                {
+
                     var version = productArray[0];
-                    var branch = productArray[1];
-                    var updateAvailable = await _updater.UpdateAvailable(branch, version);
-                }
+
+                    var updateAvailable = await _updater.UpdateAvailable( version);
+                
 
                 return true;
             });
diff --git a/src/Ombi/Controllers/V1/UpdateController.cs b/src/Ombi/Controllers/V1/UpdateController.cs
index 4a943ae73..419442205 100644
--- a/src/Ombi/Controllers/V1/UpdateController.cs
+++ b/src/Ombi/Controllers/V1/UpdateController.cs
@@ -21,10 +21,10 @@ namespace Ombi.Controllers.V1
         private readonly ICacheService _cache;
         private readonly IChangeLogProcessor _processor;
 
-        [HttpGet("{branch}")]
-        public async Task<UpdateModel> UpdateAvailable(string branch)
+        [HttpGet()]
+        public async Task<UpdateModel> UpdateAvailable()
         {
-            return await _cache.GetOrAdd(branch, async () => await _processor.Process(branch));
+            return await _cache.GetOrAdd("Update", async () => await _processor.Process());
         }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj
index 4ae2c07ee..857d7e11b 100644
--- a/src/Ombi/Ombi.csproj
+++ b/src/Ombi/Ombi.csproj
@@ -63,6 +63,8 @@
     </PackageReference>
 
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0" />
+
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
     <PackageReference Include="ncrontab" Version="3.3.0" />
diff --git a/src/Ombi/Program.cs b/src/Ombi/Program.cs
index 1b57aaffb..22da8e6b0 100644
--- a/src/Ombi/Program.cs
+++ b/src/Ombi/Program.cs
@@ -15,12 +15,11 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Ombi.Settings.Settings.Models;
-using System.Diagnostics;
 using System.IO;
-using Ombi.Api.TheMovieDb;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging;
 using Ombi.Api.TheMovieDb.Models;
+using System.Net.Http;
 
 namespace Ombi
 {
@@ -131,8 +130,8 @@ namespace Ombi
             }
 
             await SortOutBaseUrl(baseUrl, settingsDb, ombiSettingsContent);
-            var httpClient = new Ombi.Api.OmbiHttpClient(null, null);
-            var api = new Ombi.Api.Api(new Logger<Api.Api>(NullLoggerFactory.Instance), httpClient);
+            var httpClient = new HttpClient();
+                var api = new Ombi.Api.Api(new Logger<Api.Api>(NullLoggerFactory.Instance), httpClient);
             await MigrateOldTvDbIds(ombiDb, ombiSettingsContent, settingsDb, new Ombi.Api.TheMovieDb.TheMovieDbApi(null, (Api.IApi)api, null));
 
             Console.WriteLine($"We are running on {urlValue}");
diff --git a/src/Ombi/databadse.json b/src/Ombi/databadse.json
new file mode 100644
index 000000000..fe451c4bc
--- /dev/null
+++ b/src/Ombi/databadse.json
@@ -0,0 +1,14 @@
+{
+    "OmbiDatabase": {
+        "Type": "MySQL",
+        "ConnectionString": "Server=192.168.68.118;Port=3306;Database=app.ombi.io;User=ombi"
+    },
+    "SettingsDatabase": {
+        "Type": "MySQL",
+        "ConnectionString": "Server=192.168.68.118;Port=3306;Database=app.ombi.io;User=ombi"
+    },
+    "ExternalDatabase": {
+        "Type": "MySQL",
+        "ConnectionString": "Server=192.168.68.118;Port=3306;Database=app.ombi.io;User=ombi"
+    }
+}
\ No newline at end of file

From 42792bdb9b3bd69335ff06e5859c877ff3e9438e Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 4 Apr 2021 23:44:05 +0100
Subject: [PATCH 06/39] Removed useless file

---
 .gitignore              |  1 +
 src/Ombi/databadse.json | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 src/Ombi/databadse.json

diff --git a/.gitignore b/.gitignore
index 1a1a229b8..fc31d399b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -247,5 +247,6 @@ _Pvt_Extensions
 # Ignore local vscode config
 *.vscode
 /src/Ombi/database.json
+/src/Ombi/databases.json
 /src/Ombi/healthchecksdb
 /src/Ombi/ClientApp/package-lock.json
diff --git a/src/Ombi/databadse.json b/src/Ombi/databadse.json
deleted file mode 100644
index fe451c4bc..000000000
--- a/src/Ombi/databadse.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "OmbiDatabase": {
-        "Type": "MySQL",
-        "ConnectionString": "Server=192.168.68.118;Port=3306;Database=app.ombi.io;User=ombi"
-    },
-    "SettingsDatabase": {
-        "Type": "MySQL",
-        "ConnectionString": "Server=192.168.68.118;Port=3306;Database=app.ombi.io;User=ombi"
-    },
-    "ExternalDatabase": {
-        "Type": "MySQL",
-        "ConnectionString": "Server=192.168.68.118;Port=3306;Database=app.ombi.io;User=ombi"
-    }
-}
\ No newline at end of file

From 1d5b6f3c89ef6c3ea9c7304b52fa00fb680e0b5a Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 7 Apr 2021 20:27:15 +0100
Subject: [PATCH 07/39] Fixed #4103

---
 .../app/usermanagement/usermanagement.component.html   | 10 ++--------
 .../app/usermanagement/usermanagement.component.scss   |  2 ++
 .../src/app/usermanagement/usermanagement.component.ts |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
index 1dcbf29c0..492fe4f32 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.html
@@ -105,14 +105,8 @@
           <ng-container matColumnDef="actions">
                 <th mat-header-cell *matHeaderCellDef> </th>
                 <td mat-cell *matCellDef="let u">
-                        <button id="edit{{u.userName}}" mat-raised-button color="accent" [routerLink]="['/usermanagement/user/' + u.id]">Details/Edit</button>
-                </td>
-          </ng-container>
-
-          <ng-container matColumnDef="welcome">
-                <th mat-header-cell *matHeaderCellDef> </th>
-                <td mat-cell *matCellDef="let u">
-                        <button *ngIf="!u.hasLoggedIn" mat-raised-button color="accent"  (click)="welcomeEmail(u)" [disabled]="!customizationSettings?.applicationUrl">Send Welcome Email</button>
+                        <button id="edit{{u.userName}}" mat-raised-button color="accent" [routerLink]="['/usermanagement/user/' + u.id]">Edit</button>  
+                        <button *ngIf="!u.hasLoggedIn" mat-raised-button color="accent"  (click)="welcomeEmail(u)" [disabled]="!customizationSettings?.applicationUrl"><i class="far fa-paper-plane"></i> Welcome</button>
                 </td>
           </ng-container>
 
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss
index e0404f197..df34508cf 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss
@@ -37,6 +37,8 @@
 
 .content {
     margin-top: 2em;
+    overflow-x: auto;
+
 }
 
 .buttons {
diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
index 66268082b..c2245957c 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
@@ -13,7 +13,7 @@ import { SelectionModel } from "@angular/cdk/collections";
 export class UserManagementComponent implements OnInit {
 
     public displayedColumns: string[] = ['select', 'username', 'alias', 'email', 'roles', 'remainingRequests',
-        'nextRequestDue', 'lastLoggedIn', 'userType', 'actions', 'welcome'];
+        'nextRequestDue', 'lastLoggedIn', 'userType', 'actions'];
     public dataSource: MatTableDataSource<IUser>;
 
     public selection = new SelectionModel<IUser>(true, []);

From 5bd85a3aacc150524647a2e7445e330818f85c6a Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 7 Apr 2021 20:27:24 +0100
Subject: [PATCH 08/39] Fixed #4140

---
 src/Ombi.Helpers/AssemblyHelper.cs                          | 4 +++-
 src/Ombi.Schedule/Processor/ChangeLogProcessor.cs           | 2 +-
 .../ClientApp/src/app/settings/about/about.component.html   | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Ombi.Helpers/AssemblyHelper.cs b/src/Ombi.Helpers/AssemblyHelper.cs
index eb4dc55fd..9abc3bf92 100644
--- a/src/Ombi.Helpers/AssemblyHelper.cs
+++ b/src/Ombi.Helpers/AssemblyHelper.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.PlatformAbstractions;
+using System.Linq;
 using System.Reflection;
 
 namespace Ombi.Helpers
@@ -8,7 +9,8 @@ namespace Ombi.Helpers
         public static string GetRuntimeVersion()
         {
             ApplicationEnvironment app = PlatformServices.Default.Application;
-            return app.ApplicationVersion;
+            var split = app.ApplicationVersion.Split('.');
+            return string.Join('.', split.Take(3));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs b/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs
index 89a6519e6..cffb5e508 100644
--- a/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs
+++ b/src/Ombi.Schedule/Processor/ChangeLogProcessor.cs
@@ -49,7 +49,7 @@ namespace Ombi.Schedule.Processor
                 UpdateDate = DateTime.Now,
                 ChangeLogs = release.Description,
                 Downloads = new List<Downloads>(),
-                UpdateAvailable = release.Version != AssemblyHelper.GetRuntimeVersion()
+                UpdateAvailable = release.Version != "v" + AssemblyHelper.GetRuntimeVersion()
         };
 
             foreach (var dl in release.Downloads)
diff --git a/src/Ombi/ClientApp/src/app/settings/about/about.component.html b/src/Ombi/ClientApp/src/app/settings/about/about.component.html
index f4872eda7..b823bdc7a 100644
--- a/src/Ombi/ClientApp/src/app/settings/about/about.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/about/about.component.html
@@ -13,8 +13,10 @@
     </div>
     <div class="mat-row">
       <div class="mat-cell">Version</div>
-      <div class="mat-cell">{{about.version}} <a (click)="openUpdate()" *ngIf="newUpdate"
-          style="color:#df691a; text-decoration: underline; cursor: pointer;"><b><i class="fas fa-code-branch"></i> (New Update Available)</b></a></div>
+      <div class="mat-cell">{{about.version}} &nbsp; <a (click)="openUpdate()" *ngIf="newUpdate"
+          style="color:#df691a; text-decoration: underline; cursor: pointer;"><b><i class="fas fa-code-branch"></i> (New Update Available)</b></a>
+        <span *ngIf="!newUpdate"> <i class="far fa-thumbs-up" matTooltip="Nice work bro! Latest version FTW!"></i></span>
+        </div>
     </div>
 
     <!-- <div class="mat-row">

From 89e1e21c7c59cad1a6f422ff5ca24f023d50d1cd Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 8 Apr 2021 10:11:32 +0100
Subject: [PATCH 09/39] We can now override language profiles for Sonarr v3
 requests, we also added an option to specify the language profile for Anime
 requests

---
 src/Ombi.Core/Engine/TvRequestEngine.cs       |    8 +-
 .../Helpers/TvShowRequestBuilderV2.cs         |    5 +-
 .../Models/Requests/MovieAdvancedOptions.cs   |    1 +
 .../Models/Requests/TvRequestViewModel.cs     |    1 +
 src/Ombi.Core/Senders/TvSender.cs             |   34 +-
 .../Models/External/SonarrSettings.cs         |    1 +
 .../Entities/Requests/TvRequests.cs           |    1 +
 ...8073336_SonarrProfileOnRequest.Designer.cs | 1235 +++++++++++++++++
 .../20210408073336_SonarrProfileOnRequest.cs  |   23 +
 .../OmbiMySqlContextModelSnapshot.cs          |    3 +
 ...8073232_SonarrProfileOnRequest.Designer.cs | 1234 ++++++++++++++++
 .../20210408073232_SonarrProfileOnRequest.cs  |   23 +
 .../OmbiSqliteContextModelSnapshot.cs         |    3 +
 .../ClientApp/src/app/interfaces/IRadarr.ts   |    4 +
 .../src/app/interfaces/IRequestModel.ts       |    3 +
 .../src/app/interfaces/ISearchTvResult.ts     |    1 +
 .../ClientApp/src/app/interfaces/ISettings.ts |    1 +
 .../movie/movie-details.component.ts          |    2 +-
 .../tv-advanced-options.component.html        |   12 +-
 .../tv-advanced-options.component.ts          |  115 +-
 .../tv-request-grid.component.ts              |    1 +
 .../components/tv/tv-details.component.ts     |   17 +-
 .../services/applications/sonarr.service.ts   |    4 +
 .../app/settings/sonarr/sonarr.component.html |   12 +
 .../app/settings/sonarr/sonarr.component.ts   |   28 +-
 .../admin-request-dialog.component.html       |    8 +
 .../admin-request-dialog.component.ts         |   15 +-
 .../episode-request.component.ts              |    1 +
 .../{ => V1}/External/TheMovieDbController.cs |    0
 src/Ombi/Ombi.csproj                          |    8 +-
 src/Ombi/wwwroot/translations/en.json         |    1 +
 31 files changed, 2739 insertions(+), 66 deletions(-)
 create mode 100644 src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.Designer.cs
 create mode 100644 src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.cs
 create mode 100644 src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.Designer.cs
 create mode 100644 src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.cs
 rename src/Ombi/Controllers/{ => V1}/External/TheMovieDbController.cs (100%)

diff --git a/src/Ombi.Core/Engine/TvRequestEngine.cs b/src/Ombi.Core/Engine/TvRequestEngine.cs
index 9a2ccbf1e..e332dde75 100644
--- a/src/Ombi.Core/Engine/TvRequestEngine.cs
+++ b/src/Ombi.Core/Engine/TvRequestEngine.cs
@@ -164,7 +164,7 @@ namespace Ombi.Core.Engine
                 };
             }
 
-            if ((tv.RootFolderOverride.HasValue || tv.QualityPathOverride.HasValue) && !isAdmin)
+            if ((tv.RootFolderOverride.HasValue || tv.QualityPathOverride.HasValue || tv.LanguageProfile.HasValue) && !isAdmin)
             {
                 return new RequestEngineResult
                 {
@@ -250,7 +250,7 @@ namespace Ombi.Core.Engine
             }
 
             // This is a new request
-            var newRequest = tvBuilder.CreateNewRequest(tv, tv.RootFolderOverride.GetValueOrDefault(), tv.QualityPathOverride.GetValueOrDefault());
+            var newRequest = tvBuilder.CreateNewRequest(tv, tv.RootFolderOverride.GetValueOrDefault(), tv.QualityPathOverride.GetValueOrDefault(), tv.LanguageProfile.GetValueOrDefault());
             return await AddRequest(newRequest.NewRequest, tv.RequestOnBehalf);
         }
 
@@ -997,6 +997,10 @@ namespace Ombi.Core.Engine
 
             request.QualityOverride = options.QualityOverride;
             request.RootFolder = options.RootPathOverride;
+            if (options.LanguageProfile > 0)
+            {
+                request.LanguageProfile = options.LanguageProfile;
+            }
 
             await TvRepository.Update(request);
 
diff --git a/src/Ombi.Core/Helpers/TvShowRequestBuilderV2.cs b/src/Ombi.Core/Helpers/TvShowRequestBuilderV2.cs
index 02150cc4d..1a77be97a 100644
--- a/src/Ombi.Core/Helpers/TvShowRequestBuilderV2.cs
+++ b/src/Ombi.Core/Helpers/TvShowRequestBuilderV2.cs
@@ -217,7 +217,7 @@ namespace Ombi.Core.Helpers
         }
 
 
-        public TvShowRequestBuilderV2 CreateNewRequest(TvRequestViewModelV2 tv, int rootPathOverride, int qualityOverride)
+        public TvShowRequestBuilderV2 CreateNewRequest(TvRequestViewModelV2 tv, int rootPathOverride, int qualityOverride, int langProfile)
         {
             int.TryParse(TheMovieDbRecord.ExternalIds?.TvDbId, out var tvdbId);
             NewRequest = new TvRequests
@@ -234,7 +234,8 @@ namespace Ombi.Core.Helpers
                 TotalSeasons = tv.Seasons.Count(),
                 Background = BackdropPath,
                 RootFolder = rootPathOverride,
-                QualityOverride = qualityOverride
+                QualityOverride = qualityOverride,
+                LanguageProfile = langProfile
             };
             NewRequest.ChildRequests.Add(ChildRequest);
 
diff --git a/src/Ombi.Core/Models/Requests/MovieAdvancedOptions.cs b/src/Ombi.Core/Models/Requests/MovieAdvancedOptions.cs
index 02ce0a6bd..570c3f979 100644
--- a/src/Ombi.Core/Models/Requests/MovieAdvancedOptions.cs
+++ b/src/Ombi.Core/Models/Requests/MovieAdvancedOptions.cs
@@ -5,5 +5,6 @@
         public int RequestId { get; set; }
         public int RootPathOverride { get; set; }
         public int QualityOverride { get; set; }
+        public int LanguageProfile { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Core/Models/Requests/TvRequestViewModel.cs b/src/Ombi.Core/Models/Requests/TvRequestViewModel.cs
index 960b30ab9..1f56fb9c0 100644
--- a/src/Ombi.Core/Models/Requests/TvRequestViewModel.cs
+++ b/src/Ombi.Core/Models/Requests/TvRequestViewModel.cs
@@ -24,6 +24,7 @@ namespace Ombi.Core.Models.Requests
     {
         public bool RequestAll { get; set; }
         public bool LatestSeason { get; set; }
+        public int? LanguageProfile { get; set; }
         public bool FirstSeason { get; set; }
         public List<SeasonsViewModel> Seasons { get; set; } = new List<SeasonsViewModel>();
         [JsonIgnore]
diff --git a/src/Ombi.Core/Senders/TvSender.cs b/src/Ombi.Core/Senders/TvSender.cs
index 8187cad59..2f42a12c0 100644
--- a/src/Ombi.Core/Senders/TvSender.cs
+++ b/src/Ombi.Core/Senders/TvSender.cs
@@ -158,6 +158,8 @@ namespace Ombi.Core.Senders
             }
 
             int qualityToUse;
+            var sonarrV3 = s.V3;
+            var languageProfileId = s.LanguageProfile;
             string rootFolderPath;
             string seriesType;
 
@@ -167,8 +169,17 @@ namespace Ombi.Core.Senders
             {
                 // Get the root path from the rootfolder selected.
                 // For some reason, if we haven't got one use the first root folder in Sonarr
-                rootFolderPath = await GetSonarrRootPath(int.Parse(s.RootPathAnime), s);
-                int.TryParse(s.QualityProfileAnime, out qualityToUse);
+                if (!int.TryParse(s.RootPathAnime, out int animePath))
+                {
+                    animePath = int.Parse(s.RootPath); // Set it to the main root folder if we have no anime folder.
+                }
+                rootFolderPath = await GetSonarrRootPath(animePath, s);
+                languageProfileId = s.LanguageProfileAnime > 0 ? s.LanguageProfileAnime : s.LanguageProfile;
+
+                if (!int.TryParse(s.QualityProfileAnime, out qualityToUse))
+                {
+                    qualityToUse = int.Parse(s.QualityProfile);
+                }
                 if (profiles != null)
                 {
                     if (profiles.SonarrRootPathAnime > 0)
@@ -181,7 +192,6 @@ namespace Ombi.Core.Senders
                     }
                 }
                 seriesType = "anime";
-
             }
             else
             {
@@ -220,11 +230,16 @@ namespace Ombi.Core.Senders
                     rootFolderPath = await GetSonarrRootPath(rootfolderOverride, s);
                 }
             }
-      
-            // Are we using v3 sonarr?
-            var sonarrV3 = s.V3;
-            var languageProfileId = s.LanguageProfile;
 
+            if (model.ParentRequest.LanguageProfile.HasValue)
+            {
+                var languageProfile = model.ParentRequest.LanguageProfile.Value;
+                if (languageProfile > 0)
+                {
+                    languageProfileId = languageProfile;
+                }
+            }
+      
             try
             {
                 // Does the series actually exist?
@@ -264,6 +279,10 @@ namespace Ombi.Core.Senders
                     var seasonsToAdd = GetSeasonsToCreate(model);
                     newSeries.seasons = seasonsToAdd;
                     var result = await SonarrApi.AddSeries(newSeries, s.ApiKey, s.FullUri);
+                    if (result?.ErrorMessages?.Any() ?? false)
+                    {
+                        throw new Exception(string.Join(',', result.ErrorMessages));
+                    }
                     existingSeries = await SonarrApi.GetSeriesById(result.id, s.ApiKey, s.FullUri);
                     await SendToSonarr(model, existingSeries, s);
                 }
@@ -407,7 +426,6 @@ namespace Ombi.Core.Senders
                 await SonarrApi.SeasonPass(s.ApiKey, s.FullUri, result);
             }
 
-
             if (!s.AddOnly)
             {
                 await SearchForRequest(model, sonarrEpList, result, s, episodesToUpdate);
diff --git a/src/Ombi.Settings/Settings/Models/External/SonarrSettings.cs b/src/Ombi.Settings/Settings/Models/External/SonarrSettings.cs
index 44c910519..2dc612f7e 100644
--- a/src/Ombi.Settings/Settings/Models/External/SonarrSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/External/SonarrSettings.cs
@@ -20,6 +20,7 @@
         public bool AddOnly { get; set; }
         public bool V3 { get; set; }
         public int LanguageProfile { get; set; }
+        public int LanguageProfileAnime { get; set; }
         public bool ScanForAvailability { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Store/Entities/Requests/TvRequests.cs b/src/Ombi.Store/Entities/Requests/TvRequests.cs
index 9ba54c58f..302700348 100644
--- a/src/Ombi.Store/Entities/Requests/TvRequests.cs
+++ b/src/Ombi.Store/Entities/Requests/TvRequests.cs
@@ -16,6 +16,7 @@ namespace Ombi.Store.Entities.Requests
         public string ImdbId { get; set; }
         public int? QualityOverride { get; set; }
         public int? RootFolder { get; set; }
+        public int? LanguageProfile { get; set; }
         public string Overview { get; set; }
         public string Title { get; set; }
         public string PosterPath { get; set; }
diff --git a/src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.Designer.cs b/src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.Designer.cs
new file mode 100644
index 000000000..bd829a98d
--- /dev/null
+++ b/src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.Designer.cs
@@ -0,0 +1,1235 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Ombi.Store.Context.MySql;
+
+namespace Ombi.Store.Migrations.OmbiMySql
+{
+    [DbContext(typeof(OmbiMySqlContext))]
+    [Migration("20210408073336_SonarrProfileOnRequest")]
+    partial class SonarrProfileOnRequest
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Relational:MaxIdentifierLength", 64)
+                .HasAnnotation("ProductVersion", "5.0.1");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Audit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("AuditArea")
+                        .HasColumnType("int");
+
+                    b.Property<int>("AuditType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("User")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Audit");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.MobileDevices", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("MobileDevices");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationTemplates", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("Agent")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NotificationType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Subject")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NotificationTemplates");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("PlayerId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Alias")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("EpisodeRequestLimit")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("LastLoggedIn")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("MovieRequestLimit")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("MusicRequestLimit")
+                        .HasColumnType("int");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("ProviderUserId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StreamingCountry")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserAccessToken")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<int>("UserType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RecentlyAddedLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("AlbumId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ContentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RecentlyAddedLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RequestQueue", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("Completed")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("Dts")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Error")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RequestQueue");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RequestSubscription", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestSubscription");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("ArtistName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Cover")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool?>("Denied")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("DeniedReason")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Disk")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ForeignAlbumId")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ForeignArtistId")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("MarkedAsApproved")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("MarkedAsAvailable")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("MarkedAsDenied")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<decimal>("Rating")
+                        .HasColumnType("decimal(65,30)");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("RequestedByAlias")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("RequestedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("RequestedUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("AlbumRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("Denied")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("DeniedReason")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("IssueId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("MarkedAsApproved")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("MarkedAsAvailable")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("MarkedAsDenied")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("ParentRequestId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("RequestedByAlias")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("RequestedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("RequestedUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("SeriesType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    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()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IssueCategory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("IssuesId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    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()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("IssueCategoryId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("IssueId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("RequestId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ResovledDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Subject")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserReportedId")
+                        .HasColumnType("varchar(255)");
+
+                    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()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Background")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool?>("Denied")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("DeniedReason")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("DigitalReleaseDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("IssueId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LangCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("MarkedAsApproved")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("MarkedAsAvailable")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("MarkedAsDenied")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PosterPath")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("QualityOverride")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("RequestedByAlias")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("RequestedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("RequestedUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("RootPathOverride")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("MovieRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("EpisodeCount")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("RequestDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Background")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ExternalProviderId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("LanguageProfile")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PosterPath")
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("QualityOverride")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("RootFolder")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("TotalSeasons")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TvRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Tokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserNotificationPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("Agent")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserNotificationPreferences");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserQualityProfiles", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("RadarrQualityProfile")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RadarrRootPath")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SonarrQualityProfile")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SonarrQualityProfileAnime")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SonarrRootPath")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SonarrRootPathAnime")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserQualityProfiles");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Votes", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("VoteType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Votes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("AirDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Requested")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("SeasonId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SeasonId");
+
+                    b.ToTable("EpisodeRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("ChildRequestId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChildRequestId");
+
+                    b.ToTable("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.MobileDevices", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("NotificationUserIds")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RequestSubscription", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+
+                    b.Navigation("RequestedUser");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.TvRequests", "ParentRequest")
+                        .WithMany("ChildRequests")
+                        .HasForeignKey("ParentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+
+                    b.Navigation("ParentRequest");
+
+                    b.Navigation("RequestedUser");
+                });
+
+            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");
+
+                    b.Navigation("Issues");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.IssueCategory", "IssueCategory")
+                        .WithMany()
+                        .HasForeignKey("IssueCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", null)
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.Requests.MovieRequests", null)
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "UserReported")
+                        .WithMany()
+                        .HasForeignKey("UserReportedId");
+
+                    b.Navigation("IssueCategory");
+
+                    b.Navigation("UserReported");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+
+                    b.Navigation("RequestedUser");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserNotificationPreferences", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("UserNotificationPreferences")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserQualityProfiles", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Votes", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Repository.Requests.SeasonRequests", "Season")
+                        .WithMany("Episodes")
+                        .HasForeignKey("SeasonId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Season");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", "ChildRequest")
+                        .WithMany("SeasonRequests")
+                        .HasForeignKey("ChildRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChildRequest");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Navigation("NotificationUserIds");
+
+                    b.Navigation("UserNotificationPreferences");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Navigation("Issues");
+
+                    b.Navigation("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.Navigation("Comments");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.Navigation("Issues");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Navigation("ChildRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.cs b/src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.cs
new file mode 100644
index 000000000..79faf16fd
--- /dev/null
+++ b/src/Ombi.Store/Migrations/OmbiMySql/20210408073336_SonarrProfileOnRequest.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Ombi.Store.Migrations.OmbiMySql
+{
+    public partial class SonarrProfileOnRequest : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "LanguageProfile",
+                table: "TvRequests",
+                type: "int",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LanguageProfile",
+                table: "TvRequests");
+        }
+    }
+}
diff --git a/src/Ombi.Store/Migrations/OmbiMySql/OmbiMySqlContextModelSnapshot.cs b/src/Ombi.Store/Migrations/OmbiMySql/OmbiMySqlContextModelSnapshot.cs
index f127b6c23..06e8e76f7 100644
--- a/src/Ombi.Store/Migrations/OmbiMySql/OmbiMySqlContextModelSnapshot.cs
+++ b/src/Ombi.Store/Migrations/OmbiMySql/OmbiMySqlContextModelSnapshot.cs
@@ -771,6 +771,9 @@ namespace Ombi.Store.Migrations.OmbiMySql
                     b.Property<string>("ImdbId")
                         .HasColumnType("longtext");
 
+                    b.Property<int?>("LanguageProfile")
+                        .HasColumnType("int");
+
                     b.Property<string>("Overview")
                         .HasColumnType("longtext");
 
diff --git a/src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.Designer.cs b/src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.Designer.cs
new file mode 100644
index 000000000..916573687
--- /dev/null
+++ b/src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.Designer.cs
@@ -0,0 +1,1234 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Ombi.Store.Context.Sqlite;
+
+namespace Ombi.Store.Migrations.OmbiSqlite
+{
+    [DbContext(typeof(OmbiSqliteContext))]
+    [Migration("20210408073232_SonarrProfileOnRequest")]
+    partial class SonarrProfileOnRequest
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "5.0.1");
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Audit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("AuditArea")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("AuditType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("User")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Audit");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.MobileDevices", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("MobileDevices");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationTemplates", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Agent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("NotificationType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Subject")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NotificationTemplates");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlayerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationUserId");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Alias")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("EpisodeRequestLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoggedIn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MovieRequestLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MusicRequestLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ProviderUserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("StreamingCountry")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserAccessToken")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("UserType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RecentlyAddedLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AlbumId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ContentId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ContentType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RecentlyAddedLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RequestQueue", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("Completed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Dts")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Error")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RequestQueue");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RequestSubscription", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestSubscription");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ArtistName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Cover")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Denied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("DeniedReason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Disk")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ForeignAlbumId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ForeignArtistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("MarkedAsApproved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MarkedAsAvailable")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("MarkedAsDenied")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Rating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("RequestedByAlias")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedUserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("AlbumRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool?>("Denied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("DeniedReason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IssueId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("MarkedAsApproved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MarkedAsAvailable")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("MarkedAsDenied")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ParentRequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("RequestedByAlias")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedUserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SeriesType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    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()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("IssueCategory");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.IssueComments", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IssuesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    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()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("IssueCategoryId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IssueId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("RequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ResovledDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Subject")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserReportedId")
+                        .HasColumnType("TEXT");
+
+                    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()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Background")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Denied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("DeniedReason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DigitalReleaseDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IssueId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LangCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("MarkedAsApproved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MarkedAsAvailable")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("MarkedAsDenied")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PosterPath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("QualityOverride")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("RequestedByAlias")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedUserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RootPathOverride")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TheMovieDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("MovieRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EpisodeCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("RequestDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RequestLog");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Background")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ExternalProviderId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ImdbId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LanguageProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PosterPath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("QualityOverride")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("ReleaseDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("RootFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TotalSeasons")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TvDbId")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TvRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Tokens");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserNotificationPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Agent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserNotificationPreferences");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserQualityProfiles", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RadarrQualityProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RadarrRootPath")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SonarrQualityProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SonarrQualityProfileAnime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SonarrRootPath")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SonarrRootPathAnime")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserQualityProfiles");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Votes", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RequestType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("VoteType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Votes");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AirDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Approved")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Available")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EpisodeNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Requested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SeasonId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Url")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SeasonId");
+
+                    b.ToTable("EpisodeRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChildRequestId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SeasonNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChildRequestId");
+
+                    b.ToTable("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.MobileDevices", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.NotificationUserId", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("NotificationUserIds")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.RequestSubscription", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+
+                    b.Navigation("RequestedUser");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.TvRequests", "ParentRequest")
+                        .WithMany("ChildRequests")
+                        .HasForeignKey("ParentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+
+                    b.Navigation("ParentRequest");
+
+                    b.Navigation("RequestedUser");
+                });
+
+            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");
+
+                    b.Navigation("Issues");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.IssueCategory", "IssueCategory")
+                        .WithMany()
+                        .HasForeignKey("IssueCategoryId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", null)
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.Requests.MovieRequests", null)
+                        .WithMany("Issues")
+                        .HasForeignKey("IssueId");
+
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "UserReported")
+                        .WithMany()
+                        .HasForeignKey("UserReportedId");
+
+                    b.Navigation("IssueCategory");
+
+                    b.Navigation("UserReported");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+
+                    b.Navigation("RequestedUser");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.RequestLog", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Tokens", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserNotificationPreferences", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany("UserNotificationPreferences")
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.UserQualityProfiles", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Votes", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.EpisodeRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Repository.Requests.SeasonRequests", "Season")
+                        .WithMany("Episodes")
+                        .HasForeignKey("SeasonId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Season");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.Requests.ChildRequests", "ChildRequest")
+                        .WithMany("SeasonRequests")
+                        .HasForeignKey("ChildRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChildRequest");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.OmbiUser", b =>
+                {
+                    b.Navigation("NotificationUserIds");
+
+                    b.Navigation("UserNotificationPreferences");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
+                {
+                    b.Navigation("Issues");
+
+                    b.Navigation("SeasonRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.Issues", b =>
+                {
+                    b.Navigation("Comments");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.MovieRequests", b =>
+                {
+                    b.Navigation("Issues");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.TvRequests", b =>
+                {
+                    b.Navigation("ChildRequests");
+                });
+
+            modelBuilder.Entity("Ombi.Store.Repository.Requests.SeasonRequests", b =>
+                {
+                    b.Navigation("Episodes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.cs b/src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.cs
new file mode 100644
index 000000000..c35e74d2a
--- /dev/null
+++ b/src/Ombi.Store/Migrations/OmbiSqlite/20210408073232_SonarrProfileOnRequest.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Ombi.Store.Migrations.OmbiSqlite
+{
+    public partial class SonarrProfileOnRequest : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "LanguageProfile",
+                table: "TvRequests",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LanguageProfile",
+                table: "TvRequests");
+        }
+    }
+}
diff --git a/src/Ombi.Store/Migrations/OmbiSqlite/OmbiSqliteContextModelSnapshot.cs b/src/Ombi.Store/Migrations/OmbiSqlite/OmbiSqliteContextModelSnapshot.cs
index 144ca4613..4a595fa92 100644
--- a/src/Ombi.Store/Migrations/OmbiSqlite/OmbiSqliteContextModelSnapshot.cs
+++ b/src/Ombi.Store/Migrations/OmbiSqlite/OmbiSqliteContextModelSnapshot.cs
@@ -770,6 +770,9 @@ namespace Ombi.Store.Migrations.OmbiSqlite
                     b.Property<string>("ImdbId")
                         .HasColumnType("TEXT");
 
+                    b.Property<int?>("LanguageProfile")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Overview")
                         .HasColumnType("TEXT");
 
diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts b/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts
index e01d74cd5..889fac22a 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IRadarr.ts
@@ -1,5 +1,6 @@
 import { IChildRequests, IMovieRequests } from ".";
 import { ITvRequests } from "./IRequestModel";
+import { ILanguageProfiles } from "./ISonarr";
 
 export interface IRadarrRootFolder {
     id: number;
@@ -27,6 +28,9 @@ export interface IAdvancedData {
     rootFolder: IRadarrRootFolder;
     rootFolders: IRadarrRootFolder[];
     rootFolderId: number;
+    language: ILanguageProfiles;
+    languages: ILanguageProfiles[];
+    languageId: number;
     movieRequest: IMovieRequests;
     tvRequest: ITvRequests;
 }
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
index 4f72b0631..3c2626cf5 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/IRequestModel.ts
@@ -26,6 +26,7 @@ export interface IMovieAdvancedOptions {
   requestId: number;
   qualityOverride: number;
   rootPathOverride: number;
+  languageProfile: number;
 }
 
 export interface IAlbumRequest extends IBaseRequest {
@@ -110,6 +111,7 @@ export interface ITvRequests {
   status: string;
   childRequests: IChildRequests[];
   qualityOverride: number;
+  languageProfile: number;
   background: any;
   totalSeasons: number;
   tvDbId: number; // NO LONGER USED
@@ -119,6 +121,7 @@ export interface ITvRequests {
   // For UI display
   qualityOverrideTitle: string;
   rootPathOverrideTitle: string;
+  languageOverrideTitle: string;
 }
 
 export interface IChildRequests extends IBaseRequest {
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISearchTvResult.ts b/src/Ombi/ClientApp/src/app/interfaces/ISearchTvResult.ts
index b59ad3780..8928c188b 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/ISearchTvResult.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/ISearchTvResult.ts
@@ -51,6 +51,7 @@ export interface ITvRequestViewModelBase extends BaseRequestOptions {
     requestAll: boolean;
     firstSeason: boolean;
     latestSeason: boolean;
+    languageProfile: number | undefined;
     seasons: ISeasonsViewModel[];
 }
 
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
index 7fa710248..d73fdddc8 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
@@ -103,6 +103,7 @@ export interface ISonarrSettings extends IExternalSettings {
   addOnly: boolean;
   v3: boolean;
   languageProfile: number;
+  languageProfileAnime: number;
   scanForAvailability: boolean;
 }
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
index 6d1ba4614..3911d64ce 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
@@ -184,7 +184,7 @@ export class MovieDetailsComponent {
             if (result) {
                 result.rootFolder = result.rootFolders.filter(f => f.id === +result.rootFolderId)[0];
                 result.profile = result.profiles.filter(f => f.id === +result.profileId)[0];
-                await this.requestService2.updateMovieAdvancedOptions({ qualityOverride: result.profileId, rootPathOverride: result.rootFolderId, requestId: this.movieRequest.id }).toPromise();
+                await this.requestService2.updateMovieAdvancedOptions({ qualityOverride: result.profileId, rootPathOverride: result.rootFolderId, languageProfile: 0, requestId: this.movieRequest.id }).toPromise();
                 this.setAdvancedOptions(result);
             }
         });
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.html
index 13c39a111..682cb3db5 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.html
@@ -5,7 +5,7 @@
       <i class="fas fa-x7 fa-exclamation-triangle glyphicon"></i>
       <span>{{'MediaDetails.AutoApproveOptionsTvShort' | translate }}</span>
     </div>
-    <mat-form-field>
+    <mat-form-field *ngIf="sonarrEnabled">
         <mat-label>{{'MediaDetails.QualityProfilesSelect' | translate }}</mat-label>
         <mat-select [(value)]="data.profileId">
             <mat-option *ngFor="let profile of sonarrProfiles" value="{{profile.id}}">{{profile.name}}</mat-option>
@@ -13,13 +13,21 @@
     </mat-form-field>
 </div>
 <div mat-dialog-content>
-    <mat-form-field>
+    <mat-form-field  *ngIf="sonarrEnabled">
         <mat-label>{{'MediaDetails.RootFolderSelect' | translate }}</mat-label>
         <mat-select [(value)]="data.rootFolderId">
             <mat-option *ngFor="let profile of sonarrRootFolders" value="{{profile.id}}">{{profile.path}}</mat-option>
         </mat-select>
     </mat-form-field>
 </div>
+<div mat-dialog-content>
+    <mat-form-field  *ngIf="sonarrEnabled">
+        <mat-label>{{'MediaDetails.LanguageProfileSelect' | translate }}</mat-label>
+        <mat-select [(value)]="data.languageId">
+            <mat-option *ngFor="let profile of sonarrLanguageProfiles" value="{{profile.id}}">{{profile.name}}</mat-option>
+        </mat-select>
+    </mat-form-field>
+</div>
 <div mat-dialog-actions>
     <button mat-raised-button [mat-dialog-close]="" color="warn"><i class="fas fa-times"></i> {{ 'Common.Cancel' | translate }}</button>
     <button mat-raised-button [mat-dialog-close]="data" color="accent" cdkFocusInitial><i class="fas fa-plus"></i> {{ 'Common.Submit' | translate }}</button>
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.ts
index 7846b69df..97e15f774 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-advanced-options/tv-advanced-options.component.ts
@@ -1,55 +1,92 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
-import { IAdvancedData, ISonarrProfile, ISonarrRootFolder } from "../../../../../interfaces";
-import { SonarrService } from "../../../../../services";
+import {
+  IAdvancedData,
+  ILanguageProfiles,
+  ISonarrProfile,
+  ISonarrRootFolder,
+  ISonarrSettings,
+} from "../../../../../interfaces";
+import { SettingsService, SonarrService } from "../../../../../services";
 
 @Component({
-    templateUrl: "./tv-advanced-options.component.html",
-    selector: "tv-advanced-options",
+  templateUrl: "./tv-advanced-options.component.html",
+  selector: "tv-advanced-options",
 })
 export class TvAdvancedOptionsComponent implements OnInit {
+  public sonarrProfiles: ISonarrProfile[];
+  public sonarrRootFolders: ISonarrRootFolder[];
+  public sonarrLanguageProfiles: ILanguageProfiles[];
+  public sonarrEnabled: boolean;
 
-    public sonarrProfiles: ISonarrProfile[];
-    public sonarrRootFolders: ISonarrRootFolder[];
+  constructor(
+    public dialogRef: MatDialogRef<TvAdvancedOptionsComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: IAdvancedData,
+    private sonarrService: SonarrService,
+    private settingsService: SettingsService
+  ) {}
 
-    constructor(public dialogRef: MatDialogRef<TvAdvancedOptionsComponent>, @Inject(MAT_DIALOG_DATA) public data: IAdvancedData,
-        private sonarrService: SonarrService
-    ) {
-    }
+  public async ngOnInit() {
+    this.settingsService.getSonarr().subscribe((settings: ISonarrSettings) => {
+      if (!settings.enabled) {
+          this.sonarrEnabled = false;
+        return;
+      }
+
+      this.sonarrEnabled = true;
+      this.sonarrService.getQualityProfilesWithoutSettings().subscribe((c) => {
+        this.sonarrProfiles = c;
+        this.data.profiles = c;
+        this.setQualityOverrides();
+      });
+      this.sonarrService.getRootFoldersWithoutSettings().subscribe((c) => {
+        this.sonarrRootFolders = c;
+        this.data.rootFolders = c;
+        this.setRootFolderOverrides();
+      });
 
+      if (settings.v3) {
+        this.sonarrService
+          .getV3LanguageProfiles(settings)
+          .subscribe((profiles: ILanguageProfiles[]) => {
+            this.sonarrLanguageProfiles = profiles;
+            this.data.languages = profiles;
+            this.setLanguageOverride();
+          });
+      }
+    });
+  }
 
-    public async ngOnInit() {
-        this.sonarrService.getQualityProfilesWithoutSettings().subscribe(c => {
-            this.sonarrProfiles = c;
-            this.data.profiles = c;
-            this.setQualityOverrides();
-        });
-        this.sonarrService.getRootFoldersWithoutSettings().subscribe(c => {
-            this.sonarrRootFolders = c;
-            this.data.rootFolders = c;
-            this.setRootFolderOverrides();
-        });
+  private setQualityOverrides(): void {
+    if (this.sonarrProfiles) {
+      const profile = this.sonarrProfiles.filter((p) => {
+        return p.id === this.data.tvRequest.qualityOverride;
+      });
+      if (profile.length > 0) {
+        this.data.tvRequest.qualityOverrideTitle = profile[0].name;
+      }
     }
+  }
 
-    private setQualityOverrides(): void {
-        if (this.sonarrProfiles) {
-            const profile = this.sonarrProfiles.filter((p) => {
-                return p.id === this.data.tvRequest.qualityOverride;
-            });
-            if (profile.length > 0) {
-                this.data.movieRequest.qualityOverrideTitle = profile[0].name;
-            }
-        }
+  private setRootFolderOverrides(): void {
+    if (this.sonarrRootFolders) {
+      const path = this.sonarrRootFolders.filter((folder) => {
+        return folder.id === this.data.tvRequest.rootFolder;
+      });
+      if (path.length > 0) {
+        this.data.tvRequest.rootPathOverrideTitle = path[0].path;
+      }
     }
+  }
 
-    private setRootFolderOverrides(): void {
-        if (this.sonarrRootFolders) {
-            const path = this.sonarrRootFolders.filter((folder) => {
-                return folder.id === this.data.tvRequest.rootFolder;
-            });
-            if (path.length > 0) {
-                this.data.movieRequest.rootPathOverrideTitle = path[0].path;
-            }
-        }
+  private setLanguageOverride(): void {
+    if (this.sonarrLanguageProfiles) {
+      const profile = this.sonarrLanguageProfiles.filter((p) => {
+        return p.id === this.data.tvRequest.languageProfile;
+      });
+      if (profile.length > 0) {
+        this.data.tvRequest.languageOverrideTitle = profile[0].name;
+      }
     }
+  }
 }
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts
index 8c3633cf6..0a103c75a 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-request-grid/tv-request-grid.component.ts
@@ -67,6 +67,7 @@ export class TvRequestGridComponent {
                     viewModel.requestOnBehalf = result.username?.id;
                     viewModel.qualityPathOverride = result?.sonarrPathId;
                     viewModel.rootFolderOverride = result?.sonarrFolderId;
+                    viewModel.languageProfile = result?.sonarrLanguageId;
 
                     const requestResult = await this.requestServiceV2.requestTv(viewModel).toPromise();
                     this.postRequest(requestResult);
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
index 13989fcdf..f9b686a48 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts
@@ -102,7 +102,8 @@ export class TvDetailsComponent implements OnInit {
                 // get the name and ids
                 result.rootFolder = result.rootFolders.filter(f => f.id === +result.rootFolderId)[0];
                 result.profile = result.profiles.filter(f => f.id === +result.profileId)[0];
-                await this.requestService2.updateTvAdvancedOptions({ qualityOverride: result.profileId, rootPathOverride: result.rootFolderId, requestId: this.showRequest.id }).toPromise();
+                result.language = result.languages.filter(x => x.id === +result.langaugeId)[0];
+                await this.requestService2.updateTvAdvancedOptions({ qualityOverride: result.profileId, rootPathOverride: result.rootFolderId, languageProfile: result.languageId, requestId: this.showRequest.id }).toPromise();
                 this.setAdvancedOptions(result);
             }
         });
@@ -117,15 +118,20 @@ export class TvDetailsComponent implements OnInit {
         if (data.profileId) {
             this.showRequest.rootPathOverrideTitle =  data.rootFolders.filter(x => x.id == data.rootFolderId)[0].path;
         }
+        if (data.languageId) {
+            this.showRequest.languageOverrideTitle =  data.languages.filter(x => x.id == data.languageId)[0].name;
+        }
     }
 
     private loadAdvancedInfo() {
         const profile = this.sonarrService.getQualityProfilesWithoutSettings();
         const folders = this.sonarrService.getRootFoldersWithoutSettings();
+        const languages = this.sonarrService.getV3LanguageProfilesWithoutSettings();
 
-        forkJoin([profile, folders]).subscribe(x => {
+        forkJoin([profile, folders, languages]).subscribe(x => {
             const sonarrProfiles = x[0];
             const sonarrRootFolders = x[1];
+            const languageProfiles = x[2];
 
             const profile = sonarrProfiles.filter((p) => {
                 return p.id === this.showRequest.qualityOverride;
@@ -141,6 +147,13 @@ export class TvDetailsComponent implements OnInit {
                 this.showRequest.rootPathOverrideTitle = path[0].path;
             }
 
+            const lang = languageProfiles.filter((folder) => {
+                return folder.id === this.showRequest.languageProfile;
+            });
+            if (lang.length > 0) {
+                this.showRequest.languageOverrideTitle = lang[0].name;
+            }
+
         });
     }
 }
diff --git a/src/Ombi/ClientApp/src/app/services/applications/sonarr.service.ts b/src/Ombi/ClientApp/src/app/services/applications/sonarr.service.ts
index 67321d899..13a2076d4 100644
--- a/src/Ombi/ClientApp/src/app/services/applications/sonarr.service.ts
+++ b/src/Ombi/ClientApp/src/app/services/applications/sonarr.service.ts
@@ -32,6 +32,10 @@ export class SonarrService extends ServiceHelpers {
         return this.http.post<ILanguageProfiles[]>(`${this.url}/v3/languageprofiles/`, JSON.stringify(settings), {headers: this.headers});
     }
 
+    public getV3LanguageProfilesWithoutSettings(): Observable<ILanguageProfiles[]> {
+        return this.http.get<ILanguageProfiles[]>(`${this.url}/v3/languageprofiles/`, {headers: this.headers});
+    }
+
     public isEnabled(): Promise<boolean> {
         return this.http.get<boolean>(`${this.url}/enabled/`, { headers: this.headers }).toPromise();
     }
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
index 7ca71b554..8bef41ca7 100644
--- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.html
@@ -140,6 +140,18 @@
                             </div>
 
                         </div>
+                        <div id="langaugeProfileAnime">
+                            <div class="md-form-field" style="display:contents;">
+                                <mat-form-field appearance="outline">
+                                    <mat-label>Language Profiles Anime</mat-label>
+                                    <mat-select formControlName="languageProfileAnime">
+                                      <mat-option *ngFor="let lang of languageProfiles" [value]="lang.id">{{lang.name}}</mat-option>
+                                    </mat-select>
+                                    <mat-error>A Language Profile Anime is required</mat-error>
+                                  </mat-form-field>
+                            </div>
+
+                        </div>
                     </div>
 
 
diff --git a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
index 09f86859a..877d9bae3 100644
--- a/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
@@ -20,6 +20,7 @@ export class SonarrComponent implements OnInit {
     public rootFolders: ISonarrRootFolder[];
     public rootFoldersAnime: ISonarrRootFolder[];
     public languageProfiles: ILanguageProfiles[];
+    public languageProfilesAnime: ILanguageProfiles[];
     public selectedRootFolder: ISonarrRootFolder;
     public selectedQuality: ISonarrProfile;
     public selectedLanguageProfiles: ILanguageProfiles;
@@ -73,7 +74,8 @@ export class SonarrComponent implements OnInit {
                     seasonFolders: [x.seasonFolders],
                     v3: [x.v3],
                     languageProfile: [x.languageProfile],
-                    scanForAvailability: [x.scanForAvailability]
+                    languageProfileAnime: [x.languageProfileAnime],
+                    scanForAvailability: [x.scanForAvailability],
                 });
 
                 if (x.qualityProfile) {
@@ -82,20 +84,27 @@ export class SonarrComponent implements OnInit {
                 if (x.rootPath) {
                     this.getRootFolders(this.form);
                 }
-                if(x.languageProfile) {
+                if (x.languageProfile) {
                     this.getLanguageProfiles(this.form);
                 }
-                if(x.v3) {
+                if (x.v3) {
                     this.form.controls.languageProfile.setValidators([Validators.required]);
                 }
 
+                this.form.controls.v3.valueChanges.subscribe((val: boolean) => {
+                    if (val) {
+                        this.form.controls.languageProfile.setValidators([Validators.required, validateProfile]);
+                    } else {
+                        this.form.controls.languageProfile.clearValidators();
+                    }
+                });
+
                 this.formErrors ={
                     apiKey: {},
                     qualityProfile: {},
                     rootPath: {},
                     ip: {},
                     port: {},
-                    
                 };
                 this.onFormValuesChanged();
             });
@@ -104,7 +113,6 @@ export class SonarrComponent implements OnInit {
         this.languageProfiles = [];
         this.rootFolders.push({ path: "Please Select", id: -1 });
         this.qualities.push({ name: "Please Select", id: -1 });
-        this.languageProfiles.push({ name: "Please Select", id: -1 });
     }
 
     public getProfiles(form: FormGroup) {
@@ -137,11 +145,14 @@ export class SonarrComponent implements OnInit {
         this.sonarrService.getV3LanguageProfiles(form.value)
             .subscribe(x => {
                 this.languageProfiles = x;
-                this.languageProfiles.unshift({ name: "Please Select", id: -1 });
+                this.languageProfilesAnime = x;
 
                 this.langRunning = false;
                 this.notificationService.success("Successfully retrieved the Language Profiles");
             });
+            if (this.form.controls.v3.value) {
+                this.form.controls.languageProfile.setValidators([Validators.required]);
+            }
     }
 
     public test(form: FormGroup) {
@@ -176,6 +187,11 @@ export class SonarrComponent implements OnInit {
                 this.notificationService.error("Please check your entered values");
             }
         }
+        if (form.controls.v3.value && form.controls.languageProfile) {
+            if (form.controls.languageProfile.value === "Please Select") {
+                this.notificationService.error("Please check your entered values");
+            }
+        }
 
         this.settingsService.saveSonarr(form.value)
             .subscribe(x => {
diff --git a/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.html b/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.html
index 452dd43d2..8d32ea8b9 100644
--- a/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.html
+++ b/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.html
@@ -52,6 +52,14 @@
         </mat-select>
     </mat-form-field>
   </div>
+  <div>
+    <mat-form-field appearance="outline" floatLabel=auto>
+        <mat-label>{{'MediaDetails.LanguageProfileSelect' | translate }}</mat-label>
+        <mat-select id="sonarrLanguageId" formControlName="sonarrLanguageId">
+            <mat-option id="sonarrLanguageId{{profile.id}}" *ngFor="let profile of sonarrLanguageProfiles" value="{{profile.id}}">{{profile.name}}</mat-option>
+        </mat-select>
+    </mat-form-field>
+  </div>
 </div>
   <!-- End Sonarr-->
 
diff --git a/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.ts b/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.ts
index 8e16dd87a..acf6560b9 100644
--- a/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.ts
+++ b/src/Ombi/ClientApp/src/app/shared/admin-request-dialog/admin-request-dialog.component.ts
@@ -3,8 +3,8 @@ import { FormBuilder, FormGroup } from "@angular/forms";
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
 import { Observable } from "rxjs";
 import { startWith, map } from "rxjs/operators";
-import { IRadarrProfile, IRadarrRootFolder, ISonarrProfile, ISonarrRootFolder, IUserDropdown, RequestType } from "../../interfaces";
-import { IdentityService, MessageService, RadarrService, RequestService, SonarrService } from "../../services";
+import { ILanguageProfiles, IRadarrProfile, IRadarrRootFolder, ISonarrProfile, ISonarrRootFolder, ISonarrSettings, IUserDropdown, RequestType } from "../../interfaces";
+import { IdentityService, MessageService, RadarrService, RequestService, SettingsService, SonarrService } from "../../services";
 import { RequestServiceV2 } from "../../services/requestV2.service";
 
 export interface IAdminRequestDialogData {
@@ -23,6 +23,7 @@ export class AdminRequestDialogComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public data: IAdminRequestDialogData,
     private identityService: IdentityService,
     private sonarrService: SonarrService,
+    private settingsService: SettingsService,
     private radarrService: RadarrService,
     private fb: FormBuilder
   ) {}
@@ -39,6 +40,7 @@ export class AdminRequestDialogComponent implements OnInit {
 
   public sonarrProfiles: ISonarrProfile[];
   public sonarrRootFolders: ISonarrRootFolder[];
+  public sonarrLanguageProfiles: ILanguageProfiles[];
   public radarrProfiles: IRadarrProfile[];
   public radarrRootFolders: IRadarrRootFolder[];
 
@@ -48,6 +50,7 @@ export class AdminRequestDialogComponent implements OnInit {
         username: [null],
         sonarrPathId: [null],
         sonarrFolderId: [null],
+        sonarrLanguageId: [null],
         radarrPathId: [null],
         radarrFolderId: [null]
     })
@@ -62,6 +65,13 @@ export class AdminRequestDialogComponent implements OnInit {
     if (this.data.type === RequestType.tvShow) {
       this.sonarrEnabled = await this.sonarrService.isEnabled();
       if (this.sonarrEnabled) {
+        this.settingsService.getSonarr().subscribe((settings: ISonarrSettings) => {
+          if (settings.v3) {
+            this.sonarrService.getV3LanguageProfiles(settings).subscribe((profiles: ILanguageProfiles[]) => {
+              this.sonarrLanguageProfiles = profiles;
+            })
+          }
+        });
         this.sonarrService.getQualityProfilesWithoutSettings().subscribe(c => {
             this.sonarrProfiles = c;
         });
@@ -106,6 +116,7 @@ export class AdminRequestDialogComponent implements OnInit {
       model.radarrRootFolderTitle =  this.radarrRootFolders?.filter(x => x.id == model.radarrFolderId)[0]?.path;
       model.sonarrRootFolderTitle = this.sonarrRootFolders?.filter(x => x.id == model.sonarrFolderId)[0]?.path;
       model.sonarrQualityOverrideTitle = this.sonarrProfiles?.filter(x => x.id == model.sonarrPathId)[0]?.name;
+      model.sonarrLanguageProfileTitle = this.sonarrLanguageProfiles?.filter(x => x.id == model.sonarrLanguageId)[0]?.name;
       this.dialogRef.close(model);
   }
 }
diff --git a/src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.ts b/src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.ts
index f6d7a6e92..146f31269 100644
--- a/src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.ts
+++ b/src/Ombi/ClientApp/src/app/shared/episode-request/episode-request.component.ts
@@ -66,6 +66,7 @@ export class EpisodeRequestComponent {
                     viewModel.requestOnBehalf = result.username?.id;
                     viewModel.qualityPathOverride = result?.sonarrPathId;
                     viewModel.rootFolderOverride = result?.sonarrFolderId;
+                    viewModel.languageProfile = result?.sonarrLanguageId;
 
                     const requestResult = await this.requestService.requestTv(viewModel).toPromise();
                     this.postRequest(requestResult);
diff --git a/src/Ombi/Controllers/External/TheMovieDbController.cs b/src/Ombi/Controllers/V1/External/TheMovieDbController.cs
similarity index 100%
rename from src/Ombi/Controllers/External/TheMovieDbController.cs
rename to src/Ombi/Controllers/V1/External/TheMovieDbController.cs
diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj
index 857d7e11b..48681e423 100644
--- a/src/Ombi/Ombi.csproj
+++ b/src/Ombi/Ombi.csproj
@@ -6,8 +6,8 @@
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <!-- <PublishTrimmed>true</PublishTrimmed>    
     <PublishReadyToRun>true</PublishReadyToRun> -->
-    <AssemblyVersion>$(SemVer)</AssemblyVersion>
-    <FileVersion>$(SemVer)</FileVersion>
+    <AssemblyVersion>4.0.1328.0</AssemblyVersion>
+    <FileVersion>4.0.1328.0</FileVersion>
     <Version>$(FullVer)</Version>
     <PackageVersion></PackageVersion>
     <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>    
@@ -97,6 +97,10 @@
     <ProjectReference Include="..\Ombi.Updater\Ombi.Updater.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Controllers\External\" />
+  </ItemGroup>
+
   
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
     <Exec Command="node --version" ContinueOnError="true">
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index fab6213a7..eab1b18d0 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -259,6 +259,7 @@
         "AutoApproveOptionsTvShort":"You can configure the request here, once requested it will be send to your DVR application! If the request is already in Sonarr, we will not change the root folder or quality profile if you set it!",
         "QualityProfilesSelect":"Select A Quality Profile",
         "RootFolderSelect":"Select A Root Folder",
+        "LanguageProfileSelect":"Select A Language Profile",
         "Status":"Status",
         "Availability":"Availability",
         "RequestStatus":"Request Status",

From 560454565d82e599d11bcca1e93db2bbb18833b6 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 11 Apr 2021 22:21:42 +0100
Subject: [PATCH 10/39] Added new Image posters API

---
 src/Ombi.Core/Engine/Interfaces/BaseEngine.cs |  5 ++
 .../Engine/Interfaces/IMovieEngineV2.cs       |  2 +-
 .../Engine/Interfaces/ITvSearchEngineV2.cs    |  2 +-
 .../Engine/V2/MovieSearchEngineV2.cs          |  4 +-
 src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs   |  4 +-
 .../Models/Search/SearchTvShowViewModel.cs    |  3 --
 src/Ombi/Controllers/V1/ImagesController.cs   | 52 ++++++++++++++++++-
 7 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
index 8ddf27656..6fd22bced 100644
--- a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
+++ b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
@@ -9,6 +9,7 @@ using Ombi.Store.Entities.Requests;
 using Ombi.Store.Entities;
 using Microsoft.EntityFrameworkCore;
 using Ombi.Core.Authentication;
+using Ombi.Helpers;
 
 namespace Ombi.Core.Engine.Interfaces
 {
@@ -29,6 +30,10 @@ namespace Ombi.Core.Engine.Interfaces
         private OmbiUser _user;
         protected async Task<OmbiUser> GetUser()
         {
+            if(!Username.HasValue())
+            {
+                return null;
+            }
             var username = Username.ToUpper();
             return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username));
         }
diff --git a/src/Ombi.Core/Engine/Interfaces/IMovieEngineV2.cs b/src/Ombi.Core/Engine/Interfaces/IMovieEngineV2.cs
index c4bd0aa0e..442359f0f 100644
--- a/src/Ombi.Core/Engine/Interfaces/IMovieEngineV2.cs
+++ b/src/Ombi.Core/Engine/Interfaces/IMovieEngineV2.cs
@@ -19,7 +19,7 @@ namespace Ombi.Core.Engine.Interfaces
         Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies(int currentPosition, int amountToLoad);
         Task<MovieCollectionsViewModel> GetCollection(int collectionId, CancellationToken cancellationToken, string langCode = null);
         Task<int> GetTvDbId(int theMovieDbId);
-        Task<IEnumerable<SearchMovieViewModel>> PopularMovies(int currentlyLoaded, int toLoad, CancellationToken cancellationToken);
+        Task<IEnumerable<SearchMovieViewModel>> PopularMovies(int currentlyLoaded, int toLoad, CancellationToken cancellationToken, string langCustomCode = null);
         Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies(int currentlyLoaded, int toLoad);
         Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies(int currentlyLoaded, int toLoad);
         Task<ActorCredits> GetMoviesByActor(int actorId, string langCode);
diff --git a/src/Ombi.Core/Engine/Interfaces/ITvSearchEngineV2.cs b/src/Ombi.Core/Engine/Interfaces/ITvSearchEngineV2.cs
index 2fc78b6bb..3e2d859c8 100644
--- a/src/Ombi.Core/Engine/Interfaces/ITvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/Interfaces/ITvSearchEngineV2.cs
@@ -11,7 +11,7 @@ namespace Ombi.Core
         Task<SearchFullInfoTvShowViewModel> GetShowInformation(string tvdbid, CancellationToken token);
         Task<SearchFullInfoTvShowViewModel> GetShowByRequest(int requestId, CancellationToken token);
         Task<IEnumerable<StreamingData>> GetStreamInformation(int movieDbId, CancellationToken cancellationToken);
-        Task<IEnumerable<SearchTvShowViewModel>> Popular(int currentlyLoaded, int amountToLoad);
+        Task<IEnumerable<SearchTvShowViewModel>> Popular(int currentlyLoaded, int amountToLoad, string langCustomCode = null);
         Task<IEnumerable<SearchTvShowViewModel>> Anticipated(int currentlyLoaded, int amountToLoad);
         Task<IEnumerable<SearchTvShowViewModel>> Trending(int currentlyLoaded, int amountToLoad);
     }
diff --git a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
index 3714e58a8..e651cc719 100644
--- a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
@@ -124,9 +124,9 @@ namespace Ombi.Core.Engine.V2
         /// Gets popular movies by paging
         /// </summary>
         /// <returns></returns>
-        public async Task<IEnumerable<SearchMovieViewModel>> PopularMovies(int currentlyLoaded, int toLoad, CancellationToken cancellationToken)
+        public async Task<IEnumerable<SearchMovieViewModel>> PopularMovies(int currentlyLoaded, int toLoad, CancellationToken cancellationToken, string langCustomCode = null)
         {
-            var langCode = await DefaultLanguageCode(null);
+            var langCode = await DefaultLanguageCode(langCustomCode);
 
             var pages = PaginationHelper.GetNextPages(currentlyLoaded, toLoad, _theMovieDbMaxPageItems);
 
diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
index 9b9b40906..952c897d6 100644
--- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
@@ -107,9 +107,9 @@ namespace Ombi.Core.Engine.V2
             return await ProcessResult(mapped);
         }
 
-        public async Task<IEnumerable<SearchTvShowViewModel>> Popular(int currentlyLoaded, int amountToLoad)
+        public async Task<IEnumerable<SearchTvShowViewModel>> Popular(int currentlyLoaded, int amountToLoad, string langCustomCode = null)
         {
-            var langCode = await DefaultLanguageCode(null);
+            var langCode = await DefaultLanguageCode(langCustomCode);
 
             var pages = PaginationHelper.GetNextPages(currentlyLoaded, amountToLoad, ResultLimit);
             var results = new List<MovieDbSearchResult>();
diff --git a/src/Ombi.Core/Models/Search/SearchTvShowViewModel.cs b/src/Ombi.Core/Models/Search/SearchTvShowViewModel.cs
index dfd038a91..1a3f47175 100644
--- a/src/Ombi.Core/Models/Search/SearchTvShowViewModel.cs
+++ b/src/Ombi.Core/Models/Search/SearchTvShowViewModel.cs
@@ -58,9 +58,6 @@ namespace Ombi.Core.Models.Search
         public bool PartlyAvailable { get; set; }
         public override RequestType Type => RequestType.TvShow;
 
-        /// <summary>
-        /// Only set on the images call
-        /// </summary>
         public string BackdropPath { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi/Controllers/V1/ImagesController.cs b/src/Ombi/Controllers/V1/ImagesController.cs
index c119efe70..847cd8777 100644
--- a/src/Ombi/Controllers/V1/ImagesController.cs
+++ b/src/Ombi/Controllers/V1/ImagesController.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Options;
 using Ombi.Api.FanartTv;
 using Ombi.Config;
 using Ombi.Core;
+using Ombi.Core.Engine.Interfaces;
 using Ombi.Helpers;
 using Ombi.Store.Repository;
 
@@ -17,13 +18,16 @@ namespace Ombi.Controllers.V1
     public class ImagesController : ControllerBase
     {
         public ImagesController(IFanartTvApi fanartTvApi, IApplicationConfigRepository config,
-            IOptions<LandingPageBackground> options, ICacheService c, IImageService imageService)
+            IOptions<LandingPageBackground> options, ICacheService c, IImageService imageService,
+            IMovieEngineV2 movieEngineV2, ITVSearchEngineV2 tVSearchEngineV2)
         {
             FanartTvApi = fanartTvApi;
             Config = config;
             Options = options.Value;
             _cache = c;
             _imageService = imageService;
+            _movieEngineV2 = movieEngineV2;
+            _tvSearchEngineV2 = tVSearchEngineV2;
         }
 
         private IFanartTvApi FanartTvApi { get; }
@@ -31,6 +35,8 @@ namespace Ombi.Controllers.V1
         private LandingPageBackground Options { get; }
         private readonly ICacheService _cache;
         private readonly IImageService _imageService;
+        private readonly IMovieEngineV2 _movieEngineV2;
+        private readonly ITVSearchEngineV2 _tvSearchEngineV2;
 
         [HttpGet("tv/{tvdbid}")]
         public async Task<string> GetTvBanner(int tvdbid)
@@ -61,6 +67,50 @@ namespace Ombi.Controllers.V1
             return string.Empty;
         }
 
+        [HttpGet("poster")]
+        public async Task<string> GetRandomPoster()
+        {
+            var key = await _cache.GetOrAdd(CacheKeys.FanartTv, async () => await Config.GetAsync(Store.Entities.ConfigurationTypes.FanartTv), DateTime.Now.AddDays(1));
+            var rand = new Random();
+            var val = rand.Next(1, 3);
+            if (val == 1)
+            {
+                var movies = (await _movieEngineV2.PopularMovies(0, 10, HttpContext.RequestAborted ,"en")).ToArray();
+                var selectedMovieIndex = rand.Next(movies.Count());
+                var movie = movies[selectedMovieIndex];
+
+                var images = await _cache.GetOrAdd($"{CacheKeys.FanartTv}movie{movie.Id}", async () => await FanartTvApi.GetMovieImages(movie.Id.ToString(), key.Value), DateTime.Now.AddDays(1));
+                if (images == null)
+                {
+                    return string.Empty;
+                }
+
+                if (images.movieposter?.Any() ?? false)
+                {
+                    var enImage = images.movieposter.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
+                    if (enImage == null)
+                    {
+                        return images.movieposter.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
+                    }
+                    return enImage;
+                }
+
+                if (images.moviethumb?.Any() ?? false)
+                {
+                    return images.moviethumb.OrderBy(x => x.likes).Select(x => x.url).FirstOrDefault();
+                }
+            } 
+            else
+            {
+                var tv = (await _tvSearchEngineV2.Popular(0, 10, "en")).ToArray();
+                var selectedMovieIndex = rand.Next(tv.Count());
+                var selected = tv[selectedMovieIndex];
+
+                return $"https://image.tmdb.org/t/p/original{selected.BackdropPath}";
+            }
+            return "";
+        }
+
         [HttpGet("poster/movie/{movieDbId}")]
         public async Task<string> GetMoviePoster(string movieDbId)
         {

From 20c46ad027099a64114d453a6b57ff2db96f6b33 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Mon, 12 Apr 2021 10:57:27 +0100
Subject: [PATCH 11/39] Fixed the bug where it stated Ombi was on the wrong
 version in the settings!

---
 src/Ombi/Ombi.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj
index 48681e423..63c4f5a87 100644
--- a/src/Ombi/Ombi.csproj
+++ b/src/Ombi/Ombi.csproj
@@ -6,8 +6,8 @@
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <!-- <PublishTrimmed>true</PublishTrimmed>    
     <PublishReadyToRun>true</PublishReadyToRun> -->
-    <AssemblyVersion>4.0.1328.0</AssemblyVersion>
-    <FileVersion>4.0.1328.0</FileVersion>
+    <AssemblyVersion>$(SemVer)</AssemblyVersion>
+    <FileVersion>$(SemVer)</FileVersion>
     <Version>$(FullVer)</Version>
     <PackageVersion></PackageVersion>
     <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>    

From 2a284ce75cd79ec74dbd384051c4566f7dfe38de Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 13 Apr 2021 10:49:20 +0100
Subject: [PATCH 12/39] Fixed the issue where TV Shows were not being hidden
 from the Discover section

---
 src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs   | 91 ++++++++++++-------
 .../Rule/Rules/Search/PlexAvailabilityRule.cs | 14 +++
 src/Ombi.Mapping/Profiles/TvProfile.cs        |  4 +-
 .../Models/MovieDbSearchResult.cs             | 10 +-
 4 files changed, 82 insertions(+), 37 deletions(-)

diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
index 952c897d6..a24878da7 100644
--- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
@@ -22,6 +22,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Threading;
 using Ombi.Api.TheMovieDb;
 using Ombi.Api.TheMovieDb.Models;
+using System.Diagnostics;
 
 namespace Ombi.Core.Engine.V2
 {
@@ -69,39 +70,7 @@ namespace Ombi.Core.Engine.V2
             {
                 var seasonEpisodes = (await _movieApi.GetSeasonEpisodes(show.id, tvSeason.season_number, token));
 
-                foreach (var episode in seasonEpisodes.episodes)
-                {
-                    var season = mapped.SeasonRequests.FirstOrDefault(x => x.SeasonNumber == episode.season_number);
-                    if (season == null)
-                    {
-                        var newSeason = new SeasonRequests
-                        {
-                            SeasonNumber = episode.season_number,
-                            Overview = tvSeason.overview,
-                            Episodes = new List<EpisodeRequests>()
-                        };
-                        newSeason.Episodes.Add(new EpisodeRequests
-                        {
-                            //Url = episode...ToHttpsUrl(),
-                            Title = episode.name,
-                            AirDate = episode.air_date.HasValue() ? DateTime.Parse(episode.air_date) : DateTime.MinValue,
-                            EpisodeNumber = episode.episode_number,
-
-                        });
-                        mapped.SeasonRequests.Add(newSeason);
-                    }
-                    else
-                    {
-                        // We already have the season, so just add the episode
-                        season.Episodes.Add(new EpisodeRequests
-                        {
-                            //Url = e.url.ToHttpsUrl(),
-                            Title = episode.name,
-                            AirDate = episode.air_date.HasValue() ? DateTime.Parse(episode.air_date) : DateTime.MinValue,
-                            EpisodeNumber = episode.episode_number,
-                        });
-                    }
-                }
+                MapSeasons(mapped.SeasonRequests, tvSeason, seasonEpisodes);
             }
 
             return await ProcessResult(mapped);
@@ -152,6 +121,7 @@ namespace Ombi.Core.Engine.V2
                     async () => await _movieApi.TopRatedTv(langCode, pagesToLoad.Page), DateTime.Now.AddHours(12));
                 results.AddRange(apiResult.Skip(pagesToLoad.Skip).Take(pagesToLoad.Take));
             }
+
             var processed = ProcessResults(results);
             return await processed;
         }
@@ -177,22 +147,73 @@ namespace Ombi.Core.Engine.V2
             return data;
         }
 
-        private async Task<IEnumerable<SearchTvShowViewModel>> ProcessResults<T>(IEnumerable<T> items)
+        private async Task<IEnumerable<SearchTvShowViewModel>> ProcessResults(List<MovieDbSearchResult> items)
         {
             var retVal = new List<SearchTvShowViewModel>(); 
             var settings = await _customization.GetSettingsAsync();
+
             foreach (var tvMazeSearch in items)
             {
+                var show = await Cache.GetOrAdd(nameof(GetShowInformation) + tvMazeSearch.Id.ToString(),
+                    async () => await _movieApi.GetTVInfo(tvMazeSearch.Id.ToString()), DateTime.Now.AddHours(12));
+                foreach (var tvSeason in show.seasons.Where(x => x.season_number != 0)) // skip the first season
+                {
+                    var seasonEpisodes = await Cache.GetOrAdd("SeasonEpisodes" + show.id + tvSeason.season_number, async () =>
+                    {
+                        return await _movieApi.GetSeasonEpisodes(show.id, tvSeason.season_number, CancellationToken.None);
+                    }, DateTime.Now.AddHours(12));
+
+                    MapSeasons(tvMazeSearch.SeasonRequests, tvSeason, seasonEpisodes);
+                }
+
                 var result = await ProcessResult(tvMazeSearch);
-                if (result == null || settings.HideAvailableFromDiscover && result.Available)
+                if (result == null || settings.HideAvailableFromDiscover && result.FullyAvailable)
                 {
                     continue;
                 }
                 retVal.Add(result);
             }
+
             return retVal;
         }
 
+        private static void MapSeasons(List<SeasonRequests> seasonRequests, Season tvSeason, SeasonDetails seasonEpisodes)
+        {
+            foreach (var episode in seasonEpisodes.episodes)
+            {
+                var season = seasonRequests.FirstOrDefault(x => x.SeasonNumber == episode.season_number);
+                if (season == null)
+                {
+                    var newSeason = new SeasonRequests
+                    {
+                        SeasonNumber = episode.season_number,
+                        Overview = tvSeason.overview,
+                        Episodes = new List<EpisodeRequests>()
+                    };
+                    newSeason.Episodes.Add(new EpisodeRequests
+                    {
+                        //Url = episode...ToHttpsUrl(),
+                        Title = episode.name,
+                        AirDate = episode.air_date.HasValue() ? DateTime.Parse(episode.air_date) : DateTime.MinValue,
+                        EpisodeNumber = episode.episode_number,
+
+                    });
+                    seasonRequests.Add(newSeason);
+                }
+                else
+                {
+                    // We already have the season, so just add the episode
+                    season.Episodes.Add(new EpisodeRequests
+                    {
+                        //Url = e.url.ToHttpsUrl(),
+                        Title = episode.name,
+                        AirDate = episode.air_date.HasValue() ? DateTime.Parse(episode.air_date) : DateTime.MinValue,
+                        EpisodeNumber = episode.episode_number,
+                    });
+                }
+            }
+        }
+
         private async Task<SearchTvShowViewModel> ProcessResult<T>(T tvMazeSearch)
         {
             var item = _mapper.Map<SearchTvShowViewModel>(tvMazeSearch);
diff --git a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
index 2a239d1d3..d0397cc15 100644
--- a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
@@ -25,6 +25,7 @@ namespace Ombi.Core.Rule.Rules.Search
             PlexServerContent item = null;
             var useImdb = false;
             var useTheMovieDb = false;
+            var useId = false;
             var useTvDb = false;
             if (obj.ImdbId.HasValue())
             {
@@ -36,6 +37,14 @@ namespace Ombi.Core.Rule.Rules.Search
             }
             if (item == null)
             {
+                if (obj.Id > 0)
+                {
+                    item = await PlexContentRepository.Get(obj.Id.ToString());
+                    if (item != null)
+                    {
+                        useId = true;
+                    }
+                }
                 if (obj.TheMovieDbId.HasValue())
                 {
                     item = await PlexContentRepository.Get(obj.TheMovieDbId);
@@ -60,6 +69,11 @@ namespace Ombi.Core.Rule.Rules.Search
 
             if (item != null)
             {
+                if (useId)
+                {
+                    obj.TheMovieDbId = obj.Id.ToString();
+                    useTheMovieDb = true;
+                }
                 obj.Available = true;
                 obj.PlexUrl = item.Url;
                 obj.Quality = item.Quality;
diff --git a/src/Ombi.Mapping/Profiles/TvProfile.cs b/src/Ombi.Mapping/Profiles/TvProfile.cs
index 55f5ccf9e..0aceffc4f 100644
--- a/src/Ombi.Mapping/Profiles/TvProfile.cs
+++ b/src/Ombi.Mapping/Profiles/TvProfile.cs
@@ -81,7 +81,9 @@ namespace Ombi.Mapping.Profiles
                 .ForMember(dest => dest.Rating, opts => opts.MapFrom(src => src.VoteAverage.ToString()))
                 .ForMember(dest => dest.BackdropPath, opts => opts.MapFrom(src => src.PosterPath))
                 //.ForMember(dest => dest.Runtime, opts => opts.MapFrom(src => src.Runtime.ToString()))
-                .ForMember(dest => dest.Title, opts => opts.MapFrom(src => src.Title));
+                .ForMember(dest => dest.Title, opts => opts.MapFrom(src => src.Title))
+                .ForMember(dest => dest.SeasonRequests, opts => opts.MapFrom(src => src.SeasonRequests))
+                ;
                 //.ForMember(dest => dest.Status, opts => opts.MapFrom(src => TraktEnumHelper.GetDescription(src.Status)))
                 //.ForMember(dest => dest.Trailer,
                 //    opts => opts.MapFrom(src => src.Trailer != null ? src.Trailer.ToString().ToHttpsUrl() : string.Empty))
diff --git a/src/Ombi.TheMovieDbApi/Models/MovieDbSearchResult.cs b/src/Ombi.TheMovieDbApi/Models/MovieDbSearchResult.cs
index 0e4a8852f..e936578e9 100644
--- a/src/Ombi.TheMovieDbApi/Models/MovieDbSearchResult.cs
+++ b/src/Ombi.TheMovieDbApi/Models/MovieDbSearchResult.cs
@@ -1,4 +1,7 @@
-namespace Ombi.Api.TheMovieDb.Models
+using Ombi.Store.Repository.Requests;
+using System.Collections.Generic;
+
+namespace Ombi.Api.TheMovieDb.Models
 {
     public class MovieDbSearchResult
     {
@@ -16,5 +19,10 @@
         public int VoteCount { get; set; }
         public bool Video { get; set; }
         public float VoteAverage { get; set; }
+
+        /// <summary>
+        /// Mapped Property and not set from the API
+        /// </summary>
+        public List<SeasonRequests> SeasonRequests { get; set; } = new List<SeasonRequests>();
     }
 }
\ No newline at end of file

From 9c0d8f91e9144ce8ae2bfeb16502193b56512f95 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 13 Apr 2021 11:00:17 +0100
Subject: [PATCH 13/39] Performance improvement coming from the previous change

---
 src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
index a24878da7..56b0e8a22 100644
--- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
@@ -154,16 +154,20 @@ namespace Ombi.Core.Engine.V2
 
             foreach (var tvMazeSearch in items)
             {
-                var show = await Cache.GetOrAdd(nameof(GetShowInformation) + tvMazeSearch.Id.ToString(),
-                    async () => await _movieApi.GetTVInfo(tvMazeSearch.Id.ToString()), DateTime.Now.AddHours(12));
-                foreach (var tvSeason in show.seasons.Where(x => x.season_number != 0)) // skip the first season
+                if (settings.HideAvailableFromDiscover)
                 {
-                    var seasonEpisodes = await Cache.GetOrAdd("SeasonEpisodes" + show.id + tvSeason.season_number, async () =>
+                    // To hide, we need to know if it's fully available, the only way to do this is to lookup it's episodes to check if we have every episode
+                    var show = await Cache.GetOrAdd(nameof(GetShowInformation) + tvMazeSearch.Id.ToString(),
+                        async () => await _movieApi.GetTVInfo(tvMazeSearch.Id.ToString()), DateTime.Now.AddHours(12));
+                    foreach (var tvSeason in show.seasons.Where(x => x.season_number != 0)) // skip the first season
                     {
-                        return await _movieApi.GetSeasonEpisodes(show.id, tvSeason.season_number, CancellationToken.None);
-                    }, DateTime.Now.AddHours(12));
+                        var seasonEpisodes = await Cache.GetOrAdd("SeasonEpisodes" + show.id + tvSeason.season_number, async () =>
+                        {
+                            return await _movieApi.GetSeasonEpisodes(show.id, tvSeason.season_number, CancellationToken.None);
+                        }, DateTime.Now.AddHours(12));
 
-                    MapSeasons(tvMazeSearch.SeasonRequests, tvSeason, seasonEpisodes);
+                        MapSeasons(tvMazeSearch.SeasonRequests, tvSeason, seasonEpisodes);
+                    }
                 }
 
                 var result = await ProcessResult(tvMazeSearch);

From 9d8f8056bbf2c1b0a173667d8b3e96684cb405c4 Mon Sep 17 00:00:00 2001
From: Matt <927830+mattmattmatt@users.noreply.github.com>
Date: Fri, 16 Apr 2021 18:51:07 -0700
Subject: [PATCH 14/39] Fix TMDB logo URL

Previous value `{{baseUrl}}images/tmdb-logo.svg` leads to broken image requests, e.g. `server.com/ombiimage/tmdb-logo.svg`. We need to trail the `baseURL` with a `/` to ensure the correct path, e.g. `server.com/ombi/image/tmdb-logo.svg`. See also lines 9 and lines 14.
---
 .../movie/panels/movie-information-panel.component.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
index 5ba86e631..6b0da8604 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html
@@ -2,7 +2,7 @@
     <div class="rating medium-font">
         <span *ngIf="movie.voteAverage"
             matTooltip="{{'MediaDetails.Votes' | translate }}  {{movie.voteCount | thousandShort: 1}}">
-            <img class="rating-small" src="{{baseUrl}}images/tmdb-logo.svg"> {{movie.voteAverage | number:'1.0-1'}}/10
+            <img class="rating-small" src="{{baseUrl}}/images/tmdb-logo.svg"> {{movie.voteAverage | number:'1.0-1'}}/10
         </span>
         <span *ngIf="ratings?.critics_rating && ratings?.critics_score">
             <img class="rating-small"
@@ -122,4 +122,4 @@
                 {{keyword.name}}
             </mat-chip>
         </mat-chip-list>
-    </div>
\ No newline at end of file
+    </div>

From 61313ba861a60d673f9b9053636174cfbf95041d Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 20 Apr 2021 09:46:38 +0100
Subject: [PATCH 15/39] Added more context in the mobile notifications

---
 src/Ombi.Notifications/Agents/MobileNotification.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Ombi.Notifications/Agents/MobileNotification.cs b/src/Ombi.Notifications/Agents/MobileNotification.cs
index 6080acdf0..864453b71 100644
--- a/src/Ombi.Notifications/Agents/MobileNotification.cs
+++ b/src/Ombi.Notifications/Agents/MobileNotification.cs
@@ -57,6 +57,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "New Request",
                 Data = GetNotificationData(parsed, NotificationType.NewRequest)
             };
 
@@ -76,6 +77,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "New Issue",
                 Data = GetNotificationData(parsed, NotificationType.Issue)
             };
 
@@ -127,6 +129,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "Issue Resolved",
                 Data = GetNotificationData(parsed, NotificationType.IssueResolved)
             };
 
@@ -149,6 +152,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "Request Error",
                 Data = GetNotificationData(parsed, NotificationType.ItemAddedToFaultQueue)
             };
 
@@ -168,6 +172,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "Request Declined",
                 Data = GetNotificationData(parsed, NotificationType.RequestDeclined)
             };
 
@@ -188,6 +193,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "Request Approved",
                 Data = GetNotificationData(parsed, NotificationType.RequestApproved)
             };
 
@@ -212,6 +218,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = parsed.Message,
+                Subject = "Request Available",
                 Data = data
             };
             // Send to user
@@ -259,6 +266,7 @@ namespace Ombi.Notifications.Agents
             var notification = new NotificationMessage
             {
                 Message = message,
+                Subject = "Test Notification"
             };
             // Send to user
             var user = await _userManager.Users.Include(x => x.NotificationUserIds).FirstOrDefaultAsync(x => x.Id.Equals(model.UserId));

From 16b2b849d48afbd22a2f4368f5020175a0335000 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Wed, 21 Apr 2021 12:28:32 +0100
Subject: [PATCH 16/39] Map the MediaServer URL for Tv Shows, so we can display
 the Plex button

---
 src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs | 1 +
 src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
index e651cc719..f131662be 100644
--- a/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs
@@ -371,6 +371,7 @@ namespace Ombi.Core.Engine.V2
                 mapped.Requested = movie.Requested;
                 mapped.PlexUrl = movie.PlexUrl;
                 mapped.EmbyUrl = movie.EmbyUrl;
+                mapped.JellyfinUrl = movie.JellyfinUrl;
                 mapped.Subscribed = movie.Subscribed;
                 mapped.ShowSubscribe = movie.ShowSubscribe;
                 mapped.ReleaseDate = movie.ReleaseDate;
diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
index 56b0e8a22..9d97285df 100644
--- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
@@ -241,6 +241,9 @@ namespace Ombi.Core.Engine.V2
             item.Approved = oldModel.Approved;
             item.SeasonRequests = oldModel.SeasonRequests;
             item.RequestId = oldModel.RequestId;
+            item.PlexUrl = oldModel.PlexUrl;
+            item.EmbyUrl = oldModel.EmbyUrl;
+            item.JellyfinUrl = oldModel.JellyfinUrl;
 
             if (!string.IsNullOrEmpty(item.Images?.Medium))
             {

From acc886293dec5a746d2bd5f0bc7a033ef3176b2d Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Mon, 26 Apr 2021 08:43:03 +0100
Subject: [PATCH 17/39] Update variables.yml

---
 .azuredevops/pipelines/templates/variables.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/pipelines/templates/variables.yml b/.azuredevops/pipelines/templates/variables.yml
index 205e68eaa..e90ecc049 100644
--- a/.azuredevops/pipelines/templates/variables.yml
+++ b/.azuredevops/pipelines/templates/variables.yml
@@ -27,4 +27,4 @@ variables:
     value: "4.0.$(Build.BuildId)"
 
   - name: isMain
-    value: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))]
\ No newline at end of file
+    value: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))]

From 69923db39fb9791a0729fce6edb8eef5241f855b Mon Sep 17 00:00:00 2001
From: sirmarv <3598205+sir-marv@users.noreply.github.com>
Date: Tue, 27 Apr 2021 07:50:57 -0400
Subject: [PATCH 18/39] Update WebhookApi.cs

Fixes #2448. Forward slash is no longer appended to the URL. If a user wants a / at the end of the URL, they will have to enter it in the webhook baseUrl.
---
 src/Ombi.Api.Webhook/WebhookApi.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ombi.Api.Webhook/WebhookApi.cs b/src/Ombi.Api.Webhook/WebhookApi.cs
index 8b6b35ca0..f2faaa18b 100644
--- a/src/Ombi.Api.Webhook/WebhookApi.cs
+++ b/src/Ombi.Api.Webhook/WebhookApi.cs
@@ -19,7 +19,7 @@ namespace Ombi.Api.Webhook
 
         public async Task PushAsync(string baseUrl, string accessToken, IDictionary<string, string> parameters)
         {
-            var request = new Request("/", baseUrl, HttpMethod.Post);
+            var request = new Request("", baseUrl, HttpMethod.Post);
 
             if (!string.IsNullOrWhiteSpace(accessToken))
             {

From a578374588b4ca9df4eadf4c424e9d3d76c06874 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 27 Apr 2021 20:43:08 +0100
Subject: [PATCH 19/39] TV results now respect the users set language

---
 src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
index 9d97285df..e02ae1c51 100644
--- a/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
+++ b/src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs
@@ -50,13 +50,14 @@ namespace Ombi.Core.Engine.V2
         public async Task<SearchFullInfoTvShowViewModel> GetShowByRequest(int requestId, CancellationToken token)
         {
             var request = await RequestService.TvRequestService.Get().FirstOrDefaultAsync(x => x.Id == requestId);
-            return await GetShowInformation(request.ExternalProviderId.ToString(), token); // TODO
+            return await GetShowInformation(request.ExternalProviderId.ToString(), token);
         }
 
         public async Task<SearchFullInfoTvShowViewModel> GetShowInformation(string tvdbid, CancellationToken token)
         {
-            var show = await Cache.GetOrAdd(nameof(GetShowInformation) + tvdbid,
-              async () => await _movieApi.GetTVInfo(tvdbid), DateTime.Now.AddHours(12));
+            var langCode = await DefaultLanguageCode(null);
+            var show = await Cache.GetOrAdd(nameof(GetShowInformation) + langCode + tvdbid,
+              async () => await _movieApi.GetTVInfo(tvdbid, langCode), DateTime.Now.AddHours(12));
             if (show == null || show.name == null)
             {
                 // We don't have enough information

From 264568f3969c7fb3bd85ba3205938eeb6c54cf5e Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 27 Apr 2021 22:17:01 +0100
Subject: [PATCH 20/39] Added the ability to re-process requests

---
 .../Engine/Interfaces/IRequestEngine.cs       |  2 ++
 src/Ombi.Core/Engine/MovieRequestEngine.cs    | 21 ++++++++++++++++++
 src/Ombi.Core/Engine/TvRequestEngine.cs       | 22 +++++++++++++++++++
 src/Ombi.Store/Repository/BaseRepository.cs   |  6 +++++
 src/Ombi.Store/Repository/IRepository.cs      |  2 ++
 .../movie/movie-details.component.html        |  1 +
 .../movie/movie-details.component.ts          | 10 +++++++++
 .../social-icons/social-icons.component.html  |  4 ++++
 .../social-icons/social-icons.component.ts    |  5 +++++
 .../tv-requests-panel.component.html          |  1 +
 .../tv-requests-panel.component.ts            | 19 +++++++++++++---
 .../src/app/services/request.service.ts       |  1 -
 .../src/app/services/requestV2.service.ts     |  6 ++++-
 src/Ombi/Controllers/V2/RequestsController.cs | 18 +++++++++++++++
 src/Ombi/wwwroot/translations/en.json         |  3 ++-
 15 files changed, 115 insertions(+), 6 deletions(-)

diff --git a/src/Ombi.Core/Engine/Interfaces/IRequestEngine.cs b/src/Ombi.Core/Engine/Interfaces/IRequestEngine.cs
index c8b7746f0..f4eeb6fc3 100644
--- a/src/Ombi.Core/Engine/Interfaces/IRequestEngine.cs
+++ b/src/Ombi.Core/Engine/Interfaces/IRequestEngine.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Ombi.Core.Models;
 using Ombi.Core.Models.Requests;
@@ -24,5 +25,6 @@ namespace Ombi.Core.Engine.Interfaces
         Task UnSubscribeRequest(int requestId, RequestType type);
         Task SubscribeToRequest(int requestId, RequestType type);
         Task<RequestQuotaCountModel> GetRemainingRequests(OmbiUser user = null);
+        Task<RequestEngineResult> ReProcessRequest(int requestId, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Core/Engine/MovieRequestEngine.cs b/src/Ombi.Core/Engine/MovieRequestEngine.cs
index 00a97f766..8d54f0fc3 100644
--- a/src/Ombi.Core/Engine/MovieRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MovieRequestEngine.cs
@@ -21,6 +21,7 @@ using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using Ombi.Core.Models;
+using System.Threading;
 
 namespace Ombi.Core.Engine
 {
@@ -555,6 +556,11 @@ namespace Ombi.Core.Engine
                 await NotificationHelper.Notify(request, NotificationType.RequestApproved);
             }
 
+            return await ProcessSendingMovie(request);
+        }
+
+        private async Task<RequestEngineResult> ProcessSendingMovie(MovieRequests request)
+        {
             if (request.Approved)
             {
                 var result = await Sender.Send(request);
@@ -634,6 +640,21 @@ namespace Ombi.Core.Engine
             return await MovieRepository.GetAll().AnyAsync(x => x.RequestedUserId == userId);
         }
 
+        public async Task<RequestEngineResult> ReProcessRequest(int requestId, CancellationToken cancellationToken)
+        {
+            var request = await MovieRepository.Find(requestId); 
+            if (request == null)
+            {
+                return new RequestEngineResult
+                {
+                    Result = false,
+                    ErrorMessage = "Request does not exist"
+                };
+            }
+
+            return await ProcessSendingMovie(request);
+        }
+
         public async Task<RequestEngineResult> MarkUnavailable(int modelId)
         {
             var request = await MovieRepository.Find(modelId);
diff --git a/src/Ombi.Core/Engine/TvRequestEngine.cs b/src/Ombi.Core/Engine/TvRequestEngine.cs
index e332dde75..5eae0912c 100644
--- a/src/Ombi.Core/Engine/TvRequestEngine.cs
+++ b/src/Ombi.Core/Engine/TvRequestEngine.cs
@@ -25,6 +25,7 @@ using Ombi.Settings.Settings.Models;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using Ombi.Core.Models;
+using System.Threading;
 
 namespace Ombi.Core.Engine
 {
@@ -896,6 +897,22 @@ namespace Ombi.Core.Engine
         }
 
 
+        public async Task<RequestEngineResult> ReProcessRequest(int requestId, CancellationToken cancellationToken)
+        {
+            var request = await TvRepository.GetChild().FirstOrDefaultAsync(x => x.Id == requestId, cancellationToken);
+            if (request == null)
+            {
+                return new RequestEngineResult
+                {
+                    Result = false,
+                    ErrorMessage = "Request does not exist"
+                };
+            }
+
+            return await ProcessSendingShow(request);
+        }
+
+
         private async Task<RequestEngineResult> AfterRequest(ChildRequests model, string requestOnBehalf)
         {
             var sendRuleResult = await RunSpecificRule(model, SpecificRules.CanSendNotification);
@@ -913,6 +930,11 @@ namespace Ombi.Core.Engine
                 EpisodeCount = model.SeasonRequests.Select(m => m.Episodes.Count).Sum(),
             });
 
+            return await ProcessSendingShow(model);
+        }
+
+        private async Task<RequestEngineResult> ProcessSendingShow(ChildRequests model)
+        {
             if (model.Approved)
             {
                 // Autosend
diff --git a/src/Ombi.Store/Repository/BaseRepository.cs b/src/Ombi.Store/Repository/BaseRepository.cs
index 2908309ce..9d7d91447 100644
--- a/src/Ombi.Store/Repository/BaseRepository.cs
+++ b/src/Ombi.Store/Repository/BaseRepository.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
@@ -28,6 +29,11 @@ namespace Ombi.Store.Repository
             return await _db.FindAsync(key);
         }
 
+        public async Task<T> Find(object key, CancellationToken cancellationToken)
+        {
+            return await _db.FindAsync(new[] { key }, cancellationToken: cancellationToken);
+        }
+
         public IQueryable<T> GetAll()
         {
             return _db.AsQueryable();
diff --git a/src/Ombi.Store/Repository/IRepository.cs b/src/Ombi.Store/Repository/IRepository.cs
index fd7dcc86d..b93b07d45 100644
--- a/src/Ombi.Store/Repository/IRepository.cs
+++ b/src/Ombi.Store/Repository/IRepository.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
@@ -12,6 +13,7 @@ namespace Ombi.Store.Repository
     public interface IRepository<T> where T : Entity
     {
         Task<T> Find(object key);
+        Task<T> Find(object key, CancellationToken cancellationToken);
         IQueryable<T> GetAll();
         Task<T> FirstOrDefaultAsync(Expression<Func<T, bool>> predicate);
         Task AddRange(IEnumerable<T> content, bool save = true);
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
index 928645f47..c0434980d 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html
@@ -24,6 +24,7 @@
             [type]="requestType"
             (openTrailer)="openDialog()"
             (onAdvancedOptions)="openAdvancedOptions()"
+            (onReProcessRequest)="reProcessRequest()"
             >
         </social-icons>
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
index 3911d64ce..01c8a5783 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts
@@ -190,6 +190,16 @@ export class MovieDetailsComponent {
         });
     }
 
+    public reProcessRequest() {
+        this.requestService2.reprocessRequest(this.movieRequest.id, RequestType.movie).subscribe(result => {
+            if (result.result) {
+                this.messageService.send(result.message ? result.message : "Successfully Re-processed the request", "Ok");
+            } else {
+                this.messageService.send(result.errorMessage, "Ok");
+            }
+        });
+    }
+
     private loadBanner() {
         this.imageService.getMovieBanner(this.theMovidDbId.toString()).subscribe(x => {
             if (!this.movie.backdropPath) {
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html
index 60cad7bb0..f05792aa9 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html
@@ -35,5 +35,9 @@
             <span *ngIf="type === RequestType.movie"> {{ 'MediaDetails.RadarrConfiguration' | translate}}</span>
             <span *ngIf="type === RequestType.tvShow"> {{ 'MediaDetails.SonarrConfiguration' | translate}}</span>
         </button>
+        <button *ngIf="type === RequestType.movie" mat-menu-item (click)="reProcessRequest()">
+            <i class="fas fa-sync icon-spacing"></i>
+            <span> {{ 'MediaDetails.ReProcessRequest' | translate}}</span>
+        </button>
     </mat-menu>
 </div>
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts
index 3a27fa723..bc504347b 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.ts
@@ -26,6 +26,7 @@ export class SocialIconsComponent {
 
     @Output() openTrailer: EventEmitter<any> = new EventEmitter();
     @Output() onAdvancedOptions: EventEmitter<any> = new EventEmitter();
+    @Output() onReProcessRequest: EventEmitter<any> = new EventEmitter();
 
     public RequestType = RequestType;
 
@@ -37,4 +38,8 @@ export class SocialIconsComponent {
     public openAdvancedOptions() {
         this.onAdvancedOptions.emit();
     }
+
+    public reProcessRequest() {
+        this.onReProcessRequest.emit();
+    }
 }
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.html
index 5db522024..8bca28fb5 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.html
@@ -70,6 +70,7 @@
     <button *ngIf="request.available" mat-raised-button color="warn" (click)="changeAvailability(request, false);">{{ 'Requests.MarkUnavailable' | translate }}</button>
     <button *ngIf="!request.denied" mat-raised-button color="danger" (click)="deny(request);">{{ 'Requests.Deny' | translate }}</button>
     <button mat-raised-button color="danger" (click)="delete(request);">{{ 'Requests.RequestPanel.Delete' | translate }}</button>
+    <button mat-raised-button color="accent" (click)="reProcessRequest(request);">{{ 'MediaDetails.ReProcessRequest' | translate }}</button>
 </div>
 
 
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.ts
index c7b0711b6..e51414902 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.ts
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/panels/tv-requests/tv-requests-panel.component.ts
@@ -4,6 +4,7 @@ import { RequestService } from "../../../../../services/request.service";
 import { MessageService } from "../../../../../services";
 import { MatDialog } from "@angular/material/dialog";
 import { DenyDialogComponent } from "../../../shared/deny-dialog/deny-dialog.component";
+import { RequestServiceV2 } from "../../../../../services/requestV2.service";
 
 @Component({
     templateUrl: "./tv-requests-panel.component.html",
@@ -16,7 +17,9 @@ export class TvRequestsPanelComponent {
 
     public displayedColumns: string[] = ['number', 'title', 'airDate', 'status'];
 
-    constructor(private requestService: RequestService, private messageService: MessageService,
+    constructor(private requestService: RequestService,
+        private requestService2: RequestServiceV2,
+        private messageService: MessageService,
         public dialog: MatDialog) {
 
     }
@@ -83,9 +86,9 @@ export class TvRequestsPanelComponent {
             width: '250px',
             data: {requestId: request.id,  requestType: RequestType.tvShow}
           });
-      
+
           dialogRef.afterClosed().subscribe(result => {
-            request.denied = true;    
+            request.denied = true;
             request.seasonRequests.forEach((season) => {
                 season.episodes.forEach((ep) => {
                     ep.approved = false;
@@ -93,4 +96,14 @@ export class TvRequestsPanelComponent {
             });
           });
     }
+
+    public reProcessRequest(request: IChildRequests) {
+        this.requestService2.reprocessRequest(request.id, RequestType.tvShow).subscribe(result => {
+            if (result.result) {
+                this.messageService.send(result.message ? result.message : "Successfully Re-processed the request", "Ok");
+            } else {
+                this.messageService.send(result.errorMessage, "Ok");
+            }
+        });
+    }
 }
diff --git a/src/Ombi/ClientApp/src/app/services/request.service.ts b/src/Ombi/ClientApp/src/app/services/request.service.ts
index 19a211f93..3fe60e5f3 100644
--- a/src/Ombi/ClientApp/src/app/services/request.service.ts
+++ b/src/Ombi/ClientApp/src/app/services/request.service.ts
@@ -187,5 +187,4 @@ export class RequestService extends ServiceHelpers {
     public removeAlbumRequest(request: number): any {
         return this.http.delete(`${this.url}music/${request}`, {headers: this.headers});
     }
-
 }
diff --git a/src/Ombi/ClientApp/src/app/services/requestV2.service.ts b/src/Ombi/ClientApp/src/app/services/requestV2.service.ts
index c6e155096..a7ebd6d0c 100644
--- a/src/Ombi/ClientApp/src/app/services/requestV2.service.ts
+++ b/src/Ombi/ClientApp/src/app/services/requestV2.service.ts
@@ -4,7 +4,7 @@ import { Injectable, Inject } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
 import { Observable } from "rxjs";
 import { ServiceHelpers } from "./service.helpers";
-import { IRequestsViewModel, IMovieRequests, IChildRequests, IMovieAdvancedOptions as IMediaAdvancedOptions, IRequestEngineResult, IAlbumRequest, ITvRequestViewModelV2 } from "../interfaces";
+import { IRequestsViewModel, IMovieRequests, IChildRequests, IMovieAdvancedOptions as IMediaAdvancedOptions, IRequestEngineResult, IAlbumRequest, ITvRequestViewModelV2, RequestType } from "../interfaces";
 
 
 @Injectable()
@@ -92,4 +92,8 @@ export class RequestServiceV2 extends ServiceHelpers {
     public requestTv(tv: ITvRequestViewModelV2): Observable<IRequestEngineResult> {
         return this.http.post<IRequestEngineResult>(`${this.url}TV/`, JSON.stringify(tv), {headers: this.headers});
     }
+
+    public reprocessRequest(requestId: number, type: RequestType): Observable<IRequestEngineResult> {
+        return this.http.post<IRequestEngineResult>(`${this.url}reprocess/${type}/${requestId}`, undefined, { headers: this.headers });
+    }
 }
diff --git a/src/Ombi/Controllers/V2/RequestsController.cs b/src/Ombi/Controllers/V2/RequestsController.cs
index 0bbbd4128..67d206e0b 100644
--- a/src/Ombi/Controllers/V2/RequestsController.cs
+++ b/src/Ombi/Controllers/V2/RequestsController.cs
@@ -11,6 +11,7 @@ using System;
 using Ombi.Store.Entities;
 using System.Linq;
 using Microsoft.Extensions.Logging;
+using Ombi.Attributes;
 
 namespace Ombi.Controllers.V2
 {
@@ -134,12 +135,14 @@ namespace Ombi.Controllers.V2
             return await _tvRequestEngine.GetUnavailableRequests(count, position, sort, sortOrder);
         }
 
+        [PowerUser]
         [HttpPost("movie/advancedoptions")]
         public async Task<RequestEngineResult> UpdateAdvancedOptions([FromBody] MediaAdvancedOptions options)
         {
             return await _movieRequestEngine.UpdateAdvancedOptions(options);
         }
 
+        [PowerUser]
         [HttpPost("tv/advancedoptions")]
         public async Task<RequestEngineResult> UpdateTvAdvancedOptions([FromBody] MediaAdvancedOptions options)
         {
@@ -198,6 +201,21 @@ namespace Ombi.Controllers.V2
             return result;
         }
 
+        [PowerUser]
+        [HttpPost("reprocess/{type}/{requestId}")]
+        public async Task<IActionResult> ReProcessRequest(RequestType type, int requestId)
+        {
+            switch (type)
+            {
+                case RequestType.TvShow:
+                    return Ok(await _tvRequestEngine.ReProcessRequest(requestId, HttpContext.RequestAborted));
+                case RequestType.Movie:
+                    return Ok(await _movieRequestEngine.ReProcessRequest(requestId, HttpContext.RequestAborted));
+            }
+
+            return BadRequest();
+        }
+
         private string GetApiAlias()
         {
             // Make sure this only applies when using the API KEY
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index eab1b18d0..18e864bdd 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -288,7 +288,8 @@
         "RadarrConfiguration": "Radarr Configuration",
         "RequestOnBehalf": "Request on behalf of",
         "PleaseSelectUser": "Please select a user",
-        "StreamingOn": "Streaming On"
+        "StreamingOn": "Streaming On",
+        "ReProcessRequest": "Re-Process Request"
     },
     "Discovery": {
         "PopularTab": "Popular",

From 0ad573a98a98f39d05434d28368937037045dd58 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Fri, 30 Apr 2021 20:40:42 +0100
Subject: [PATCH 21/39] Fixed the issue where searching some movies may appear
 available if they have the same TvDb Id as the result's MovieDbId...

---
 .../Rule/Rules/Search/PlexAvailabilityRule.cs |  8 +++----
 src/Ombi.Helpers.Tests/PlexHelperTests.cs     |  1 +
 .../Jobs/Plex/PlexAvailabilityChecker.cs      |  4 ++--
 .../Repository/IPlexContentRepository.cs      |  3 ++-
 .../Repository/PlexContentRepository.cs       | 22 +++++++++++--------
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
index d0397cc15..7b757802d 100644
--- a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
@@ -29,7 +29,7 @@ namespace Ombi.Core.Rule.Rules.Search
             var useTvDb = false;
             if (obj.ImdbId.HasValue())
             {
-                item = await PlexContentRepository.Get(obj.ImdbId);
+                item = await PlexContentRepository.Get(obj.ImdbId, ProviderType.ImdbId);
                 if (item != null)
                 {
                     useImdb = true;
@@ -39,7 +39,7 @@ namespace Ombi.Core.Rule.Rules.Search
             {
                 if (obj.Id > 0)
                 {
-                    item = await PlexContentRepository.Get(obj.Id.ToString());
+                    item = await PlexContentRepository.Get(obj.Id.ToString(), ProviderType.TheMovieDbId);
                     if (item != null)
                     {
                         useId = true;
@@ -47,7 +47,7 @@ namespace Ombi.Core.Rule.Rules.Search
                 }
                 if (obj.TheMovieDbId.HasValue())
                 {
-                    item = await PlexContentRepository.Get(obj.TheMovieDbId);
+                    item = await PlexContentRepository.Get(obj.TheMovieDbId, ProviderType.TheMovieDbId);
                     if (item != null)
                     {
                         useTheMovieDb = true;
@@ -58,7 +58,7 @@ namespace Ombi.Core.Rule.Rules.Search
                 {
                     if (obj.TheTvDbId.HasValue())
                     {
-                        item = await PlexContentRepository.Get(obj.TheTvDbId);
+                        item = await PlexContentRepository.Get(obj.TheTvDbId, ProviderType.TvDbId);
                         if (item != null)
                         {
                             useTvDb = true;
diff --git a/src/Ombi.Helpers.Tests/PlexHelperTests.cs b/src/Ombi.Helpers.Tests/PlexHelperTests.cs
index 82b59fdf7..e7d35a583 100644
--- a/src/Ombi.Helpers.Tests/PlexHelperTests.cs
+++ b/src/Ombi.Helpers.Tests/PlexHelperTests.cs
@@ -61,6 +61,7 @@ namespace Ombi.Helpers.Tests
             get
             {
                 yield return new TestCaseData("plex://movie/5e1632df2d4d84003e48e54e|imdb://tt9178402|tmdb://610201", new ProviderId { ImdbId = "tt9178402", TheMovieDb = "610201" }).SetName("V2 Regular Plex Id");
+                yield return new TestCaseData("plex://movie/5e1632df2d4d84003e48e54e|imdb://tt9178402|tmdb://610201|thetvdb://12345", new ProviderId { ImdbId = "tt9178402", TheMovieDb = "610201", TheTvDb = "12345" }).SetName("V2 Regular Plex Id w/ tvdb");
                 yield return new TestCaseData("plex://movie/5d7768253c3c2a001fbcab72|imdb://tt0119567|tmdb://330", new ProviderId { ImdbId = "tt0119567", TheMovieDb = "330" }).SetName("V2 Regular Plex Id Another");
                 yield return new TestCaseData("plex://movie/5d7768253c3c2a001fbcab72|imdb://tt0119567", new ProviderId { ImdbId = "tt0119567" }).SetName("V2 Regular Plex Id Single Imdb");
                 yield return new TestCaseData("plex://movie/5d7768253c3c2a001fbcab72|tmdb://330", new ProviderId { TheMovieDb = "330" }).SetName("V2 Regular Plex Id Single Tmdb");
diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs b/src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs
index d1d26d6e1..f203f297a 100644
--- a/src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs
+++ b/src/Ombi.Schedule/Jobs/Plex/PlexAvailabilityChecker.cs
@@ -183,13 +183,13 @@ namespace Ombi.Schedule.Jobs.Plex
                 PlexServerContent item = null;
                 if (movie.ImdbId.HasValue())
                 {
-                    item = await _repo.Get(movie.ImdbId);
+                    item = await _repo.Get(movie.ImdbId, ProviderType.ImdbId);
                 }
                 if (item == null)
                 {
                     if (movie.TheMovieDbId.ToString().HasValue())
                     {
-                        item = await _repo.Get(movie.TheMovieDbId.ToString());
+                        item = await _repo.Get(movie.TheMovieDbId.ToString(), ProviderType.TheMovieDbId);
                     }
                 }
                 if (item == null)
diff --git a/src/Ombi.Store/Repository/IPlexContentRepository.cs b/src/Ombi.Store/Repository/IPlexContentRepository.cs
index 7bce2e75a..d1d30a630 100644
--- a/src/Ombi.Store/Repository/IPlexContentRepository.cs
+++ b/src/Ombi.Store/Repository/IPlexContentRepository.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using Ombi.Helpers;
 using Ombi.Store.Entities;
 
 namespace Ombi.Store.Repository
@@ -10,7 +11,7 @@ namespace Ombi.Store.Repository
     public interface IPlexContentRepository : IExternalRepository<PlexServerContent>
     {
         Task<bool> ContentExists(string providerId);
-        Task<PlexServerContent> Get(string providerId);
+        Task<PlexServerContent> Get(string providerId, ProviderType type);
         Task<PlexServerContent> GetByKey(int key);
         Task Update(PlexServerContent existingContent);
         IQueryable<PlexEpisode> GetAllEpisodes();
diff --git a/src/Ombi.Store/Repository/PlexContentRepository.cs b/src/Ombi.Store/Repository/PlexContentRepository.cs
index 1d53874a1..e5c31172e 100644
--- a/src/Ombi.Store/Repository/PlexContentRepository.cs
+++ b/src/Ombi.Store/Repository/PlexContentRepository.cs
@@ -31,6 +31,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Ombi.Helpers;
 using Ombi.Store.Context;
 using Ombi.Store.Entities;
 
@@ -61,18 +62,21 @@ namespace Ombi.Store.Repository
             return any;
         }
 
-        public async Task<PlexServerContent> Get(string providerId)
+        public async Task<PlexServerContent> Get(string providerId, ProviderType type)
         {
-            var item = await Db.PlexServerContent.FirstOrDefaultAsync(x => x.ImdbId == providerId);
-            if (item == null)
+            switch (type)
             {
-                item = await Db.PlexServerContent.FirstOrDefaultAsync(x => x.TheMovieDbId == providerId);
-                if (item == null)
-                {
-                    item = await Db.PlexServerContent.FirstOrDefaultAsync(x => x.TvDbId == providerId);
-                }
+                case ProviderType.ImdbId:
+                    return await Db.PlexServerContent.FirstOrDefaultAsync(x => x.ImdbId == providerId);
+                case ProviderType.TheMovieDbId:
+                    return await Db.PlexServerContent.FirstOrDefaultAsync(x => x.TheMovieDbId == providerId);
+                case ProviderType.TvDbId:
+                    return await Db.PlexServerContent.FirstOrDefaultAsync(x => x.TvDbId == providerId);
+                default:
+                    break;
             }
-            return item;
+
+            return null;
         }
 
         public async Task<PlexServerContent> GetByKey(int key)

From 2e316c51d26c93b3defaf9aa951a3cb27020adcf Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sat, 1 May 2021 21:56:06 +0100
Subject: [PATCH 22/39] Fixed build

---
 src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs b/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs
index 7704b78ac..a86afcad0 100644
--- a/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs
+++ b/src/Ombi.Schedule.Tests/PlexAvailabilityCheckerTests.cs
@@ -17,6 +17,7 @@ using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;
 using Ombi.Store.Repository;
 using Ombi.Store.Repository.Requests;
+using Ombi.Helpers;
 
 namespace Ombi.Schedule.Tests
 {
@@ -53,7 +54,7 @@ namespace Ombi.Schedule.Tests
                 ImdbId = "test"
             };
             _movie.Setup(x => x.GetAll()).Returns(new List<MovieRequests> { request }.AsQueryable());
-            _repo.Setup(x => x.Get("test")).ReturnsAsync(new PlexServerContent());
+            _repo.Setup(x => x.Get("test", ProviderType.ImdbId)).ReturnsAsync(new PlexServerContent());
 
             await Checker.Execute(null);
 

From 8aec700f1194ead922a4f0b68e68f35954720fa6 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 4 May 2021 09:00:27 +0100
Subject: [PATCH 23/39] Added some app store links to the new mobile app

---
 .../user-preference.component.html            | 76 ++++++++++---------
 .../user-preference.component.ts              | 11 +--
 src/Ombi/wwwroot/images/appstore.svg          | 46 +++++++++++
 3 files changed, 87 insertions(+), 46 deletions(-)
 create mode 100644 src/Ombi/wwwroot/images/appstore.svg

diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
index e5fbc6c2f..b809a510d 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
@@ -1,7 +1,7 @@
 <div class="small-middle-container" *ngIf="username">
   <div class="d-flex">
     <img class="profile-img" [src]="getProfileImage()">
-    <h2 id="usernameTitle">{{username}} 
+    <h2 id="usernameTitle">{{username}}
       <small id="emailTitle" *ngIf="user.emailAddress">({{user.emailAddress}})</small>
     </h2>
   </div>
@@ -34,9 +34,7 @@
                 </mat-select>
               </mat-form-field>
             </div>
-          </div>
 
-          <div class="col-12 col-sm-6 col-xl-5">
             <div>
               <small>{{'UserPreferences.StreamingCountryDescription' | translate}}</small>
               <br>
@@ -50,47 +48,64 @@
               </mat-form-field>
             </div>
           </div>
+
+          <div style="margin-left:4%" class="col-12 col-sm-6 col-xl-5">
+            <mat-label [translate]="'UserPreferences.MobileQRCode'"></mat-label>
+            <div id="noQrCode" *ngIf="!qrCodeEnabled" [translate]="'UserPreferences.NoQrCode'"></div>
+         <div class="row">
+            <qrcode id="qrCode" *ngIf="qrCodeEnabled" [qrdata]="qrCode" [size]="256" [level]="'L'"></qrcode>
+            <div class="row">
+            <div class="col-12">
+              <a href='https://play.google.com/store/apps/details?id=com.tidusjar.Ombi&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'
+                target="_blank"><img width="200px" alt='Get it on Google Play'
+                  src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' /></a>
+            </div>
+            <div class="col-12">
+              <a href='https://apps.apple.com/us/app/ombi/id1335260043' target="_blank"><img style="margin-left:13px" width="170px"
+                  alt='Get it on Google Play' src='../../../images/appstore.svg' /></a>
+            </div></div>
+          </div></div>
         </div>
       </div>
 
     </mat-tab>
-    <mat-tab  *ngIf="user.userType === UserType.LocalUser" label="Security">
+    <mat-tab *ngIf="user.userType === UserType.LocalUser" label="Security">
       <div class="tab-content">
         <h2>Change Details</h2>
-        <form  novalidate [formGroup]="passwordForm" (ngSubmit)="updatePassword()">
+        <form novalidate [formGroup]="passwordForm" (ngSubmit)="updatePassword()">
           <div class="row">
             <div class="col-md-6 col-12">
               <span>You need your current password to make any changes here</span>
-            <mat-form-field appearance="outline" floatLabel=always>
-              <mat-label>Current Password</mat-label>
-              <input id="currentPassword" matInput type="password" formControlName="currentPassword">
-            </mat-form-field>
-          </div>
+              <mat-form-field appearance="outline" floatLabel=always>
+                <mat-label>Current Password</mat-label>
+                <input id="currentPassword" matInput type="password" formControlName="currentPassword">
+              </mat-form-field>
+            </div>
           </div>
           <div class="row">
             <div class="col-md-6 col-12">
-            <mat-form-field appearance="outline" floatLabel=always>
-              <mat-label>Email Address</mat-label>
-              <input id="email" matInput formControlName="emailAddress">
-            </mat-form-field>
-          </div>
+              <mat-form-field appearance="outline" floatLabel=always>
+                <mat-label>Email Address</mat-label>
+                <input id="email" matInput formControlName="emailAddress">
+              </mat-form-field>
+            </div>
           </div>
 
           <div class="row">
             <div class="col-md-6 col-12">
-            <mat-form-field appearance="outline" floatLabel=always>
-              <mat-label>New Password</mat-label>
-              <input id="newPassword" matInput type="password" formControlName="password">
-            </mat-form-field>
-          </div>
+              <mat-form-field appearance="outline" floatLabel=always>
+                <mat-label>New Password</mat-label>
+                <input id="newPassword" matInput type="password" formControlName="password">
+              </mat-form-field>
+            </div>
           </div>
           <div class="row">
             <div class="col-md-6 col-12">
-            <mat-form-field appearance="outline" floatLabel=always>
-              <mat-label>New Password Confirm</mat-label>
-              <input id="confirmPassword" matInput type="password" formControlName="confirmPassword">
-            </mat-form-field>
-          </div>
+              <mat-form-field appearance="outline" floatLabel=always>
+                <mat-label>New Password Confirm</mat-label>
+                <input id="confirmPassword" matInput type="password" formControlName="confirmPassword">
+              </mat-form-field>
+            </div>
           </div>
           <button id="submitSecurity" mat-raised-button color="accent" type="submit">Update</button>
         </form>
@@ -103,17 +118,6 @@
     <!-- <mat-tab label="Preferences"> Coming Soon... </mat-tab> -->
 
 
-    <mat-tab label="Mobile">
-      <div class="tab-content">
-        <div class="col-7">
-          <mat-label [translate]="'UserPreferences.MobileQRCode'"></mat-label>
-          <div id="noQrCode" *ngIf="!qrCodeEnabled" [translate]="'UserPreferences.NoQrCode'"></div>
-          <qrcode id="qrCode" *ngIf="qrCodeEnabled" [qrdata]="qrCode" [size]="256" [level]="'L'"></qrcode>
-          <button mat-raised-button (click)="openMobileApp($event)" *ngIf="customizationSettings.applicationUrl"> {{
-            'UserPreferences.LegacyApp' | translate }}</button>
-        </div>
-      </div>
-    </mat-tab>
   </mat-tab-group>
 
 
diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
index 50753dfc8..ae68055a6 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
@@ -86,15 +86,6 @@ export class UserPreferenceComponent implements OnInit {
         this.identityService.updateStreamingCountry(this.selectedCountry).subscribe(x => this.notification.success(this.translate.instant("UserPreferences.Updated")));
     }
 
-    public openMobileApp(event: any) {
-        event.preventDefault();
-
-        this.identityService.getAccessToken().subscribe(x => {
-            const url = `ombi://${this.customizationSettings.applicationUrl}_${x}`;
-            window.location.assign(url);
-        });
-    }
-
     public getProfileImage(): string {
         let emailHash: string|Int32Array;
         if (this.user.emailAddress) {
@@ -131,7 +122,7 @@ export class UserPreferenceComponent implements OnInit {
 
 
     private welcomeText: string;
-  private setWelcomeText() {
+    private setWelcomeText() {
     var d = new Date();
     var hour = d.getHours();
 
diff --git a/src/Ombi/wwwroot/images/appstore.svg b/src/Ombi/wwwroot/images/appstore.svg
new file mode 100644
index 000000000..072b425a1
--- /dev/null
+++ b/src/Ombi/wwwroot/images/appstore.svg
@@ -0,0 +1,46 @@
+<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
+  <title>Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917</title>
+  <g>
+    <g>
+      <g>
+        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
+        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
+      </g>
+      <g id="_Group_" data-name="&lt;Group&gt;">
+        <g id="_Group_2" data-name="&lt;Group&gt;">
+          <g id="_Group_3" data-name="&lt;Group&gt;">
+            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
+            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
+          </g>
+        </g>
+        <g>
+          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
+          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
+          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
+          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
+          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
+          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
+          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
+          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
+        </g>
+      </g>
+    </g>
+    <g id="_Group_4" data-name="&lt;Group&gt;">
+      <g>
+        <path d="M37.82619,8.731a2.63964,2.63964,0,0,1,2.80762,2.96484c0,1.90625-1.03027,3.002-2.80762,3.002H35.67092V8.731Zm-1.22852,5.123h1.125a1.87588,1.87588,0,0,0,1.96777-2.146,1.881,1.881,0,0,0-1.96777-2.13379h-1.125Z" style="fill: #fff"/>
+        <path d="M41.68068,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C44.57522,13.99463,45.01369,13.42432,45.01369,12.44434Z" style="fill: #fff"/>
+        <path d="M51.57326,14.69775h-.92187l-.93066-3.31641h-.07031l-.92676,3.31641h-.91309l-1.24121-4.50293h.90137l.80664,3.436h.06641l.92578-3.436h.85254l.92578,3.436h.07031l.80273-3.436h.88867Z" style="fill: #fff"/>
+        <path d="M53.85354,10.19482H54.709v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
+        <path d="M59.09377,8.437h.88867v6.26074h-.88867Z" style="fill: #fff"/>
+        <path d="M61.21779,12.44434a2.13346,2.13346,0,1,1,4.24756,0,2.1338,2.1338,0,1,1-4.24756,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C64.11232,13.99463,64.5508,13.42432,64.5508,12.44434Z" style="fill: #fff"/>
+        <path d="M66.4009,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,66.4009,13.42432Zm2.89453-.38477v-.37646l-1.09961.07031c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,69.29543,13.03955Z" style="fill: #fff"/>
+        <path d="M71.34816,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074h-.85156v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C72.0718,14.772,71.34816,13.87061,71.34816,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C72.72121,10.91846,72.26613,11.49707,72.26613,12.44434Z" style="fill: #fff"/>
+        <path d="M79.23,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C82.12453,13.99463,82.563,13.42432,82.563,12.44434Z" style="fill: #fff"/>
+        <path d="M84.66945,10.19482h.85547v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915H87.605V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
+        <path d="M93.51516,9.07373v1.1416h.97559v.74854h-.97559V13.2793c0,.47168.19434.67822.63672.67822a2.96657,2.96657,0,0,0,.33887-.02051v.74023a2.9155,2.9155,0,0,1-.4834.04541c-.98828,0-1.38184-.34766-1.38184-1.21582v-2.543h-.71484v-.74854h.71484V9.07373Z" style="fill: #fff"/>
+        <path d="M95.70461,8.437h.88086v2.48145h.07031a1.3856,1.3856,0,0,1,1.373-.80664,1.48339,1.48339,0,0,1,1.55078,1.67871v2.90723H98.69v-2.688c0-.71924-.335-1.0835-.96289-1.0835a1.05194,1.05194,0,0,0-1.13379,1.1416v2.62988h-.88867Z" style="fill: #fff"/>
+        <path d="M104.76125,13.48193a1.828,1.828,0,0,1-1.95117,1.30273A2.04531,2.04531,0,0,1,100.73,12.46045a2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27V12.688h-3.17969v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,101.63527,12.03076Z" style="fill: #fff"/>
+      </g>
+    </g>
+  </g>
+</svg>

From f18aa778e6d376a19010e753988f30280a095ae8 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 6 May 2021 19:59:06 +0100
Subject: [PATCH 24/39] Added the ability to hide the user in the discord
 notification

---
 .../Agents/DiscordNotification.cs             | 22 ++++++++++---------
 .../Agents/EmailNotification.cs               |  4 ++--
 .../Agents/LegacyMobileNotification.cs        |  4 ++--
 .../Agents/MobileNotification.cs              |  4 ++--
 src/Ombi.Notifications/BaseNotification.cs    |  4 ++--
 .../DiscordNotificationSettings.cs            |  1 +
 .../app/interfaces/INotificationSettings.ts   |  1 +
 .../notifications/discord.component.html      |  3 +++
 .../notifications/discord.component.ts        |  3 ++-
 9 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/Ombi.Notifications/Agents/DiscordNotification.cs b/src/Ombi.Notifications/Agents/DiscordNotification.cs
index dda10f210..4a0c369fc 100644
--- a/src/Ombi.Notifications/Agents/DiscordNotification.cs
+++ b/src/Ombi.Notifications/Agents/DiscordNotification.cs
@@ -106,21 +106,23 @@ namespace Ombi.Notifications.Agents
                 };
 
                 var fields = new List<DiscordField>();
-
-                if (model.Data.TryGetValue("Alias", out var alias))
+                if (!settings.HideUser)
                 {
-                    if (alias.HasValue())
+                    if (model.Data.TryGetValue("Alias", out var alias))
                     {
-                        fields.Add(new DiscordField { name = "Requested By", value = alias, inline = true });
+                        if (alias.HasValue())
+                        {
+                            fields.Add(new DiscordField { name = "Requested By", value = alias, inline = true });
+                        }
                     }
-                }
-                else
-                {
-                    if (model.Data.TryGetValue("RequestedUser", out var requestedUser))
+                    else
                     {
-                        if (requestedUser.HasValue())
+                        if (model.Data.TryGetValue("RequestedUser", out var requestedUser))
                         {
-                            fields.Add(new DiscordField { name = "Requested By", value = requestedUser, inline = true });
+                            if (requestedUser.HasValue())
+                            {
+                                fields.Add(new DiscordField { name = "Requested By", value = requestedUser, inline = true });
+                            }
                         }
                     }
                 }
diff --git a/src/Ombi.Notifications/Agents/EmailNotification.cs b/src/Ombi.Notifications/Agents/EmailNotification.cs
index a7f9334fb..b6d03305b 100644
--- a/src/Ombi.Notifications/Agents/EmailNotification.cs
+++ b/src/Ombi.Notifications/Agents/EmailNotification.cs
@@ -240,9 +240,9 @@ namespace Ombi.Notifications.Agents
 
         private async Task SendToSubscribers(EmailNotificationSettings settings, NotificationMessage message)
         {
-            if (await SubsribedUsers.AnyAsync())
+            if (await Subscribed.AnyAsync())
             {
-                foreach (var user in SubsribedUsers)
+                foreach (var user in Subscribed)
                 {
                     if (user.Email.IsNullOrEmpty())
                     {
diff --git a/src/Ombi.Notifications/Agents/LegacyMobileNotification.cs b/src/Ombi.Notifications/Agents/LegacyMobileNotification.cs
index 5ac92d5bf..33cec783c 100644
--- a/src/Ombi.Notifications/Agents/LegacyMobileNotification.cs
+++ b/src/Ombi.Notifications/Agents/LegacyMobileNotification.cs
@@ -304,9 +304,9 @@ namespace Ombi.Notifications.Agents
 
         private async Task AddSubscribedUsers(List<string> playerIds)
         {
-            if (await SubsribedUsers.AnyAsync())
+            if (await Subscribed.AnyAsync())
             {
-                foreach (var user in SubsribedUsers)
+                foreach (var user in Subscribed)
                 {
                     var notificationId = user.NotificationUserIds;
                     if (notificationId.Any())
diff --git a/src/Ombi.Notifications/Agents/MobileNotification.cs b/src/Ombi.Notifications/Agents/MobileNotification.cs
index 864453b71..bb6454bfc 100644
--- a/src/Ombi.Notifications/Agents/MobileNotification.cs
+++ b/src/Ombi.Notifications/Agents/MobileNotification.cs
@@ -346,9 +346,9 @@ namespace Ombi.Notifications.Agents
 
         private async Task AddSubscribedUsers(List<string> playerIds)
         {
-            if (await SubsribedUsers.AnyAsync())
+            if (await Subscribed.AnyAsync())
             {
-                foreach (var user in SubsribedUsers)
+                foreach (var user in Subscribed)
                 {
                     var notificationIds = await _notifications.GetAll().Where(x => x.UserId == user.Id).ToListAsync();
 
diff --git a/src/Ombi.Notifications/BaseNotification.cs b/src/Ombi.Notifications/BaseNotification.cs
index 9d8bbb776..46db5d467 100644
--- a/src/Ombi.Notifications/BaseNotification.cs
+++ b/src/Ombi.Notifications/BaseNotification.cs
@@ -48,7 +48,7 @@ namespace Ombi.Notifications
         protected ChildRequests TvRequest { get; set; }
         protected AlbumRequest AlbumRequest { get; set; }
         protected MovieRequests MovieRequest { get; set; }
-        protected IQueryable<OmbiUser> SubsribedUsers { get; private set; }
+        protected IQueryable<OmbiUser> Subscribed { get; private set; }
 
         public abstract string NotificationName { get; }
 
@@ -75,7 +75,7 @@ namespace Ombi.Notifications
             if (model.RequestId > 0)
             {
                 await LoadRequest(model.RequestId, model.RequestType);
-                SubsribedUsers = GetSubscriptions(model.RequestId, model.RequestType);
+                Subscribed = GetSubscriptions(model.RequestId, model.RequestType);
             }
 
             Customization = await CustomizationSettings.GetSettingsAsync();
diff --git a/src/Ombi.Settings/Settings/Models/Notifications/DiscordNotificationSettings.cs b/src/Ombi.Settings/Settings/Models/Notifications/DiscordNotificationSettings.cs
index 45dc17ee1..0ec81a6d8 100644
--- a/src/Ombi.Settings/Settings/Models/Notifications/DiscordNotificationSettings.cs
+++ b/src/Ombi.Settings/Settings/Models/Notifications/DiscordNotificationSettings.cs
@@ -9,6 +9,7 @@ namespace Ombi.Settings.Settings.Models.Notifications
         public string WebhookUrl { get; set; }
         public string Username { get; set; }
         public string Icon { get; set; }
+        public bool HideUser { get; set; }
 
         [JsonIgnore]
         public string WebHookId => SplitWebUrl(4);
diff --git a/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts b/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts
index d08778e2a..e1c52103c 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/INotificationSettings.ts
@@ -59,6 +59,7 @@ export interface IDiscordNotifcationSettings extends INotificationSettings {
     webhookUrl: string;
     username: string;
     icon: string;
+    hideUser: boolean;
     notificationTemplates: INotificationTemplates[];
 }
 
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html
index 140198c94..9f19ae9a2 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.html
@@ -24,6 +24,8 @@
                                 <mat-label>Username</mat-label>
                                 <input matInput formControlName="username">
                             </mat-form-field>
+                                <mat-slide-toggle matTooltip="This when enabled will not show the user who did the action e.g. Requested a new movie" formControlName="hideUser">Hide Users in notification</mat-slide-toggle>
+   
                         </div>
                         <div class="md-form-field">
                             <mat-form-field appearance="outline">
@@ -34,6 +36,7 @@
                                 <img [src]="form.value.icon" style="width: 300px" />
                             </div>
                         </div>
+                        
                     </div>
                     <div class="row top-space">
 
diff --git a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts
index 73f271894..e2e92e55c 100644
--- a/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/notifications/discord.component.ts
@@ -29,7 +29,8 @@ export class DiscordComponent implements OnInit {
                 enabled: [x.enabled],
                 username: [x.username],
                 webhookUrl: [x.webhookUrl, [Validators.required]],
-                icon: [x.icon]
+                icon: [x.icon],
+                hideUser: [x.hideUser]
 
             });
         });

From 5d8a2123120bcb79f58de4e8b882a454b05d1e98 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 6 May 2021 20:15:58 +0100
Subject: [PATCH 25/39] Improved the Plex OAuth flow

---
 .../src/app/login/login.component.ts          | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/login/login.component.ts b/src/Ombi/ClientApp/src/app/login/login.component.ts
index 5245b8239..e9260d685 100644
--- a/src/Ombi/ClientApp/src/app/login/login.component.ts
+++ b/src/Ombi/ClientApp/src/app/login/login.component.ts
@@ -146,6 +146,9 @@ export class LoginComponent implements OnDestroy, OnInit {
     }
 
     public oauth() {
+        if (this.oAuthWindow) {
+            this.oAuthWindow.close();
+        }
         this.oAuthWindow = window.open(window.location.toString(), "_blank", `toolbar=0,
         location=0,
         status=0,
@@ -159,16 +162,22 @@ export class LoginComponent implements OnDestroy, OnInit {
             this.authService.login({ usePlexOAuth: true, password: "", rememberMe: true, username: "", plexTvPin: pin }).subscribe(x => {
                 this.oAuthWindow!.location.replace(x.url);
 
-                this.pinTimer = setInterval(() => {
+                if (this.pinTimer) {
+                    clearInterval(this.pinTimer);
+                }
 
-                    this.oauthLoading = true;
-                    this.getPinResult(x.pinId);
-                }, 4000);
+                this.pinTimer = setInterval(() => {
+                    if(this.oAuthWindow.closed) {
+                        this.oauthLoading = true;
+                        this.getPinResult(x.pinId);
+                    }
+                }, 1000);
             });
         });
     }
 
     public getPinResult(pinId: number) {
+        clearInterval(this.pinTimer);
         this.authService.oAuth(pinId).subscribe(x => {
             if(x.access_token) {
               this.store.save("id_token", x.access_token);
@@ -176,7 +185,7 @@ export class LoginComponent implements OnDestroy, OnInit {
               if (this.authService.loggedIn()) {
                   this.ngOnDestroy();
 
-                  if(this.oAuthWindow) {
+                  if (this.oAuthWindow) {
                     this.oAuthWindow.close();
                   }
                   this.oauthLoading = false;
@@ -184,6 +193,10 @@ export class LoginComponent implements OnDestroy, OnInit {
                   return;
               }
           }
+          this.notify.open("Could not log you in!", "OK", {
+            duration: 3000
+        });
+          this.oauthLoading = false;
 
           }, err => {
               console.log(err);

From 7c79e28d5c0a3d884ddec862dc7a87b2ff51c582 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 6 May 2021 20:29:44 +0100
Subject: [PATCH 26/39] Added a message on the application url field to better
 explain what it does

---
 .../app/settings/customization/customization.component.html   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
index c98cf65fc..3b3044780 100644
--- a/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/customization/customization.component.html
@@ -12,6 +12,10 @@
             </mat-form-field>
         </div>
         <div class="md-form-field">
+            <mat-hint>The application url should be your Externally Accessible URL for example, your internal URL is http://192.168.1.50/ but your Externally
+                Accessible URL is 'https://mydomain.com/requests' Please ensure this field is correct as it drives a lot of functionality include the QR code for the 
+                mobile app and it affects the way email notifications are sent.
+            </mat-hint>
             <mat-form-field appearance="outline">
                 <mat-label>Application URL</mat-label>
                 <input matInput [(ngModel)]="settings.applicationUrl">

From 8dd00e9e9935038754fad1202652fd5ad9575114 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 6 May 2021 20:31:36 +0100
Subject: [PATCH 27/39] Improved the message on the admin request popup

---
 src/Ombi/wwwroot/translations/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index 18e864bdd..5e24656fe 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -254,9 +254,9 @@
         "ViewCollection":"View Collection",
         "NotEnoughInfo": "Unfortunately there is not enough information about this show yet!",
         "AdvancedOptions":"Advanced Options",
-        "AutoApproveOptions":"You can configure the request here, once requested it will be send to your DVR application and will be auto approved!",
-        "AutoApproveOptionsTv":"You can configure the request here, once requested it will be send to your DVR application and will be auto approved! If the request is already in Sonarr, we will not change the root folder or quality profile if you set it!",
-        "AutoApproveOptionsTvShort":"You can configure the request here, once requested it will be send to your DVR application! If the request is already in Sonarr, we will not change the root folder or quality profile if you set it!",
+        "AutoApproveOptions":"You can configure the request here, once requested it will be send to your DVR application and will be auto approved! Please note, this is optional, just press Request to skip!",
+        "AutoApproveOptionsTv":"You can configure the request here, once requested it will be send to your DVR application and will be auto approved! If the request is already in Sonarr, we will not change the root folder or quality profile if you set it!  Please note, this is optional, just press Request to skip!",
+        "AutoApproveOptionsTvShort":"You can configure the request here, once requested it will be send to your DVR application! If the request is already in Sonarr, we will not change the root folder or quality profile if you set it! Please note, this is optional, just press Request to skip!",
         "QualityProfilesSelect":"Select A Quality Profile",
         "RootFolderSelect":"Select A Root Folder",
         "LanguageProfileSelect":"Select A Language Profile",

From 4071b2e8a215e5e5dfe60b617080c7e4c48d7e36 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Fri, 7 May 2021 14:41:10 +0100
Subject: [PATCH 28/39] Added the open on mobile back in, this will be
 available in the next app update

---
 .../Rules/Search/AvailabilityRuleHelper.cs    |  2 +-
 .../Rule/Rules/Search/PlexAvailabilityRule.cs |  4 +--
 .../user-preference.component.html            | 28 +++++++++++--------
 .../user-preference.component.ts              |  7 +++++
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs b/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
index 71331c51d..c3de20798 100644
--- a/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
@@ -13,7 +13,7 @@ namespace Ombi.Core.Rule.Rules.Search
     {
         public static void CheckForUnairedEpisodes(SearchTvShowViewModel search)
         {
-            foreach (var season in search.SeasonRequests)
+            foreach (var season in search.SeasonRequests.ToList())
             {
                 // If we have all the episodes for this season, then this season is available
                 if (season.Episodes.All(x => x.Available))
diff --git a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
index 7b757802d..68551aac4 100644
--- a/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
@@ -85,9 +85,9 @@ namespace Ombi.Core.Rule.Rules.Search
                     if (search.SeasonRequests.Any())
                     {
                         var allEpisodes = PlexContentRepository.GetAllEpisodes();
-                        foreach (var season in search.SeasonRequests)
+                        foreach (var season in search.SeasonRequests.ToList())
                         {
-                            foreach (var episode in season.Episodes)
+                            foreach (var episode in season.Episodes.ToList())
                             {
                                 await AvailabilityRuleHelper.SingleEpisodeCheck(useImdb, allEpisodes, episode, season, item, useTheMovieDb, useTvDb, Log);
                             }
diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
index b809a510d..ab9f7bf0c 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
@@ -52,19 +52,25 @@
           <div style="margin-left:4%" class="col-12 col-sm-6 col-xl-5">
             <mat-label [translate]="'UserPreferences.MobileQRCode'"></mat-label>
             <div id="noQrCode" *ngIf="!qrCodeEnabled" [translate]="'UserPreferences.NoQrCode'"></div>
-         <div class="row">
-            <qrcode id="qrCode" *ngIf="qrCodeEnabled" [qrdata]="qrCode" [size]="256" [level]="'L'"></qrcode>
             <div class="row">
-            <div class="col-12">
-              <a href='https://play.google.com/store/apps/details?id=com.tidusjar.Ombi&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'
-                target="_blank"><img width="200px" alt='Get it on Google Play'
-                  src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' /></a>
+              <qrcode id="qrCode" *ngIf="qrCodeEnabled" [qrdata]="qrCode" [size]="256" [level]="'L'"></qrcode>
+              <div class="row">
+                <div class="col-12">
+                  <a href='https://play.google.com/store/apps/details?id=com.tidusjar.Ombi&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'
+                    target="_blank"><img width="200px" alt='Get it on Google Play'
+                      src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' /></a>
+                </div>
+                <div class="col-12">
+                  <a href='https://apps.apple.com/us/app/ombi/id1335260043' target="_blank"><img
+                      style="margin-left:13px" width="170px" alt='Get it on Google Play'
+                      src='../../../images/appstore.svg' /></a>
+                </div>
+                <div class="col-12">
+                  <button  style="margin-left:13px; margin-top: 20px;" mat-raised-button color="accent" type="button" (click)="openMobileApp($event)">Open Mobile App</button>
+                </div>
+              </div>
             </div>
-            <div class="col-12">
-              <a href='https://apps.apple.com/us/app/ombi/id1335260043' target="_blank"><img style="margin-left:13px" width="170px"
-                  alt='Get it on Google Play' src='../../../images/appstore.svg' /></a>
-            </div></div>
-          </div></div>
+          </div>
         </div>
       </div>
 
diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
index ae68055a6..eb504065c 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
@@ -120,6 +120,13 @@ export class UserPreferenceComponent implements OnInit {
         })
     }
 
+    public openMobileApp(event: any) {
+        event.preventDefault();
+
+        const url = `ombi://${this.qrCode}`;
+        window.location.assign(url);
+    }
+
 
     private welcomeText: string;
     private setWelcomeText() {

From 50af2b84821ce39d316194c0a14e7ebb4f507d1e Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Fri, 7 May 2021 19:36:07 +0100
Subject: [PATCH 29/39] Fixed the issue where you couldn't remove a legacy user
 from the notifications

---
 src/Ombi/Controllers/V1/MobileController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ombi/Controllers/V1/MobileController.cs b/src/Ombi/Controllers/V1/MobileController.cs
index 2ca640769..485535816 100644
--- a/src/Ombi/Controllers/V1/MobileController.cs
+++ b/src/Ombi/Controllers/V1/MobileController.cs
@@ -92,7 +92,7 @@ namespace Ombi.Controllers.V1
         [Admin]
         public async Task<bool> RemoveUser([FromBody] RemoveUserModel userId)
         {
-            var user = await _userManager.Users.Include(x => x.NotificationUserIds).FirstOrDefaultAsync(x => x.Id.Equals(userId.UserId, StringComparison.InvariantCultureIgnoreCase));
+            var user = await _userManager.Users.Include(x => x.NotificationUserIds).FirstOrDefaultAsync(x => x.Id == userId.UserId);
             try
             {
                 await _notification.DeleteRange(user.NotificationUserIds);

From 64c0fc17cc56c1484a33a8dc2a715843bcab82b9 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 9 May 2021 19:58:36 +0100
Subject: [PATCH 30/39] Fixed #4152

---
 src/Ombi.Core/Engine/Interfaces/BaseEngine.cs         |  4 ++--
 src/Ombi.Core/Engine/MovieRequestEngine.cs            |  4 ++--
 src/Ombi.Core/Rule/Interfaces/IRuleEvaluator.cs       |  2 +-
 src/Ombi.Core/Rule/Interfaces/ISpecificRule.cs        |  2 +-
 src/Ombi.Core/Rule/RuleEvaluator.cs                   |  4 ++--
 .../Rule/Rules/Search/AvailabilityRuleHelper.cs       |  2 +-
 .../Rule/Rules/Search/LidarrArtistCacheRule.cs        |  3 ++-
 .../Rule/Rules/Specific/SendNotificationRule.cs       | 11 ++++++++++-
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
index 6fd22bced..68a4335cb 100644
--- a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
+++ b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
@@ -59,9 +59,9 @@ namespace Ombi.Core.Engine.Interfaces
             var ruleResults = await Rules.StartSearchRules(model);
             return ruleResults;
         }
-        public async Task<RuleResult> RunSpecificRule(object model, SpecificRules rule)
+        public async Task<RuleResult> RunSpecificRule(object model, SpecificRules rule, string requestOnBehalf)
         {
-            var ruleResults = await Rules.StartSpecificRules(model, rule);
+            var ruleResults = await Rules.StartSpecificRules(model, rule, requestOnBehalf);
             return ruleResults;
         }
     }
diff --git a/src/Ombi.Core/Engine/MovieRequestEngine.cs b/src/Ombi.Core/Engine/MovieRequestEngine.cs
index 8d54f0fc3..a2380be81 100644
--- a/src/Ombi.Core/Engine/MovieRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MovieRequestEngine.cs
@@ -71,7 +71,7 @@ namespace Ombi.Core.Engine
             var canRequestOnBehalf = model.RequestOnBehalf.HasValue();
 
             var isAdmin = await UserManager.IsInRoleAsync(userDetails, OmbiRoles.PowerUser) || await UserManager.IsInRoleAsync(userDetails, OmbiRoles.Admin);
-            if (model.RequestOnBehalf.HasValue() && !isAdmin)
+            if (canRequestOnBehalf && !isAdmin)
             {
                 return new RequestEngineResult
                 {
@@ -703,7 +703,7 @@ namespace Ombi.Core.Engine
         {
             await MovieRepository.Add(model);
 
-            var result = await RunSpecificRule(model, SpecificRules.CanSendNotification);
+            var result = await RunSpecificRule(model, SpecificRules.CanSendNotification, requestOnBehalf);
             if (result.Success)
             {
                 await NotificationHelper.NewRequest(model);
diff --git a/src/Ombi.Core/Rule/Interfaces/IRuleEvaluator.cs b/src/Ombi.Core/Rule/Interfaces/IRuleEvaluator.cs
index c32342146..5b438124e 100644
--- a/src/Ombi.Core/Rule/Interfaces/IRuleEvaluator.cs
+++ b/src/Ombi.Core/Rule/Interfaces/IRuleEvaluator.cs
@@ -9,6 +9,6 @@ namespace Ombi.Core.Rule.Interfaces
     {
         Task<IEnumerable<RuleResult>> StartRequestRules(BaseRequest obj);
         Task<IEnumerable<RuleResult>> StartSearchRules(SearchViewModel obj);
-        Task<RuleResult> StartSpecificRules(object obj, SpecificRules selectedRule);
+        Task<RuleResult> StartSpecificRules(object obj, SpecificRules selectedRule, string requestOnBehalf);
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Core/Rule/Interfaces/ISpecificRule.cs b/src/Ombi.Core/Rule/Interfaces/ISpecificRule.cs
index 065b2f990..f76464888 100644
--- a/src/Ombi.Core/Rule/Interfaces/ISpecificRule.cs
+++ b/src/Ombi.Core/Rule/Interfaces/ISpecificRule.cs
@@ -5,7 +5,7 @@ namespace Ombi.Core.Rule.Interfaces
 {
     public interface ISpecificRule<T> where T : new() 
     {
-        Task<RuleResult> Execute(T obj);
+        Task<RuleResult> Execute(T obj, string requestOnBehalf);
         SpecificRules Rule { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Core/Rule/RuleEvaluator.cs b/src/Ombi.Core/Rule/RuleEvaluator.cs
index a0c272c00..712d6031e 100644
--- a/src/Ombi.Core/Rule/RuleEvaluator.cs
+++ b/src/Ombi.Core/Rule/RuleEvaluator.cs
@@ -58,13 +58,13 @@ namespace Ombi.Core.Rule
             return results;
         }
 
-        public async Task<RuleResult> StartSpecificRules(object obj, SpecificRules selectedRule)
+        public async Task<RuleResult> StartSpecificRules(object obj, SpecificRules selectedRule, string requestOnBehalf)
         {
             foreach (var rule in SpecificRules)
             {
                 if (selectedRule == rule.Rule)
                 {
-                    var result = await rule.Execute(obj);
+                    var result = await rule.Execute(obj, requestOnBehalf);
                     return result;
                 }
             }
diff --git a/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs b/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
index c3de20798..fe062e851 100644
--- a/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
@@ -18,7 +18,7 @@ namespace Ombi.Core.Rule.Rules.Search
                 // If we have all the episodes for this season, then this season is available
                 if (season.Episodes.All(x => x.Available))
                 {
-                    season.SeasonAvailable = true; 
+                    season.SeasonAvailable = true;
                 }
             }
             if (search.SeasonRequests.All(x => x.Episodes.All(e => e.Available)))
diff --git a/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs
index a254ea2d3..b0e9af1ec 100644
--- a/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs
@@ -8,7 +8,7 @@ using Ombi.Store.Repository;
 
 namespace Ombi.Core.Rule.Rules.Search
 {
-    public class LidarrArtistCacheRule : SpecificRule, ISpecificRule<object>
+    public class LidarrArtistCacheRule : SpecificRule, IRules<object>
     {
         public LidarrArtistCacheRule(IExternalRepository<LidarrArtistCache> db)
         {
@@ -30,6 +30,7 @@ namespace Ombi.Core.Rule.Rules.Search
             return Task.FromResult(Success());
         }
 
+
         public override SpecificRules Rule => SpecificRules.LidarrArtist;
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Core/Rule/Rules/Specific/SendNotificationRule.cs b/src/Ombi.Core/Rule/Rules/Specific/SendNotificationRule.cs
index 30ec9b14a..af71df9ac 100644
--- a/src/Ombi.Core/Rule/Rules/Specific/SendNotificationRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Specific/SendNotificationRule.cs
@@ -22,11 +22,20 @@ namespace Ombi.Core.Rule.Rules.Specific
         private OmbiUserManager UserManager { get; }
         private ISettingsService<OmbiSettings> Settings { get; }
 
-        public async Task<RuleResult> Execute(object obj)
+        public async Task<RuleResult> Execute(object obj, string requestOnBehalf)
         {
             var req = (BaseRequest)obj;
+            var canRequestonBehalf = requestOnBehalf.HasValue();
             var settings = await Settings.GetSettingsAsync();
             var sendNotification = true;
+
+            if (settings.DoNotSendNotificationsForAutoApprove && canRequestonBehalf)
+            {
+                return new RuleResult
+                {
+                    Success = false
+                };
+            }
             var requestedUser = await UserManager.Users.FirstOrDefaultAsync(x => x.Id == req.RequestedUserId);
             if (req.RequestType == RequestType.Movie)
             {

From 6e32bd33f5418070d9616152e31309e84c3b4489 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 9 May 2021 21:15:56 +0100
Subject: [PATCH 31/39] Fixed build

---
 .../Rule/Search/LidarrAlbumCacheRuleTests.cs           | 10 +++++-----
 .../Rule/Search/LidarrArtistCacheRuleTests.cs          |  6 +++---
 src/Ombi.Core/Engine/MovieRequestEngine.cs             |  2 +-
 src/Ombi.Core/Engine/MusicRequestEngine.cs             |  4 ++--
 src/Ombi.Core/Engine/MusicSearchEngine.cs              |  8 ++++----
 src/Ombi.Core/Engine/TvRequestEngine.cs                |  2 +-
 .../Rule/Rules/Search/LidarrAlbumCacheRule.cs          |  6 ++++--
 .../Rule/Rules/Search/LidarrArtistCacheRule.cs         |  4 ++--
 8 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/Ombi.Core.Tests/Rule/Search/LidarrAlbumCacheRuleTests.cs b/src/Ombi.Core.Tests/Rule/Search/LidarrAlbumCacheRuleTests.cs
index 27dbee614..7bf84d05f 100644
--- a/src/Ombi.Core.Tests/Rule/Search/LidarrAlbumCacheRuleTests.cs
+++ b/src/Ombi.Core.Tests/Rule/Search/LidarrAlbumCacheRuleTests.cs
@@ -30,7 +30,7 @@ namespace Ombi.Core.Tests.Rule.Search
         public async Task Should_Not_Be_Monitored_Or_Available()
         {
             var request = new SearchAlbumViewModel { ForeignAlbumId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.False(request.Approved);
@@ -49,7 +49,7 @@ namespace Ombi.Core.Tests.Rule.Search
                 }
             }.AsQueryable());
             var request = new SearchAlbumViewModel { ForeignAlbumId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.False(request.Approved);
@@ -71,7 +71,7 @@ namespace Ombi.Core.Tests.Rule.Search
                 }
             }.AsQueryable());
             var request = new SearchAlbumViewModel { ForeignAlbumId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.False(request.Approved);
@@ -93,7 +93,7 @@ namespace Ombi.Core.Tests.Rule.Search
                 }
             }.AsQueryable());
             var request = new SearchAlbumViewModel { ForeignAlbumId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.False(request.Approved);
@@ -114,7 +114,7 @@ namespace Ombi.Core.Tests.Rule.Search
                 }
             }.AsQueryable());
             var request = new SearchAlbumViewModel { ForeignAlbumId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.False(request.Approved);
diff --git a/src/Ombi.Core.Tests/Rule/Search/LidarrArtistCacheRuleTests.cs b/src/Ombi.Core.Tests/Rule/Search/LidarrArtistCacheRuleTests.cs
index c17400acb..e13d8d1cd 100644
--- a/src/Ombi.Core.Tests/Rule/Search/LidarrArtistCacheRuleTests.cs
+++ b/src/Ombi.Core.Tests/Rule/Search/LidarrArtistCacheRuleTests.cs
@@ -29,7 +29,7 @@ namespace Ombi.Core.Tests.Rule.Search
         public async Task Should_Not_Be_Monitored()
         {
             var request = new SearchArtistViewModel { ForignArtistId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.False(request.Monitored);
@@ -46,7 +46,7 @@ namespace Ombi.Core.Tests.Rule.Search
                 }
             }.AsQueryable());
             var request = new SearchArtistViewModel { ForignArtistId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.True(request.Monitored);
@@ -64,7 +64,7 @@ namespace Ombi.Core.Tests.Rule.Search
                 }
             }.AsQueryable());
             var request = new SearchArtistViewModel { ForignArtistId = "abc" };
-            var result = await Rule.Execute(request);
+            var result = await Rule.Execute(request, string.Empty);
 
             Assert.True(result.Success);
             Assert.True(request.Monitored);
diff --git a/src/Ombi.Core/Engine/MovieRequestEngine.cs b/src/Ombi.Core/Engine/MovieRequestEngine.cs
index a2380be81..d37983d21 100644
--- a/src/Ombi.Core/Engine/MovieRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MovieRequestEngine.cs
@@ -550,7 +550,7 @@ namespace Ombi.Core.Engine
             request.Denied = false;
             await MovieRepository.Update(request);
 
-            var canNotify = await RunSpecificRule(request, SpecificRules.CanSendNotification);
+            var canNotify = await RunSpecificRule(request, SpecificRules.CanSendNotification, string.Empty);
             if (canNotify.Success)
             {
                 await NotificationHelper.Notify(request, NotificationType.RequestApproved);
diff --git a/src/Ombi.Core/Engine/MusicRequestEngine.cs b/src/Ombi.Core/Engine/MusicRequestEngine.cs
index e473c1fb1..032b2ae7d 100644
--- a/src/Ombi.Core/Engine/MusicRequestEngine.cs
+++ b/src/Ombi.Core/Engine/MusicRequestEngine.cs
@@ -362,7 +362,7 @@ namespace Ombi.Core.Engine
             await MusicRepository.Update(request);
 
 
-            var canNotify = await RunSpecificRule(request, SpecificRules.CanSendNotification);
+            var canNotify = await RunSpecificRule(request, SpecificRules.CanSendNotification, string.Empty);
             if (canNotify.Success)
             {
                 await NotificationHelper.Notify(request, NotificationType.RequestApproved);
@@ -506,7 +506,7 @@ namespace Ombi.Core.Engine
         {
             await MusicRepository.Add(model);
 
-            var result = await RunSpecificRule(model, SpecificRules.CanSendNotification);
+            var result = await RunSpecificRule(model, SpecificRules.CanSendNotification, string.Empty);
             if (result.Success)
             {
                 await NotificationHelper.NewRequest(model);
diff --git a/src/Ombi.Core/Engine/MusicSearchEngine.cs b/src/Ombi.Core/Engine/MusicSearchEngine.cs
index a9af03ecf..89bae7069 100644
--- a/src/Ombi.Core/Engine/MusicSearchEngine.cs
+++ b/src/Ombi.Core/Engine/MusicSearchEngine.cs
@@ -151,7 +151,7 @@ namespace Ombi.Core.Engine
             }
 
 
-            await Rules.StartSpecificRules(vm, SpecificRules.LidarrArtist);
+            await Rules.StartSpecificRules(vm, SpecificRules.LidarrArtist, string.Empty);
 
             return vm;
         }
@@ -190,7 +190,7 @@ namespace Ombi.Core.Engine
 
             vm.Cover = a.images?.FirstOrDefault(x => x.coverType.Equals("cover"))?.url?.ToHttpsUrl();
 
-            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum);
+            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum, string.Empty);
 
             await RunSearchRules(vm);
 
@@ -230,7 +230,7 @@ namespace Ombi.Core.Engine
                 vm.Cover = a.remoteCover;
             }
 
-            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum);
+            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum, string.Empty);
 
             await RunSearchRules(vm);
 
@@ -258,7 +258,7 @@ namespace Ombi.Core.Engine
                 vm.Cover = fullAlbum.remoteCover;
             }
 
-            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum);
+            await Rules.StartSpecificRules(vm, SpecificRules.LidarrAlbum, string.Empty);
 
             await RunSearchRules(vm);
 
diff --git a/src/Ombi.Core/Engine/TvRequestEngine.cs b/src/Ombi.Core/Engine/TvRequestEngine.cs
index 5eae0912c..00655e921 100644
--- a/src/Ombi.Core/Engine/TvRequestEngine.cs
+++ b/src/Ombi.Core/Engine/TvRequestEngine.cs
@@ -915,7 +915,7 @@ namespace Ombi.Core.Engine
 
         private async Task<RequestEngineResult> AfterRequest(ChildRequests model, string requestOnBehalf)
         {
-            var sendRuleResult = await RunSpecificRule(model, SpecificRules.CanSendNotification);
+            var sendRuleResult = await RunSpecificRule(model, SpecificRules.CanSendNotification, requestOnBehalf);
             if (sendRuleResult.Success)
             {
                 await NotificationHelper.NewRequest(model);
diff --git a/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs
index 3ca57d635..ca0c0cd97 100644
--- a/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/LidarrAlbumCacheRule.cs
@@ -9,7 +9,7 @@ using Ombi.Store.Repository;
 
 namespace Ombi.Core.Rule.Rules.Search
 {
-    public class LidarrAlbumCacheRule : BaseSearchRule, IRules<SearchViewModel>
+    public class LidarrAlbumCacheRule : SpecificRule, ISpecificRule<object>
     {
         public LidarrAlbumCacheRule(IExternalRepository<LidarrAlbumCache> db)
         {
@@ -18,7 +18,9 @@ namespace Ombi.Core.Rule.Rules.Search
 
         private readonly IExternalRepository<LidarrAlbumCache> _db;
 
-        public Task<RuleResult> Execute(SearchViewModel objec)
+        public override SpecificRules Rule => SpecificRules.LidarrAlbum;
+
+        public Task<RuleResult> Execute(object objec, string requestOnBehalf)
         {
             if (objec is SearchAlbumViewModel obj)
             {
diff --git a/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs b/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs
index b0e9af1ec..06ca3f06c 100644
--- a/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/LidarrArtistCacheRule.cs
@@ -8,7 +8,7 @@ using Ombi.Store.Repository;
 
 namespace Ombi.Core.Rule.Rules.Search
 {
-    public class LidarrArtistCacheRule : SpecificRule, IRules<object>
+    public class LidarrArtistCacheRule : SpecificRule, ISpecificRule<object>
     {
         public LidarrArtistCacheRule(IExternalRepository<LidarrArtistCache> db)
         {
@@ -17,7 +17,7 @@ namespace Ombi.Core.Rule.Rules.Search
 
         private readonly IExternalRepository<LidarrArtistCache> _db;
 
-        public Task<RuleResult> Execute(object objec)
+        public Task<RuleResult> Execute(object objec, string requestOnBehalf)
         {
             var obj = (SearchArtistViewModel) objec;
             // Check if it's in Lidarr

From 900ec20e42d31c0f290a04d71268065b9e6a0cc7 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 9 May 2021 21:44:21 +0100
Subject: [PATCH 32/39] Fixed #4057 #4180

---
 .../src/app/usermanagement/usermanagement.component.ts      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
index c2245957c..d119c8961 100644
--- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
+++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component, OnInit, ViewChild } from "@angular/core";
-
 import { ICheckbox, ICustomizationSettings, IEmailNotificationSettings, IUser } from "../interfaces";
 import { IdentityService, NotificationService, SettingsService } from "../services";
+
 import { MatSort } from "@angular/material/sort";
 import { MatTableDataSource } from "@angular/material/table";
 import { SelectionModel } from "@angular/cdk/collections";
@@ -90,6 +90,9 @@ export class UserManagementComponent implements OnInit {
             if (this.bulkMusicLimit) {
                 x.musicRequestLimit = this.bulkMusicLimit;
             }
+            if (this.bulkStreaming) {
+                x.streamingCountry = this.bulkStreaming;
+            }
             this.identityService.updateUser(x).subscribe(y => {
                 if (!y.successful) {
                     this.notificationService.error(`Could not update user ${x.userName}. Reason ${y.errors[0]}`);
@@ -102,6 +105,7 @@ export class UserManagementComponent implements OnInit {
         this.bulkMovieLimit = undefined;
         this.bulkEpisodeLimit = undefined;
         this.bulkMusicLimit = undefined;
+        this.bulkStreaming = undefined;
     }
 
     public isAllSelected() {

From b8076e2e655958522ed4974ea1cdc88dfe63f798 Mon Sep 17 00:00:00 2001
From: Dyson Parkes <dyson@berserkir.net>
Date: Mon, 10 May 2021 13:43:00 +1200
Subject: [PATCH 33/39] Adjust app store string

---
 .../components/user-preference/user-preference.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
index ab9f7bf0c..6954030de 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
@@ -62,7 +62,7 @@
                 </div>
                 <div class="col-12">
                   <a href='https://apps.apple.com/us/app/ombi/id1335260043' target="_blank"><img
-                      style="margin-left:13px" width="170px" alt='Get it on Google Play'
+                      style="margin-left:13px" width="170px" alt='Get it from the App Store'
                       src='../../../images/appstore.svg' /></a>
                 </div>
                 <div class="col-12">
@@ -128,4 +128,4 @@
 
 
 
-</div>
\ No newline at end of file
+</div>

From 21b8bf76d28b4b232f1fb74f86d2fc82da8edb24 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Tue, 11 May 2021 09:51:18 +0100
Subject: [PATCH 34/39] Fixed an issue where for Available Emby content, the
 service ID was not being passed

---
 src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
index 3fe11cbc4..7f6718a6b 100644
--- a/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Search/EmbyAvailabilityRule.cs
@@ -67,7 +67,7 @@ namespace Ombi.Core.Rule.Rules.Search
                 var s = await EmbySettings.GetSettingsAsync();
                 if (s.Enable)
                 {
-                    var server = s.Servers.FirstOrDefault(x => x.ServerHostname != null);
+                    var server = s.Servers.FirstOrDefault();
                     if ((server?.ServerHostname ?? string.Empty).HasValue())
                     {
                         obj.EmbyUrl = EmbyHelper.GetEmbyMediaUrl(item.EmbyId, server?.ServerId, server?.ServerHostname);

From 65879acb8d2abc981409a5bd3419b064417aef98 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 16 May 2021 11:52:37 +0100
Subject: [PATCH 35/39] Fixed the deseralizing issue #4181

---
 src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs                | 1 +
 src/Ombi.Api.Radarr/RadarrApi.cs                               | 3 ++-
 src/Ombi.Api.Radarr/RadarrV3Api.cs                             | 3 ++-
 src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs b/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs
index b56049c9a..09e985f43 100644
--- a/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs
+++ b/src/Ombi.Api.Radarr/Models/V2/RadarrAddMovie.cs
@@ -28,5 +28,6 @@ namespace Ombi.Api.Radarr.Models
         public string titleSlug { get; set; }
         public int year { get; set; }
         public string minimumAvailability { get; set; }
+        public long sizeOnDisk { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Api.Radarr/RadarrApi.cs b/src/Ombi.Api.Radarr/RadarrApi.cs
index b461ccda8..e1879bba3 100644
--- a/src/Ombi.Api.Radarr/RadarrApi.cs
+++ b/src/Ombi.Api.Radarr/RadarrApi.cs
@@ -82,7 +82,8 @@ namespace Ombi.Api.Radarr
                 titleSlug = title + year,
                 monitored = true,
                 year = year,
-                minimumAvailability = minimumAvailability
+                minimumAvailability = minimumAvailability,
+                sizeOnDisk = 0
             };
 
             if (searchNow)
diff --git a/src/Ombi.Api.Radarr/RadarrV3Api.cs b/src/Ombi.Api.Radarr/RadarrV3Api.cs
index dd1d0b279..21f95b3e1 100644
--- a/src/Ombi.Api.Radarr/RadarrV3Api.cs
+++ b/src/Ombi.Api.Radarr/RadarrV3Api.cs
@@ -85,7 +85,8 @@ namespace Ombi.Api.Radarr
                 titleSlug = title + year,
                 monitored = true,
                 year = year,
-                minimumAvailability = minimumAvailability
+                minimumAvailability = minimumAvailability,
+                sizeOnDisk = 0
             };
 
             if (searchNow)
diff --git a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
index d4c5a9883..256f0a75e 100644
--- a/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
@@ -43,7 +43,7 @@ export class RadarrComponent implements OnInit {
                     addOnly: [x.addOnly],
                     minimumAvailability: [x.minimumAvailability, [Validators.required]],
                     scanForAvailability: [x.scanForAvailability],
-                    v3: [x.v3]
+                    v3: [x.v3 ?? true]
                 });
 
                 if (x.defaultQualityProfile) {

From d23c4c38594d96e28c8bf6de0e6e69b7f84276b4 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 16 May 2021 12:03:39 +0100
Subject: [PATCH 36/39] removed the ripple from the navmenu #4192

---
 .../ClientApp/src/app/my-nav/my-nav.component.html     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
index c1b69b303..f73c9bbc8 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
@@ -6,12 +6,12 @@
         <mat-toolbar class="application-name" id="nav-applicationName">{{applicationName}}</mat-toolbar>
 
         <mat-nav-list>
-            <span *ngFor="let nav of navItems">
+            <span  mat-list-item  *ngFor="let nav of navItems">
 
-                <div class="menu-spacing" *ngIf="(nav.requiresAdmin && isAdmin || !nav.requiresAdmin) && nav.enabled">
+                <div class="menu-spacing mat-ripple" mat-ripple *ngIf="(nav.requiresAdmin && isAdmin || !nav.requiresAdmin) && nav.enabled">
 
 
-                    <a id="{{nav.id}}" *ngIf="nav.externalLink" mat-list-item [href]="nav.link" target="_blank"
+                    <a [disableRipple]="true" mat-list-item  id="{{nav.id}}" *ngIf="nav.externalLink" [href]="nav.link" target="_blank"
                         matTooltip="{{nav.toolTipMessage | translate}}" matTooltipPosition="right"
                         [routerLinkActive]="'active-list-item'">
 
@@ -19,7 +19,7 @@
                             style="padding-left: 5px; padding-right: 5px;" aria-hidden="true"></i>
                         &nbsp;{{nav.name | translate}}
                     </a>
-                    <a id="{{nav.id}}" *ngIf="!nav.externalLink" mat-list-item [routerLink]="nav.link" [style]="nav.color"
+                    <a [disableRipple]="true"  mat-list-item  id="{{nav.id}}" *ngIf="!nav.externalLink" [routerLink]="nav.link" [style]="nav.color"
                         [routerLinkActive]="'active-list-item'">
 
                         <i class="fa-lg {{nav.icon}} icon-spacing"></i>
@@ -28,7 +28,7 @@
                 </div>
             </span>
 
-            <a   class="menu-spacing" id="nav-logout" mat-list-item [routerLinkActive]="'active-list-item'"
+            <a mat-list-item [disableRipple]="true"   class="menu-spacing" id="nav-logout" [routerLinkActive]="'active-list-item'"
                 aria-label="Toggle sidenav" (click)="logOut();">
                 <i class="fa-lg fas fa-sign-out-alt  icon-spacing"></i>
                 &nbsp;{{ 'NavigationBar.Logout' | translate }}

From 7f74294ae316d8c5bd5a576d53a61e18b4208c54 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 16 May 2021 12:05:59 +0100
Subject: [PATCH 37/39] Fixed #4190

---
 .../user-preference/user-preference.component.html     |  2 +-
 .../user-preference/user-preference.component.ts       | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
index 6954030de..0f3dbb082 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.html
@@ -63,7 +63,7 @@
                 <div class="col-12">
                   <a href='https://apps.apple.com/us/app/ombi/id1335260043' target="_blank"><img
                       style="margin-left:13px" width="170px" alt='Get it from the App Store'
-                      src='../../../images/appstore.svg' /></a>
+                      src='{{baseUrl}}/images/appstore.svg' /></a>
                 </div>
                 <div class="col-12">
                   <button  style="margin-left:13px; margin-top: 20px;" mat-raised-button color="accent" type="button" (click)="openMobileApp($event)">Open Mobile App</button>
diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
index eb504065c..b4cfa6709 100644
--- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
+++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, Inject, OnInit } from "@angular/core";
 import { AuthService } from "../../../auth/auth.service";
 import { TranslateService } from "@ngx-translate/core";
 import { AvailableLanguages, ILanguage } from "./user-preference.constants";
@@ -6,6 +6,7 @@ import { IdentityService, NotificationService, SettingsService, ValidationServic
 import { ICustomizationSettings, IUser, UserType } from "../../../interfaces";
 import { Md5 } from "ts-md5";
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { APP_BASE_HREF } from "@angular/common";
 
 @Component({
     templateUrl: "./user-preference.component.html",
@@ -22,6 +23,7 @@ export class UserPreferenceComponent implements OnInit {
     public selectedCountry: string;
     public customizationSettings: ICustomizationSettings;
     public UserType = UserType;
+    public baseUrl: string;
 
     public passwordForm: FormGroup;
 
@@ -33,9 +35,13 @@ export class UserPreferenceComponent implements OnInit {
         private readonly identityService: IdentityService,
         private readonly settingsService: SettingsService,
         private readonly fb: FormBuilder,
-        private readonly validationService: ValidationService) { }
+        private readonly validationService: ValidationService,
+        @Inject(APP_BASE_HREF) public internalBaseUrl: string) { }
 
     public async ngOnInit() {
+        if (this.internalBaseUrl.length > 1) {
+            this.baseUrl = this.internalBaseUrl;
+        }
         const user = this.authService.claims();
         if (user.name) {
             this.username = user.name;

From 734b07accfb25169564b533c4af2bad4778f4b6d Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Sun, 16 May 2021 22:07:12 +0100
Subject: [PATCH 38/39] Really fixed #4181 this time

---
 .../Models/V2/MovieResponse.cs                | 115 +++++++++++++++---
 src/Ombi.Api.Radarr/RadarrV3Api.cs            |   2 +-
 2 files changed, 100 insertions(+), 17 deletions(-)

diff --git a/src/Ombi.Api.Radarr/Models/V2/MovieResponse.cs b/src/Ombi.Api.Radarr/Models/V2/MovieResponse.cs
index 74d5c75ea..6eb2f1c5a 100644
--- a/src/Ombi.Api.Radarr/Models/V2/MovieResponse.cs
+++ b/src/Ombi.Api.Radarr/Models/V2/MovieResponse.cs
@@ -1,39 +1,122 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Net.Mime;
 
 namespace Ombi.Api.Radarr.Models
-{
+{ 
     public class MovieResponse
     {
         public string title { get; set; }
+        public string originalTitle { get; set; }
+        public Alternatetitle[] alternateTitles { get; set; }
+        public int secondaryYearSourceId { get; set; }
         public string sortTitle { get; set; }
-        public double sizeOnDisk { get; set; }
+        public long sizeOnDisk { get; set; }
         public string status { get; set; }
         public string overview { get; set; }
-        public string inCinemas { get; set; }
-        public string physicalRelease { get; set; }
-        public List<Image> images { get; set; }
+        public DateTime inCinemas { get; set; }
+        public DateTime physicalRelease { get; set; }
+        public DateTime digitalRelease { get; set; }
+        public Image[] images { get; set; }
         public string website { get; set; }
-        public bool downloaded { get; set; }
         public int year { get; set; }
         public bool hasFile { get; set; }
         public string youTubeTrailerId { get; set; }
         public string studio { get; set; }
         public string path { get; set; }
-        public int profileId { get; set; }
-        public string minimumAvailability { get; set; }
+        public int qualityProfileId { get; set; }
         public bool monitored { get; set; }
+        public string minimumAvailability { get; set; }
+        public bool isAvailable { get; set; }
+        public string folderName { get; set; }
         public int runtime { get; set; }
-        public string lastInfoSync { get; set; }
         public string cleanTitle { get; set; }
         public string imdbId { get; set; }
         public int tmdbId { get; set; }
         public string titleSlug { get; set; }
-        public List<string> genres { get; set; }
-        public List<object> tags { get; set; }
-        public string added { get; set; }
+        public string certification { get; set; }
+        public string[] genres { get; set; }
+        public object[] tags { get; set; }
+        public DateTime added { get; set; }
         public Ratings ratings { get; set; }
-        //public List<string> alternativeTitles { get; set; }
-        public int qualityProfileId { get; set; }
+        public Moviefile movieFile { get; set; }
+        public Collection collection { get; set; }
+        public int id { get; set; }
+    }
+
+
+    public class Moviefile
+    {
+        public int movieId { get; set; }
+        public string relativePath { get; set; }
+        public string path { get; set; }
+        public long size { get; set; }
+        public DateTime dateAdded { get; set; }
+        public string sceneName { get; set; }
+        public int indexerFlags { get; set; }
+        public V3.Quality quality { get; set; }
+        public Mediainfo mediaInfo { get; set; }
+        public string originalFilePath { get; set; }
+        public bool qualityCutoffNotMet { get; set; }
+        public Language[] languages { get; set; }
+        public string releaseGroup { get; set; }
+        public string edition { get; set; }
+        public int id { get; set; }
+    }
+
+    public class Revision
+    {
+        public int version { get; set; }
+        public int real { get; set; }
+        public bool isRepack { get; set; }
+    }
+
+    public class Mediainfo
+    {
+        public string audioAdditionalFeatures { get; set; }
+        public int audioBitrate { get; set; }
+        public float audioChannels { get; set; }
+        public string audioCodec { get; set; }
+        public string audioLanguages { get; set; }
+        public int audioStreamCount { get; set; }
+        public int videoBitDepth { get; set; }
+        public int videoBitrate { get; set; }
+        public string videoCodec { get; set; }
+        public float videoFps { get; set; }
+        public string resolution { get; set; }
+        public string runTime { get; set; }
+        public string scanType { get; set; }
+        public string subtitles { get; set; }
+    }
+
+    public class Language
+    {
+        public int id { get; set; }
+        public string name { get; set; }
+    }
+
+    public class Collection
+    {
+        public string name { get; set; }
+        public int tmdbId { get; set; }
+        public object[] images { get; set; }
+    }
+
+    public class Alternatetitle
+    {
+        public string sourceType { get; set; }
+        public int movieId { get; set; }
+        public string title { get; set; }
+        public int sourceId { get; set; }
+        public int votes { get; set; }
+        public int voteCount { get; set; }
+        public Language1 language { get; set; }
+        public int id { get; set; }
+    }
+
+    public class Language1
+    {
         public int id { get; set; }
+        public string name { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Ombi.Api.Radarr/RadarrV3Api.cs b/src/Ombi.Api.Radarr/RadarrV3Api.cs
index 21f95b3e1..c50ccb8df 100644
--- a/src/Ombi.Api.Radarr/RadarrV3Api.cs
+++ b/src/Ombi.Api.Radarr/RadarrV3Api.cs
@@ -65,7 +65,7 @@ namespace Ombi.Api.Radarr
 
         public async Task<MovieResponse> UpdateMovie(MovieResponse movie, string apiKey, string baseUrl)
         {
-            var request = new Request($"/api/v3/movie/", baseUrl, HttpMethod.Put);
+            var request = new Request($"/api/v3/movie/{movie.id}", baseUrl, HttpMethod.Put);
             AddHeaders(request, apiKey);
             request.AddJsonBody(movie);
 

From c6129704ed0626a049c8b51fa2c31489dfff200f Mon Sep 17 00:00:00 2001
From: Abe Kline <abekline@gmail.com>
Date: Tue, 18 May 2021 08:11:37 -0500
Subject: [PATCH 39/39] Autofocus the Search field

So on page load a user can immediately start typing a search without having to manually navigate to it. Also a big bonus for accessibility
---
 src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
index da8fa5d96..2a4fe0aa7 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
@@ -1,5 +1,5 @@
 <form [formGroup]='searchForm'>
     <mat-form-field floatLabel="never" style="width: 100%;">
-        <input id="nav-search" matInput placeholder="{{'NavigationBar.Search' | translate}}"  formControlName='input'>
+        <input id="nav-search"  autofocus="autofocus" matInput placeholder="{{'NavigationBar.Search' | translate}}"  formControlName='input'>
     </mat-form-field>
-</form>
\ No newline at end of file
+</form>