From c664eaa9b54986da1360318a3f7944ca21158be0 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 17 Sep 2023 23:56:17 -0700
Subject: [PATCH] New: Don't treat 400 responses from Notifiarr as errors

(cherry picked from commit 5eb420bbe12f59d0a5392abf3d351be28ca210e6)
---
 .../Notifications/Notifiarr/NotifiarrProxy.cs       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs
index b42d14b31..963e0ba2d 100644
--- a/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Notifiarr/NotifiarrProxy.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using NLog;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Notifications.Webhook;
@@ -14,10 +15,12 @@ namespace NzbDrone.Core.Notifications.Notifiarr
     {
         private const string URL = "https://notifiarr.com";
         private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
 
-        public NotifiarrProxy(IHttpClient httpClient)
+        public NotifiarrProxy(IHttpClient httpClient, Logger logger)
         {
             _httpClient = httpClient;
+            _logger = logger;
         }
 
         public void SendNotification(WebhookPayload payload, NotifiarrSettings settings)
@@ -47,12 +50,17 @@ namespace NzbDrone.Core.Notifications.Notifiarr
                 switch ((int)responseCode)
                 {
                     case 401:
+                        _logger.Warn("HTTP 401 - API key is invalid");
                         throw new NotifiarrException("API key is invalid");
                     case 400:
-                        throw new NotifiarrException("Unable to send notification. Ensure Prowlarr Integration is enabled & assigned a channel on Notifiarr");
+                        // 400 responses shouldn't be treated as an actual error because it's a misconfiguration
+                        // between Prowlarr and Notifiarr for a specific event, but shouldn't stop all events.
+                        _logger.Warn("HTTP 400 - Unable to send notification. Ensure Prowlarr Integration is enabled & assigned a channel on Notifiarr");
+                        break;
                     case 502:
                     case 503:
                     case 504:
+                        _logger.Warn("Unable to send notification. Service Unavailable");
                         throw new NotifiarrException("Unable to send notification. Service Unavailable", ex);
                     case 520:
                     case 521:
@@ -61,6 +69,7 @@ namespace NzbDrone.Core.Notifications.Notifiarr
                     case 524:
                         throw new NotifiarrException("Cloudflare Related HTTP Error - Unable to send notification", ex);
                     default:
+                        _logger.Error(ex, "Unknown HTTP Error - Unable to send notification");
                         throw new NotifiarrException("Unknown HTTP Error - Unable to send notification", ex);
                 }
             }