From 3a36db6de8a69cba493bdd0baf86c60401fe971c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 18 Apr 2024 08:43:41 +0200
Subject: mod/notification-matrix: fix double escaping

That was introduced with 2a232ad2f5eef4b60c97306ef731bc5883bf5cfb when
switching to :serialize...
---
 mod/notification-matrix.rsc | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'mod')

diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index 3e3a33e..86e6b5f 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -86,21 +86,15 @@
     }
 
     :local Return "";
-    :local Chars {
-      "plain"={ "\\"; "\""; "\n" };
-      "format"={ "\\"; "\""; "\n"; "&"; "<"; ">" };
-    }
-    :local Subs {
-      "plain"={ "\\\\"; "\\\""; "\\n" };
-      "format"={ "\\\\"; "&quot;"; "<br/>"; "&amp;"; "&lt;"; "&gt;" };
-    }
+    :local Chars { "\""; "\n"; "&"; "<"; ">" };
+    :local Subs { "&quot;"; "<br/>"; "&amp;"; "&lt;"; "&gt;" };
 
     :for I from=0 to=([ :len $Input ] - 1) do={
       :local Char [ :pick $Input $I ];
-      :local Replace [ :find ($Chars->$2) $Char ];
+      :local Replace [ :find $Chars $Char ];
 
       :if ([ :typeof $Replace ] = "num") do={
-        :set Char ($Subs->$2->$Replace);
+        :set Char ($Subs->$Replace);
       }
       :set Return ($Return . $Char);
     }
@@ -117,17 +111,17 @@
   }
 
   :local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ] });
-  :local Plain [ $PrepareText ("## [" . $IdentityExtra . $Identity . "] " . \
-    ($Notification->"subject") . "\n```\n" . ($Notification->"message") . "\n```") "plain" ];
+  :local Plain ("## [" . $IdentityExtra . $Identity . "] " . \
+    ($Notification->"subject") . "\n```\n" . ($Notification->"message") . "\n```");
   :local Formatted ("<h2>" . [ $PrepareText ("[" . $IdentityExtra . $Identity . "] " . \
-    ($Notification->"subject")) "format" ] . "</h2>" . "<pre><code>" . \
-    [ $PrepareText ($Notification->"message") "format" ] . "</code></pre>");
+    ($Notification->"subject")) ] . "</h2>" . "<pre><code>" . \
+    [ $PrepareText ($Notification->"message") ] . "</code></pre>");
   :if ([ :len ($Notification->"link") ] > 0) do={
     :set Plain ($Plain . "\\n" . [ $SymbolForNotification "link" ] . \
-      [ $PrepareText ("[" . $Notification->"link" . "](" . $Notification->"link" . ")") "plain" ]);
+      "[" . $Notification->"link" . "](" . $Notification->"link" . ")");
     :set Formatted ($Formatted . "<br/>" . [ $SymbolForNotification "link" ] . \
-      "<a href=\\\"" . [ $PrepareText ($Notification->"link") "format" ] . "\\\">" . \
-      [ $PrepareText ($Notification->"link") "format" ] . "</a>");
+      "<a href=\"" . [ $PrepareText ($Notification->"link") ] . "\">" . \
+      [ $PrepareText ($Notification->"link") ] . "</a>");
   }
 
   :do {
-- 
cgit v1.2.3-70-g09d2