From 04cf0594f68fc1b5d99f39c090c6f53afbc38404 Mon Sep 17 00:00:00 2001 From: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com> Date: Thu, 28 Oct 2021 10:41:42 +0100 Subject: [PATCH] Fixed: Prowl notification priority --- src/NzbDrone.Core/Notifications/Prowl/Prowl.cs | 6 +++--- src/NzbDrone.Core/Notifications/Prowl/ProwlProxy.cs | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs index d0cbb4b27..6372b1272 100644 --- a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs +++ b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs @@ -18,17 +18,17 @@ public Prowl(IProwlProxy prowlProxy) public override void OnGrab(GrabMessage message) { - _prowlProxy.SendNotification(BOOK_GRABBED_TITLE, message.Message, Settings.ApiKey); + _prowlProxy.SendNotification(BOOK_GRABBED_TITLE, message.Message, Settings); } public override void OnReleaseImport(BookDownloadMessage message) { - _prowlProxy.SendNotification(BOOK_DOWNLOADED_TITLE, message.Message, Settings.ApiKey); + _prowlProxy.SendNotification(BOOK_DOWNLOADED_TITLE, message.Message, Settings); } public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck) { - _prowlProxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings.ApiKey, (ProwlPriority)Settings.Priority); + _prowlProxy.SendNotification(HEALTH_ISSUE_TITLE, healthCheck.Message, Settings); } public override ValidationResult Test() diff --git a/src/NzbDrone.Core/Notifications/Prowl/ProwlProxy.cs b/src/NzbDrone.Core/Notifications/Prowl/ProwlProxy.cs index 9b736c3c4..cef379269 100644 --- a/src/NzbDrone.Core/Notifications/Prowl/ProwlProxy.cs +++ b/src/NzbDrone.Core/Notifications/Prowl/ProwlProxy.cs @@ -9,7 +9,7 @@ namespace NzbDrone.Core.Notifications.Prowl { public interface IProwlProxy { - void SendNotification(string title, string message, string apiKey, ProwlPriority priority = ProwlPriority.Normal, string url = null); + void SendNotification(string title, string message, ProwlSettings settings); ValidationFailure Test(ProwlSettings settings); } @@ -25,19 +25,18 @@ public ProwlProxy(IHttpClient httpClient, Logger logger) _logger = logger; } - public void SendNotification(string title, string message, string apiKey, ProwlPriority priority = ProwlPriority.Normal, string url = null) + public void SendNotification(string title, string message, ProwlSettings settings) { try { var requestBuilder = new HttpRequestBuilder(PUSH_URL); var request = requestBuilder.Post() - .AddFormParameter("apikey", apiKey) + .AddFormParameter("apikey", settings.ApiKey) .AddFormParameter("application", BuildInfo.AppName) .AddFormParameter("event", title) .AddFormParameter("description", message) - .AddFormParameter("priority", priority) - .AddFormParameter("url", url) + .AddFormParameter("priority", settings.Priority) .Build(); _httpClient.Post(request); @@ -46,7 +45,7 @@ public void SendNotification(string title, string message, string apiKey, ProwlP { if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) { - _logger.Error(ex, "Apikey is invalid: {0}", apiKey); + _logger.Error(ex, "Apikey is invalid: {0}", settings.ApiKey); throw new ProwlException("Apikey is invalid", ex); } @@ -65,7 +64,7 @@ public ValidationFailure Test(ProwlSettings settings) const string title = "Test Notification"; const string body = "This is a test message from Readarr"; - SendNotification(title, body, settings.ApiKey); + SendNotification(title, body, settings); } catch (Exception ex) {