From f64ccd73272f44cee9fb2ac08f5a9f47cefdb4b9 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Tue, 22 Mar 2016 21:31:52 +0000
Subject: [PATCH 1/3] Resolved #75

---
 .../Notification/PushbulletNotification.cs         | 14 +++++++++++---
 PlexRequests.UI/Modules/RequestsModule.cs          | 13 +++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index be6af1ef2..20c4b9f35 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -77,7 +77,15 @@ namespace PlexRequests.Services.Notification
 
         private bool ValidateConfiguration()
         {
-            return !Settings.Enabled && !string.IsNullOrEmpty(Settings.AccessToken);
+            if (!Settings.Enabled)
+            {
+                return false;
+            }
+            if (string.IsNullOrEmpty(Settings.AccessToken))
+            {
+                return false;
+            }
+            return true;
         }
 
         private PushbulletNotificationSettings GetSettings()
@@ -106,8 +114,8 @@ namespace PlexRequests.Services.Notification
 
         private bool PushIssue(NotificationModel model)
         {
-            var message = $"A new issue: {model.Title} has been reported by user: {model.User} for the title: {model.Body}";
-            var pushTitle = $"Plex Requests: A new issue has been reported for {model.Body}";
+            var message = $"A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
+            var pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}";
             try
             {
                 var result = PushbulletApi.Push(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier);
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 4f534e0b9..228a0d752 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -25,6 +25,7 @@
 //  ************************************************************************/
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -37,6 +38,7 @@ using Nancy.Security;
 using PlexRequests.Api;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Services.Notification;
 using PlexRequests.Store;
 using PlexRequests.UI.Models;
 
@@ -166,6 +168,17 @@ namespace PlexRequests.UI.Modules
 
 
             var result = Service.UpdateRequest(originalRequest);
+
+            var model = new NotificationModel
+            {
+                User = Session[SessionKeys.UsernameKey].ToString(),
+                NotificationType = NotificationType.Issue,
+                Title = originalRequest.Title,
+                DateTime = DateTime.Now,
+                Body = issue == IssueState.Other ? comment : issue.Humanize()
+            };
+            NotificationService.Publish(model);
+
             return Response.AsJson(result
                 ? new JsonResponseModel { Result = true }
                 : new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" });

From 2d5612a045a62dca1670da45e51aabf7623bf5ec Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Tue, 22 Mar 2016 22:17:06 +0000
Subject: [PATCH 2/3] Finished adding pushover support. #44

---
 PlexRequests.Api.Interfaces/IPushoverApi.cs   |  36 +++++
 .../PlexRequests.Api.Interfaces.csproj        |   1 +
 .../Notifications/PushoverResponse.cs         |  34 +++++
 .../PlexRequests.Api.Models.csproj            |   1 +
 PlexRequests.Api/PlexRequests.Api.csproj      |   1 +
 PlexRequests.Api/PushoverApi.cs               |  56 ++++++++
 PlexRequests.Core/PlexRequests.Core.csproj    |   1 +
 .../PushoverNotificationSettings.cs           |   9 ++
 .../Notification/PushoverNotification.cs      | 132 ++++++++++++++++++
 .../PlexRequests.Services.csproj              |   1 +
 PlexRequests.UI.Tests/AdminModuleTests.cs     |   6 +
 PlexRequests.UI/Bootstrapper.cs               |  11 +-
 PlexRequests.UI/Modules/AdminModule.cs        |  45 +++++-
 PlexRequests.UI/PlexRequests.UI.csproj        |   4 +
 .../Validators/PushoverSettingsValidator.cs   |  41 ++++++
 .../Views/Admin/PushoverNotifications.cshtml  |  74 ++++++++++
 PlexRequests.UI/Views/Admin/_Sidebar.cshtml   |   9 ++
 17 files changed, 459 insertions(+), 3 deletions(-)
 create mode 100644 PlexRequests.Api.Interfaces/IPushoverApi.cs
 create mode 100644 PlexRequests.Api.Models/Notifications/PushoverResponse.cs
 create mode 100644 PlexRequests.Api/PushoverApi.cs
 create mode 100644 PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs
 create mode 100644 PlexRequests.Services/Notification/PushoverNotification.cs
 create mode 100644 PlexRequests.UI/Validators/PushoverSettingsValidator.cs
 create mode 100644 PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml

diff --git a/PlexRequests.Api.Interfaces/IPushoverApi.cs b/PlexRequests.Api.Interfaces/IPushoverApi.cs
new file mode 100644
index 000000000..42e3f2217
--- /dev/null
+++ b/PlexRequests.Api.Interfaces/IPushoverApi.cs
@@ -0,0 +1,36 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: IPushoverApi.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 PlexRequests.Api.Models.Notifications;
+
+namespace PlexRequests.Api.Interfaces
+{
+    public interface IPushoverApi
+    {
+        PushoverResponse Push(string accessToken, string message, string userToken);
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
index 3ea7be621..7522c8156 100644
--- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
+++ b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
@@ -49,6 +49,7 @@
     <Compile Include="ICouchPotatoApi.cs" />
     <Compile Include="IPlexApi.cs" />
     <Compile Include="IPushbulletApi.cs" />
+    <Compile Include="IPushoverApi.cs" />
     <Compile Include="ISickRageApi.cs" />
     <Compile Include="ISonarrApi.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/PlexRequests.Api.Models/Notifications/PushoverResponse.cs b/PlexRequests.Api.Models/Notifications/PushoverResponse.cs
new file mode 100644
index 000000000..94849fba1
--- /dev/null
+++ b/PlexRequests.Api.Models/Notifications/PushoverResponse.cs
@@ -0,0 +1,34 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: PushoverResponse.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
+namespace PlexRequests.Api.Models.Notifications
+{
+    public class PushoverResponse
+    {
+        public int status { get; set; }
+        public string request { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index bd3151c55..8a4da4222 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Movie\CouchPotatoStatus.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
+    <Compile Include="Notifications\PushoverResponse.cs" />
     <Compile Include="Plex\PlexAccount.cs" />
     <Compile Include="Plex\PlexAuthentication.cs" />
     <Compile Include="Plex\PlexError.cs" />
diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index 2f204c975..6422dfd6f 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -72,6 +72,7 @@
       <DependentUpon>MockApiData.resx</DependentUpon>
     </Compile>
     <Compile Include="Mocks\MockSonarrApi.cs" />
+    <Compile Include="PushoverApi.cs" />
     <Compile Include="PushbulletApi.cs" />
     <Compile Include="SickrageApi.cs" />
     <Compile Include="SonarrApi.cs" />
diff --git a/PlexRequests.Api/PushoverApi.cs b/PlexRequests.Api/PushoverApi.cs
new file mode 100644
index 000000000..1de5694aa
--- /dev/null
+++ b/PlexRequests.Api/PushoverApi.cs
@@ -0,0 +1,56 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: PlexApi.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 Nancy.Helpers;
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models.Notifications;
+
+using RestSharp;
+
+namespace PlexRequests.Api
+{
+    public class PushoverApi : IPushoverApi
+    {
+        public PushoverResponse Push(string accessToken, string message, string userToken)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.POST,
+                Resource = "messages.json?token={token}&user={user}&message={message}"
+            };
+
+            request.AddUrlSegment("token", accessToken);
+            request.AddUrlSegment("message", message);
+            request.AddUrlSegment("user", userToken);
+
+
+            var api = new ApiRequest();
+            return api.ExecuteJson<PushoverResponse>(request, new Uri("https://api.pushover.net/1"));
+        }
+    }
+}
+
diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj
index e1c4ee1f3..9b698ab96 100644
--- a/PlexRequests.Core/PlexRequests.Core.csproj
+++ b/PlexRequests.Core/PlexRequests.Core.csproj
@@ -73,6 +73,7 @@
     <Compile Include="JsonRequestService.cs" />
     <Compile Include="Models\StatusModel.cs" />
     <Compile Include="SettingModels\AuthenticationSettings.cs" />
+    <Compile Include="SettingModels\PushoverNotificationSettings.cs" />
     <Compile Include="SettingModels\PushBulletNotificationSettings.cs" />
     <Compile Include="SettingModels\EmailNotificationSettings.cs" />
     <Compile Include="SettingModels\PlexSettings.cs" />
diff --git a/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs b/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs
new file mode 100644
index 000000000..ac6c4c435
--- /dev/null
+++ b/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs
@@ -0,0 +1,9 @@
+namespace PlexRequests.Core.SettingModels
+{
+    public class PushoverNotificationSettings : Settings
+    {
+        public bool Enabled { get; set; }
+        public string AccessToken { get; set; }
+        public string UserToken { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
new file mode 100644
index 000000000..2c3bf6bfe
--- /dev/null
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -0,0 +1,132 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: PushbulletNotification.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 NLog;
+
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Core;
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.Services.Notification
+{
+    public class PushoverNotification : INotification
+    {
+        public PushoverNotification(IPushoverApi pushoverApi, ISettingsService<PushoverNotificationSettings> settings)
+        {
+            PushoverApi = pushoverApi;
+            SettingsService = settings;
+        }
+        private IPushoverApi PushoverApi { get;  }
+        private ISettingsService<PushoverNotificationSettings> SettingsService { get; }
+        private PushoverNotificationSettings Settings => GetSettings();
+
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+        public string NotificationName => "PushoverNotification";
+        public bool Notify(NotificationModel model)
+        {
+            if (!ValidateConfiguration())
+            {
+                return false;
+            }
+
+            switch (model.NotificationType)
+            {
+                case NotificationType.NewRequest:
+                    return PushNewRequest(model);
+ 
+                case NotificationType.Issue:
+                    return PushIssue(model);
+
+                case NotificationType.RequestAvailable:
+                    break;
+                case NotificationType.RequestApproved:
+                    break;
+                case NotificationType.AdminNote:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+            return false;
+
+        }
+
+        private bool ValidateConfiguration()
+        {
+            if (!Settings.Enabled)
+            {
+                return false;
+            }
+            if (string.IsNullOrEmpty(Settings.AccessToken) || string.IsNullOrEmpty(Settings.UserToken))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        private PushoverNotificationSettings GetSettings()
+        {
+            return SettingsService.GetSettings();
+        }
+
+        private bool PushNewRequest(NotificationModel model)
+        {
+            var message = $"Plex Requests: {model.Title} has been requested by user: {model.User}";
+            try
+            {
+                var result = PushoverApi.Push(Settings.AccessToken, message, Settings.UserToken);
+                if (result?.status == 1)
+                {
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+            }
+            return false;
+        }
+
+        private bool PushIssue(NotificationModel model)
+        {
+            var message = $"Plex Requests: A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
+            try
+            {
+                var result = PushoverApi.Push(Settings.AccessToken, message, Settings.UserToken);
+                if (result != null)
+                {
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+            }
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj
index 0317cf36b..e1ba81532 100644
--- a/PlexRequests.Services/PlexRequests.Services.csproj
+++ b/PlexRequests.Services/PlexRequests.Services.csproj
@@ -82,6 +82,7 @@
     <Compile Include="Notification\NotificationModel.cs" />
     <Compile Include="Notification\NotificationService.cs" />
     <Compile Include="Notification\NotificationType.cs" />
+    <Compile Include="Notification\PushoverNotification.cs" />
     <Compile Include="Notification\PushbulletNotification.cs" />
     <Compile Include="PlexAvailabilityChecker.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/PlexRequests.UI.Tests/AdminModuleTests.cs b/PlexRequests.UI.Tests/AdminModuleTests.cs
index e42eb4a13..08c84235b 100644
--- a/PlexRequests.UI.Tests/AdminModuleTests.cs
+++ b/PlexRequests.UI.Tests/AdminModuleTests.cs
@@ -55,9 +55,11 @@ namespace PlexRequests.UI.Tests
         private Mock<ISettingsService<SickRageSettings>> SickRageSettingsMock { get; set; }
         private Mock<ISettingsService<EmailNotificationSettings>> EmailMock { get; set; }
         private Mock<ISettingsService<PushbulletNotificationSettings>> PushbulletSettings { get; set; }
+        private Mock<ISettingsService<PushoverNotificationSettings>> PushoverSettings { get; set; }
         private Mock<IPlexApi> PlexMock { get; set; }
         private Mock<ISonarrApi> SonarrApiMock { get; set; }
         private Mock<IPushbulletApi> PushbulletApi { get; set; }
+        private Mock<IPushoverApi> PushoverApi { get; set; }
         private Mock<ICouchPotatoApi> CpApi { get; set; }
 
         private ConfigurableBootstrapper Bootstrapper { get; set; }
@@ -83,6 +85,8 @@ namespace PlexRequests.UI.Tests
             PushbulletSettings = new Mock<ISettingsService<PushbulletNotificationSettings>>();
             CpApi = new Mock<ICouchPotatoApi>();
             SickRageSettingsMock = new Mock<ISettingsService<SickRageSettings>>();
+            PushoverSettings = new Mock<ISettingsService<PushoverNotificationSettings>>();
+            PushoverApi = new Mock<IPushoverApi>();
 
             Bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -99,6 +103,8 @@ namespace PlexRequests.UI.Tests
                 with.Dependency(PushbulletSettings.Object);
                 with.Dependency(CpApi.Object);
                 with.Dependency(SickRageSettingsMock.Object);
+                with.Dependency(PushoverSettings.Object);
+                with.Dependency(PushoverApi.Object);
                 with.RootPathProvider<TestRootPathProvider>();
                 with.RequestStartup((container, pipelines, context) =>
                 {
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index 8fd5aad2b..9c07266e9 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -74,6 +74,7 @@ namespace PlexRequests.UI
             container.Register<ISettingsService<SickRageSettings>, SettingsServiceV2<SickRageSettings>>();
             container.Register<ISettingsService<EmailNotificationSettings>, SettingsServiceV2<EmailNotificationSettings>>();
             container.Register<ISettingsService<PushbulletNotificationSettings>, SettingsServiceV2<PushbulletNotificationSettings>>();
+            container.Register<ISettingsService<PushoverNotificationSettings>, SettingsServiceV2<PushoverNotificationSettings>>();
 
             // Repo's
             container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
@@ -88,6 +89,7 @@ namespace PlexRequests.UI
             // Api's
             container.Register<ICouchPotatoApi, CouchPotatoApi>();
             container.Register<IPushbulletApi, PushbulletApi>();
+            container.Register<IPushoverApi, PushoverApi>();
             container.Register<ISickRageApi, SickrageApi>();
             container.Register<ISonarrApi, SonarrApi>();
             container.Register<IPlexApi, PlexApi>();
@@ -137,7 +139,14 @@ namespace PlexRequests.UI
             var pushbulletSettings = pushbulletService.GetSettings();
             if (pushbulletSettings.Enabled)
             {
-                NotificationService.Subscribe(new PushbulletNotification(container.Resolve<IPushbulletApi>(), container.Resolve<ISettingsService<PushbulletNotificationSettings>>()));
+                NotificationService.Subscribe(new PushbulletNotification(container.Resolve<IPushbulletApi>(), pushbulletService));
+            }
+
+            var pushoverService = container.Resolve<ISettingsService<PushoverNotificationSettings>>();
+            var pushoverSettings = pushoverService.GetSettings();
+            if (pushoverSettings.Enabled)
+            {
+                NotificationService.Subscribe(new PushoverNotification(container.Resolve<IPushoverApi>(), pushoverService));
             }
         }
     }
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index 7876aa41c..d97d06129 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -59,9 +59,11 @@ namespace PlexRequests.UI.Modules
         private ISettingsService<SickRageSettings> SickRageService { get; }
         private ISettingsService<EmailNotificationSettings> EmailService { get; }
         private ISettingsService<PushbulletNotificationSettings> PushbulletService { get; }
+        private ISettingsService<PushoverNotificationSettings> PushoverService { get; }
         private IPlexApi PlexApi { get; }
         private ISonarrApi SonarrApi { get; }
-        private PushbulletApi PushbulletApi { get; }
+        private IPushbulletApi PushbulletApi { get; }
+        private IPushoverApi PushoverApi { get; }
         private ICouchPotatoApi CpApi { get; }
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
@@ -76,7 +78,9 @@ namespace PlexRequests.UI.Modules
             IPlexApi plexApi,
             ISettingsService<PushbulletNotificationSettings> pbSettings,
             PushbulletApi pbApi,
-            ICouchPotatoApi cpApi) : base("admin")
+            ICouchPotatoApi cpApi,
+            ISettingsService<PushoverNotificationSettings> pushoverSettings,
+            IPushoverApi pushoverApi) : base("admin")
         {
             RpService = rpService;
             CpService = cpService;
@@ -90,6 +94,8 @@ namespace PlexRequests.UI.Modules
             PushbulletApi = pbApi;
             CpApi = cpApi;
             SickRageService = sickrage;
+            PushoverService = pushoverSettings;
+            PushoverApi = pushoverApi;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -126,6 +132,9 @@ namespace PlexRequests.UI.Modules
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
             Post["/pushbulletnotification"] = _ => SavePushbulletNotifications();
+
+            Get["/pushovernotification"] = _ => PushoverNotifications();
+            Post["/pushovernotification"] = _ => SavePushoverNotifications();
         }
 
         private Negotiator Authentication()
@@ -415,6 +424,38 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
+        private Negotiator PushoverNotifications()
+        {
+            var settings = PushoverService.GetSettings();
+            return View["PushoverNotifications", settings];
+        }
+
+        private Response SavePushoverNotifications()
+        {
+            var settings = this.Bind<PushoverNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+            Log.Trace(settings.DumpJson());
+
+            var result = PushoverService.SaveSettings(settings);
+            if (settings.Enabled)
+            {
+                NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService));
+            }
+            else
+            {
+                NotificationService.UnSubscribe(new PushoverNotification(PushoverApi, PushoverService));
+            }
+
+            Log.Info("Saved email settings, result: {0}", result);
+            return Response.AsJson(result
+                ? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Pushbullet Notifications!" }
+                : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
+        }
+
         private Response GetCpProfiles()
         {
             var settings = this.Bind<CouchPotatoSettings>();
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index 44ec9805c..a62ab2592 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -166,6 +166,7 @@
     <Compile Include="Bootstrapper.cs" />
     <Compile Include="Helpers\TvSender.cs" />
     <Compile Include="Helpers\ValidationHelper.cs" />
+    <Compile Include="Validators\PushoverSettingsValidator.cs" />
     <Compile Include="Validators\PushbulletSettingsValidator.cs" />
     <Compile Include="Validators\EmailNotificationSettingsValidator.cs" />
     <Compile Include="Validators\CouchPotatoValidator.cs" />
@@ -335,6 +336,9 @@
     <Content Include="Views\Login\ChangePassword.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Views\Admin\PushoverNotifications.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>
diff --git a/PlexRequests.UI/Validators/PushoverSettingsValidator.cs b/PlexRequests.UI/Validators/PushoverSettingsValidator.cs
new file mode 100644
index 000000000..55a218aa0
--- /dev/null
+++ b/PlexRequests.UI/Validators/PushoverSettingsValidator.cs
@@ -0,0 +1,41 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrValidator.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 FluentValidation;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.UI.Validators
+{
+    public class PushoverSettingsValidator : AbstractValidator<PushoverNotificationSettings>
+    {
+        public PushoverSettingsValidator()
+        {
+            RuleFor(request => request.AccessToken).NotEmpty().WithMessage("You must specify a API Token.");
+            RuleFor(request => request.UserToken).NotEmpty().WithMessage("You must specify a User Token.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
new file mode 100644
index 000000000..0877739d0
--- /dev/null
+++ b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
@@ -0,0 +1,74 @@
+@Html.Partial("_Sidebar")
+
+<div class="col-sm-8 col-sm-push-1">
+    <form class="form-horizontal" method="POST" id="mainForm">
+        <fieldset>
+            <legend>Pushover Notifications</legend>
+
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.Enabled)
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><text>Enabled</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled"><text>Enabled</text>
+                        }
+                    </label>
+                </div>
+            </div>
+            
+            <div class="form-group">
+                <label for="AccessToken" class="control-label">API Key</label>
+                <small class="control-label">Enter your API Key from Pushover.</small>
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="AccessToken" name="AccessToken"  value="@Model.AccessToken">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="UserToken" class="control-label">User Token</label>
+                <small class="control-label">Your user or group key from Pushover.</small>
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="UserToken" name="UserToken" value="@Model.UserToken">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div>
+                    <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
+                </div>
+            </div>
+        </fieldset>
+    </form>
+</div>
+
+<script>
+    $(function () {
+
+        $('#save').click(function (e) {
+            e.preventDefault();
+
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: $form.prop("action"),
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
index 2877729c7..51e181921 100644
--- a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
+++ b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
@@ -71,6 +71,15 @@
             <a class="list-group-item" href="/admin/pushbulletnotification">Pushbullet Notifications</a>
         }
 
+        @if (Context.Request.Path == "/admin/pushovernotification")
+        {
+            <a class="list-group-item active" href="/admin/pushovernotification">Pushover Notifications</a>
+        }
+        else
+        {
+            <a class="list-group-item" href="/admin/pushovernotification">Pushover Notifications</a>
+        }
+
         @if (Context.Request.Path == "/admin/status")
         {
             <a class="list-group-item active" href="/admin/status">Status</a>

From 95fad3c33ca5bc5625e6f2766fd7427618001b9c Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Wed, 23 Mar 2016 09:49:33 +0000
Subject: [PATCH 3/3] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2f6ac4c89..db7bdba52 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet)
 
 ###### A massive thanks to everyone below!
 
-[heartisall](https://github.com/heartisall)
+[heartisall](https://github.com/heartisall), Stuke00, [shiitake](https://github.com/shiitake)
 
 
 # Sponsors