From 47a657d25c44910b548410dea84b092e5d5488dc Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 11 Jan 2023 00:31:49 +0100
Subject: mod/notification-*: support extra text (or emojis 🚀) in notification
 tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mod/notification-email    |  3 ++-
 mod/notification-matrix   | 10 ++++++----
 mod/notification-telegram |  4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'mod')

diff --git a/mod/notification-email b/mod/notification-email
index 8868941..b03e176 100644
--- a/mod/notification-email
+++ b/mod/notification-email
@@ -107,10 +107,11 @@
 # generate the e-mail subject
 :set NotificationEMailSubject do={
   :global Identity;
+  :global IdentityExtra;
 
   :global QuotedPrintable;
 
-  :return [ $QuotedPrintable ("[" . $Identity . "] " . $1) ];
+  :return [ $QuotedPrintable ("[" . $IdentityExtra . $Identity . "] " . $1) ];
 }
 
 # send notification via e-mail - expects one array argument
diff --git a/mod/notification-matrix b/mod/notification-matrix
index c43514d..6266b75 100644
--- a/mod/notification-matrix
+++ b/mod/notification-matrix
@@ -56,6 +56,7 @@
   :local Notification $1;
 
   :global Identity;
+  :global IdentityExtra;
   :global MatrixAccessToken;
   :global MatrixAccessTokenOverride;
   :global MatrixHomeServer;
@@ -106,10 +107,11 @@
     :return false;
   }
 
-  :local Plain [ $PrepareText ("## [" . $Identity . "] " . ($Notification->"subject") . "\n```\n" . \
-    ($Notification->"message") . "\n```") "plain" ];
-  :local Formatted ("<h2>" . [ $PrepareText ("[" . $Identity . "] " . ($Notification->"subject")) "format" ] . "</h2>" . \
-    "<pre><code>" . [ $PrepareText ($Notification->"message") "format" ] . "</code></pre>");
+  :local Plain [ $PrepareText ("## [" . $IdentityExtra . $Identity . "] " . \
+    ($Notification->"subject") . "\n```\n" . ($Notification->"message") . "\n```") "plain" ];
+  :local Formatted ("<h2>" . [ $PrepareText ("[" . $IdentityExtra . $Identity . "] " . \
+    ($Notification->"subject")) "format" ] . "</h2>" . "<pre><code>" . \
+    [ $PrepareText ($Notification->"message") "format" ] . "</code></pre>");
   :if ([ :len ($Notification->"link") ] > 0) do={
     :set Plain ($Plain . "\\n" . [ $SymbolForNotification "link" ] . \
       [ $PrepareText ("[" . $Notification->"link" . "](" . $Notification->"link" . ")") "plain" ]);
diff --git a/mod/notification-telegram b/mod/notification-telegram
index de8cdd8..03ccc3b 100644
--- a/mod/notification-telegram
+++ b/mod/notification-telegram
@@ -55,6 +55,7 @@
   :local Notification $1;
 
   :global Identity;
+  :global IdentityExtra;
   :global TelegramChatId;
   :global TelegramChatIdOverride;
   :global TelegramFixedWidthFont;
@@ -105,7 +106,8 @@
   }
 
   :local Truncated false;
-  :local Text ("*__" . [ $EscapeMD ("[" . $Identity . "] " . ($Notification->"subject")) "plain" ] . "__*\n\n");
+  :local Text ("*__" . [ $EscapeMD ("[" . $IdentityExtra . $Identity . "] " . \
+    ($Notification->"subject")) "plain" ] . "__*\n\n");
   :local LenSubject [ :len $Text ];
   :local LenMessage [ :len ($Notification->"message") ];
   :local LenLink [ :len ($Notification->"link") ];
-- 
cgit v1.2.3-70-g09d2