From 24823441c33b5558ff9b87f6a8586620e7dad079 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 10 Oct 2023 23:43:59 +0200
Subject: log-forward: use colorful bullets to indicate severity

---
 global-functions.rsc |  5 ++++-
 log-forward.rsc      | 10 +++++++---
 news-and-changes.rsc |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index e084171..876f7d8 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -12,7 +12,7 @@
 :local 0 "global-functions";
 
 # expected configuration version
-:global ExpectedConfigVersion 107;
+:global ExpectedConfigVersion 108;
 
 # global variables not to be changed by user
 :global GlobalFunctionsReady false;
@@ -1230,6 +1230,9 @@
     "floppy-disk"="\F0\9F\92\BE";
     "high-voltage-sign"="\E2\9A\A1";
     "incoming-envelope"="\F0\9F\93\A8";
+    "information"="\E2\84\B9";
+    "large-orange-circle"="\F0\9F\9F\A0";
+    "large-red-circle"="\F0\9F\94\B4";
     "link"="\F0\9F\94\97";
     "lock-with-ink-pen"="\F0\9F\94\8F";
     "memo"="\F0\9F\93\9D";
diff --git a/log-forward.rsc b/log-forward.rsc
index 96cb257..e847256 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -17,7 +17,6 @@
 :global LogForwardIncludeMessage;
 :global LogForwardLast;
 :global LogForwardRateLimit;
-:global NotificationsWithSymbols;
 
 :global EitherOr;
 :global HexToNum;
@@ -53,14 +52,19 @@ $ScriptLock $0;
     !(topics~$LogForwardFilter) and !(message~$LogForwardFilterMessage)) or \
     topics~$LogForwardInclude or message~$LogForwardIncludeMessage ] do={
   :set MessageVal [ /log/get $Message ];
+  :local Bullet "information";
 
   :if ($Last < [ $HexToNum ($MessageVal->".id") ]) do={
     :local DupCount ($MessageDups->($MessageVal->"message"));
-    :if ($MessageVal->"topics" ~ "(emergency|alert|critical|error|warning)") do={
+    :if ($MessageVal->"topics" ~ "(warning)") do={
       :set Warning true;
+      :set Bullet "large-orange-circle";
+    }
+    :if ($MessageVal->"topics" ~ "(emergency|alert|critical|error)") do={
+      :set Bullet "large-red-circle";
     }
     :if ($DupCount < 3) do={
-      :set Messages ($Messages . "\n" . [ $IfThenElse ($NotificationsWithSymbols = true) (" \E2\97\8F ") ] . \
+      :set Messages ($Messages . "\n" . [ $SymbolForNotification $Bullet ] . \
         $MessageVal->"time" . " " . [ :tostr ($MessageVal->"topics") ] . " " . $MessageVal->"message");
     } else={
       :set Duplicates true;
diff --git a/news-and-changes.rsc b/news-and-changes.rsc
index d20ace0..debd756 100644
--- a/news-and-changes.rsc
+++ b/news-and-changes.rsc
@@ -21,6 +21,7 @@
   105="Extended 'check-routeros-update' to support automatic update from specific neighbor(s).";
   106="Modified 'telegram-chat' to make it act on message replies, without activation. Also made it answer a single question mark with a short notice.";
   107="Dropped support for non-fixed width font in Telegram notifications.";
+  108="Enhanced 'log-forward' to list log messages with colorful bullets to indicate severity.";
 };
 
 # Migration steps to be applied on script updates
-- 
cgit v1.2.3-70-g09d2