Fix the Apprise integration to use Flip.new_status

hc/api/tests/test_notify_apprise.py

@@ -27,7 +27,9 @@ class NotifyAppriseTestCase(BaseTestCase):
 
         self.check = Check(project=self.project)
         self.check.name = "Foo"
-        self.check.status = "down"
+        # Transport classes should use flip.new_status,
+        # so the status "paused" should not appear anywhere
+        self.check.status = "paused"
         self.check.last_ping = now() - td(minutes=61)
         self.check.save()
 

hc/api/transports.py

@@ -1088,21 +1088,20 @@ class Trello(HttpTransport):
 
 
 class Apprise(HttpTransport):
-    def notify(self, check: Check, notification: Notification) -> None:
+    def notify_flip(self, flip: Flip, notification: Notification) -> None:
         if not settings.APPRISE_ENABLED:
             # Not supported and/or enabled
             raise TransportError("Apprise is disabled and/or not installed")
 
         a = apprise.Apprise()
-        title = tmpl("apprise_title.html", check=check)
+        check, status = flip.owner, flip.new_status
-        body = tmpl("apprise_description.html", check=check)
+        title = tmpl("apprise_title.html", check=check, status=status)
+        body = tmpl("apprise_description.html", check=check, status=status)
 
         a.add(self.channel.value)
 
         notify_type = (
-            apprise.NotifyType.SUCCESS
+            apprise.NotifyType.SUCCESS if status == "up" else apprise.NotifyType.FAILURE
-            if check.status == "up"
-            else apprise.NotifyType.FAILURE
         )
 
         if not a.notify(body=body, title=title, notify_type=notify_type):

templates/integrations/apprise_description.html

@@ -1,5 +1,5 @@
 {% load humanize %}
-{{ check.name_then_code }} is {{ check.status|upper }}.
+{{ check.name_then_code }} is {{ status|upper }}.
-{% if check.status == "down" and check.last_ping %}
+{% if status == "down" and check.last_ping %}
 Last ping was {{ check.last_ping|naturaltime }}.
 {% endif %}

templates/integrations/apprise_title.html

@@ -1 +1 @@
-{{ check.name_then_code }} is {{ check.status|upper }}
+{{ check.name_then_code }} is {{ status|upper }}