Add additional apprise notification option (Nachtzuster#88)

* Update config.php Added $maskedlistenurl as an option for apprise notifications. * Update notifications.py Make sure $maskedlistenurl also works with default detections, and not only when testing. * Update config.php Changed maskedlistenurl to friendlyurl * Update notifications.py Changed maskedlistenurl to friendlyurl
tomtom215 · Jun 9, 2024 · e6f48f8 · e6f48f8
1 parent f84c44b
commit e6f48f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/scripts/config.php b/scripts/config.php
@@ -220,6 +220,8 @@ function() {
     $filename = "http://".$_SERVER['SERVER_NAME']."/"."?filename=".$filename;
   }
 
+  $friendlyfilename = "[Listen here](".$filename.")";
+
   $attach="";
   $exampleimage = "https://live.staticflickr.com/7430/27545810581_8bfa8289a3_c.jpg";
   if (strpos($body, '$flickrimage') !== false) {
@@ -234,6 +236,7 @@ function() {
   $title = str_replace("\$confidencepct", round($confidence*100), $title);
   $title = str_replace("\$confidence", $confidence, $title);
   $title = str_replace("\$listenurl", $filename, $title);
+  $title = str_replace("\$friendlyurl", $friendlyfilename, $title);
   $title = str_replace("\$date", $date, $title);
   $title = str_replace("\$time", $time, $title);
   $title = str_replace("\$week", $week, $title);
@@ -250,6 +253,7 @@ function() {
   $body = str_replace("\$confidencepct", round($confidence*100), $body);
   $body = str_replace("\$confidence", $confidence, $body);
   $body = str_replace("\$listenurl", $filename, $body);
+  $body = str_replace("\$friendlyurl", $friendlyfilename, $body);
   $body = str_replace("\$date", $date, $body);
   $body = str_replace("\$time", $time, $body);
   $body = str_replace("\$week", $week, $body);
@@ -499,6 +503,8 @@ function runProcess() {
       <dd>Confidence Score as a percentage (eg. 0.91 => 91)</dd>
       <dt>$listenurl</dt>
       <dd>A link to the detection</dd>
+      <dt>$friendlyurl</dt>
+      <dd>A masked link to the detection. Only useful for services that support Markdown (e.g. Discord). </dd>
       <dt>$date</dt>
       <dd>Date</dd>
       <dt>$time</dt>

diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py
@@ -49,6 +49,7 @@ def render_template(template, reason=""):
             .replace("$confidencepct", confidencepct) \
             .replace("$confidence", confidence) \
             .replace("$listenurl", listenurl) \
+            .replace("$friendlyurl", friendlyurl) \
             .replace("$date", date) \
             .replace("$time", time) \
             .replace("$week", week) \
@@ -97,6 +98,7 @@ def render_template(template, reason=""):
             websiteurl = "http://"+socket.gethostname()+".local"
 
         listenurl = websiteurl+"?filename="+path
+        friendlyurl = "[Listen here]("+listenurl+")"
         image_url = ""
 
         if len(settings_dict.get('FLICKR_API_KEY')) > 0 and "$flickrimage" in body: