github-mirrors/prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-04-25 06:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rearrange params in Apprise

Browse source
This commit is contained in:
Bogdan 2023-04-20 08:10:05 +03:00
parent 2015156061
commit c8addc0d62
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/NzbDrone.Core/Notifications/Apprise/Apprise.cs
View file

@ -17,19 +17,19 @@ namespace NzbDrone.Core.Notifications.Apprise
_proxy = proxy; _proxy = proxy;
} }
public override void OnGrab(GrabMessage message) public override void OnGrab(GrabMessage grabMessage)
{ {
_proxy.SendNotification(Settings, RELEASE_GRABBED_TITLE_BRANDED, $"{message.Message}"); _proxy.SendNotification(RELEASE_GRABBED_TITLE_BRANDED, grabMessage.Message, Settings);
} }
public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck) public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck)
{ {
_proxy.SendNotification(Settings, HEALTH_ISSUE_TITLE_BRANDED, $"{healthCheck.Message}"); _proxy.SendNotification(HEALTH_ISSUE_TITLE_BRANDED, healthCheck.Message, Settings);
} }
public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage) public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
{ {
_proxy.SendNotification(Settings, APPLICATION_UPDATE_TITLE_BRANDED, $"{updateMessage.Message}"); _proxy.SendNotification(APPLICATION_UPDATE_TITLE_BRANDED, updateMessage.Message, Settings);
} }
public override ValidationResult Test() public override ValidationResult Test()

2
src/NzbDrone.Core/Notifications/Apprise/ApprisePayload.cs
View file

@ -1,5 +1,3 @@
using Newtonsoft.Json;
namespace NzbDrone.Core.Notifications.Apprise namespace NzbDrone.Core.Notifications.Apprise
{ {
public class ApprisePayload public class ApprisePayload

6
src/NzbDrone.Core/Notifications/Apprise/AppriseProxy.cs
View file

@ -11,7 +11,7 @@ namespace NzbDrone.Core.Notifications.Apprise
{ {
public interface IAppriseProxy public interface IAppriseProxy
{ {
void SendNotification(AppriseSettings settings, string title, string message); void SendNotification(string title, string message, AppriseSettings settings);
ValidationFailure Test(AppriseSettings settings); ValidationFailure Test(AppriseSettings settings);
} }
@ -26,7 +26,7 @@ namespace NzbDrone.Core.Notifications.Apprise
_logger = logger; _logger = logger;
} }
public void SendNotification(AppriseSettings settings, string title, string message) public void SendNotification(string title, string message, AppriseSettings settings)
{ {
var payload = new ApprisePayload var payload = new ApprisePayload
{ {
@ -85,7 +85,7 @@ namespace NzbDrone.Core.Notifications.Apprise
try try
{ {
SendNotification(settings, title, body); SendNotification(title, body, settings);
} }
catch (AppriseException ex) when (ex.InnerException is HttpException httpException) catch (AppriseException ex) when (ex.InnerException is HttpException httpException)
{ {