From 6e57e33b8f71120f3caa044eda08244de303990b Mon Sep 17 00:00:00 2001
From: Chris Caron <lead2gold@gmail.com>
Date: Sat, 11 May 2024 18:08:07 -0400
Subject: [PATCH] updated to work with Apprise v1.8.0

---
 apprise_api/api/tests/test_notify.py           | 4 ++--
 apprise_api/api/tests/test_stateful_notify.py  | 2 +-
 apprise_api/api/tests/test_stateless_notify.py | 6 +++---
 apprise_api/api/utils.py                       | 4 ++--
 apprise_api/api/views.py                       | 2 +-
 requirements.txt                               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apprise_api/api/tests/test_notify.py b/apprise_api/api/tests/test_notify.py
index 0d8e349..899f5b8 100644
--- a/apprise_api/api/tests/test_notify.py
+++ b/apprise_api/api/tests/test_notify.py
@@ -33,7 +33,7 @@ import apprise
 from inspect import cleandoc
 
 # Grant access to our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class NotifyTests(SimpleTestCase):
@@ -1176,7 +1176,7 @@ class NotifyTests(SimpleTestCase):
         assert mock_notify.call_count == 1
         assert response['content-type'].startswith('text/html')
 
-    @mock.patch('apprise.plugins.NotifyEmail.NotifyEmail.send')
+    @mock.patch('apprise.plugins.email.NotifyEmail.send')
     def test_notify_with_filters(self, mock_send):
         """
         Test workings of APPRISE_DENY_SERVICES and APPRISE_ALLOW_SERVICES
diff --git a/apprise_api/api/tests/test_stateful_notify.py b/apprise_api/api/tests/test_stateful_notify.py
index 790cb50..e4f1a2b 100644
--- a/apprise_api/api/tests/test_stateful_notify.py
+++ b/apprise_api/api/tests/test_stateful_notify.py
@@ -35,7 +35,7 @@ import requests
 import inspect
 
 # Grant access to our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class StatefulNotifyTests(SimpleTestCase):
diff --git a/apprise_api/api/tests/test_stateless_notify.py b/apprise_api/api/tests/test_stateless_notify.py
index 18804fd..db87416 100644
--- a/apprise_api/api/tests/test_stateless_notify.py
+++ b/apprise_api/api/tests/test_stateless_notify.py
@@ -33,7 +33,7 @@ import json
 import apprise
 
 # Grant access to our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class StatelessNotifyTests(SimpleTestCase):
@@ -350,7 +350,7 @@ class StatelessNotifyTests(SimpleTestCase):
         }
 
         # Monkey Patch
-        apprise.plugins.NotifyEmail.NotifyEmail.enabled = True
+        apprise.plugins.email.NotifyEmail.enabled = True
 
         # At a minimum 'body' is requred
         form = NotifyByUrlForm(data=form_data)
@@ -606,7 +606,7 @@ class StatelessNotifyTests(SimpleTestCase):
         assert response.status_code == 400
         assert mock_notify.call_count == 0
 
-    @mock.patch('apprise.plugins.NotifyJSON.NotifyJSON.send')
+    @mock.patch('apprise.plugins.custom_json.NotifyJSON.send')
     def test_notify_with_filters(self, mock_send):
         """
         Test workings of APPRISE_DENY_SERVICES and APPRISE_ALLOW_SERVICES
diff --git a/apprise_api/api/utils.py b/apprise_api/api/utils.py
index b0e28d8..1d4b66f 100644
--- a/apprise_api/api/utils.py
+++ b/apprise_api/api/utils.py
@@ -78,10 +78,10 @@ STORE_MODES = (
 )
 
 # Access our Attachment Manager Singleton
-A_MGR = apprise.AttachmentManager.AttachmentManager()
+A_MGR = apprise.manager_attachment.AttachmentManager()
 
 # Access our Notification Manager Singleton
-N_MGR = apprise.NotificationManager.NotificationManager()
+N_MGR = apprise.manager_plugins.NotificationManager()
 
 
 class Attachment(A_MGR['file']):
diff --git a/apprise_api/api/views.py b/apprise_api/api/views.py
index 4d42865..0db759b 100644
--- a/apprise_api/api/views.py
+++ b/apprise_api/api/views.py
@@ -100,7 +100,7 @@ class JSONEncoder(DjangoJSONEncoder):
         if isinstance(obj, set):
             return list(obj)
 
-        elif isinstance(obj, apprise.AppriseLocale.LazyTranslation):
+        elif isinstance(obj, apprise.locale.LazyTranslation):
             return str(obj)
 
         return super().default(obj)
diff --git a/requirements.txt b/requirements.txt
index 2015575..5f78d9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@
 # apprise @ git+https://github.com/caronc/apprise@custom-tag-or-version
 
 ## 3. The below grabs our stable version (generally the best choice):
-apprise == 1.7.6
+apprise == 1.8.0
 
 ## Apprise API Minimum Requirements
 django