From 35103c3efd109ae5c7e7a15e745b4da6c5750ad3 Mon Sep 17 00:00:00 2001
From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com>
Date: Wed, 15 Feb 2023 20:14:35 -0500
Subject: [PATCH] Revert "Revert "Merge pull request #724 from
 knmurphy/enable-apprise-plugins""

This reverts commit e61a92475cb29c3c16420c8e6630f139a7c554a9.
---
 scripts/config.php             | 2 +-
 scripts/utils/notifications.py | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/config.php b/scripts/config.php
index 83dc3ee..9d4adb9 100644
--- a/scripts/config.php
+++ b/scripts/config.php
@@ -280,7 +280,7 @@ if(isset($_GET['sendtest']) && $_GET['sendtest'] == "true") {
   $body = str_replace("\$overlap", $overlap, $body);
   $body = str_replace("\$flickrimage", $exampleimage, $body);
 
-  echo "<pre class=\"bash\">".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv -t '".$title."' -b '".$body."' ".$attach." ".$cf." ")."</pre>";
+  echo "<pre class=\"bash\">".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv --plugin-path ".$home."/.apprise/plugins "." -t '".$title."' -b '".$body."' ".$attach." ".$cf." ")."</pre>";
 
   die();
 }
diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py
index 8ed3770..304f0d7 100644
--- a/scripts/utils/notifications.py
+++ b/scripts/utils/notifications.py
@@ -13,7 +13,13 @@ DB_PATH = userDir + '/BirdNET-Pi/scripts/birds.db'
 flickr_images = {}
 species_last_notified = {}
 
-apobj = apprise.Apprise()
+asset = apprise.AppriseAsset(
+    plugin_paths=[
+        userDir + "/.apprise/plugins",
+        userDir + "/.config/apprise/plugins",
+    ]
+)
+apobj = apprise.Apprise(asset=asset)
 config = apprise.AppriseConfig()
 config.add(APPRISE_CONFIG)
 apobj.add(config)