From fbbfcae6458c388db0361fa58a8cf9c16147a59f Mon Sep 17 00:00:00 2001
From: CezaryPuchowski <puchowski.cezary@gmail.com>
Date: Sun, 1 Oct 2023 14:46:16 +0200
Subject: [PATCH 1/6] nodes_plugin response in md

---
 plugins/nodes_plugin.py | 20 +++++++++++---------
 requirements.txt        |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
index e9fb47a..fc1d019 100644
--- a/plugins/nodes_plugin.py
+++ b/plugins/nodes_plugin.py
@@ -47,27 +47,29 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
 
         meshtastic_client = connect_meshtastic()
 
-        response = f"Nodes: {len(meshtastic_client.nodes)}\n"
+        response = f">Nodes: {len(meshtastic_client.nodes)}\n"
 
         for node, info in meshtastic_client.nodes.items():
+            snr = ""
             if "snr" in info:
-                snr = f"{info['snr']} dB"
-            else:
-                snr = ""
+                if info['snr'] is not None:
+                    snr = f"{info['snr']} dB "
 
             last_heard = None
             if "lastHeard" in info:
                 last_heard = get_relative_time(info["lastHeard"])
 
-            voltage = "?V"
-            battery = "?%"
+            voltage = ""
+            battery = ""
             if "deviceMetrics" in info:
                 if "voltage" in info["deviceMetrics"]:
-                    voltage = f"{info['deviceMetrics']['voltage']}V"
+                    voltage = f"{info['deviceMetrics']['voltage']}V "
                 if "batteryLevel" in info["deviceMetrics"]:
-                    battery = f"{info['deviceMetrics']['batteryLevel']}%"
+                    battery = f"{info['deviceMetrics']['batteryLevel']}% "
 
-            response += f"{info['user']['shortName']} {info['user']['longName']} / {info['user']['hwModel']} / {battery} {voltage} / {snr} / {last_heard}\n"
+            response += f">**{info['user']['shortName']}** {info['user']['longName']}\n"\
+                        f">{info['user']['hwModel']} {battery}{voltage}\n"\
+                        f">{snr}{last_heard}\n\n"
 
         return response
 
diff --git a/requirements.txt b/requirements.txt
index bfd0e8e..1a29938 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ Pillow==9.5.0
 py-staticmaps==0.4.0
 matrix-nio==0.20.2
 matplotlib==3.7.1
-requests==2.30.0
+requests==2.31.0
 markdown==3.4.3
 haversine==2.8.0
-schedule==1.2.0
\ No newline at end of file
+schedule==1.2.0

From a6562f219c6b41ef768d3f872b7c0b8a3ffc5fe9 Mon Sep 17 00:00:00 2001
From: CezaryPuchowski <puchowski.cezary@gmail.com>
Date: Sun, 1 Oct 2023 14:48:54 +0200
Subject: [PATCH 2/6] small newline fix

---
 plugins/nodes_plugin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
index fc1d019..1b343d5 100644
--- a/plugins/nodes_plugin.py
+++ b/plugins/nodes_plugin.py
@@ -47,7 +47,7 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
 
         meshtastic_client = connect_meshtastic()
 
-        response = f">Nodes: {len(meshtastic_client.nodes)}\n"
+        response = f">Nodes: {len(meshtastic_client.nodes)}"
 
         for node, info in meshtastic_client.nodes.items():
             snr = ""
@@ -67,9 +67,9 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
                 if "batteryLevel" in info["deviceMetrics"]:
                     battery = f"{info['deviceMetrics']['batteryLevel']}% "
 
-            response += f">**{info['user']['shortName']}** {info['user']['longName']}\n"\
+            response += f"\n\n>**{info['user']['shortName']}** {info['user']['longName']}\n"\
                         f">{info['user']['hwModel']} {battery}{voltage}\n"\
-                        f">{snr}{last_heard}\n\n"
+                        f">{snr}{last_heard}"
 
         return response
 

From ec54997689caa6476e250699ae1951a3faab8227 Mon Sep 17 00:00:00 2001
From: CezaryPuchowski <puchowski.cezary@gmail.com>
Date: Sun, 1 Oct 2023 15:01:02 +0200
Subject: [PATCH 3/6] Nodes text bold

---
 plugins/nodes_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
index 1b343d5..4f1bb3c 100644
--- a/plugins/nodes_plugin.py
+++ b/plugins/nodes_plugin.py
@@ -47,7 +47,7 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
 
         meshtastic_client = connect_meshtastic()
 
-        response = f">Nodes: {len(meshtastic_client.nodes)}"
+        response = f">**Nodes: {len(meshtastic_client.nodes)}**"
 
         for node, info in meshtastic_client.nodes.items():
             snr = ""

From 90956498ab4ed09156378f7380d66bd4f05027b8 Mon Sep 17 00:00:00 2001
From: CezaryPuchowski <puchowski.cezary@gmail.com>
Date: Sun, 1 Oct 2023 18:50:18 +0200
Subject: [PATCH 4/6] Formatted on

---
 plugins/nodes_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
index 4f1bb3c..55d088e 100644
--- a/plugins/nodes_plugin.py
+++ b/plugins/nodes_plugin.py
@@ -86,7 +86,7 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
             return False
 
         response = await self.send_matrix_message(
-            room_id=room.room_id, message=self.generate_response(), formatted=False
+            room_id=room.room_id, message=self.generate_response(), formatted=True
         )
 
         return True

From 4b7802405ddf06e60994acbd7be098bc2c8f97a8 Mon Sep 17 00:00:00 2001
From: CezaryPuchowski <puchowski.cezary@gmail.com>
Date: Sun, 1 Oct 2023 19:23:10 +0200
Subject: [PATCH 5/6] try line break in diffrent place

---
 plugins/nodes_plugin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
index 55d088e..ab4de9e 100644
--- a/plugins/nodes_plugin.py
+++ b/plugins/nodes_plugin.py
@@ -47,7 +47,7 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
 
         meshtastic_client = connect_meshtastic()
 
-        response = f">**Nodes: {len(meshtastic_client.nodes)}**"
+        response = f">**Nodes: {len(meshtastic_client.nodes)}**\n \n"
 
         for node, info in meshtastic_client.nodes.items():
             snr = ""
@@ -67,9 +67,9 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
                 if "batteryLevel" in info["deviceMetrics"]:
                     battery = f"{info['deviceMetrics']['batteryLevel']}% "
 
-            response += f"\n\n>**{info['user']['shortName']}** {info['user']['longName']}\n"\
+            response += f">**{info['user']['shortName']}** {info['user']['longName']}\n"\
                         f">{info['user']['hwModel']} {battery}{voltage}\n"\
-                        f">{snr}{last_heard}"
+                        f">{snr}{last_heard}\n \n"
 
         return response
 

From 5f0c81bdab5c41a937323fe676ddcdc07edbb47e Mon Sep 17 00:00:00 2001
From: CezaryPuchowski <puchowski.cezary@gmail.com>
Date: Sun, 1 Oct 2023 20:38:47 +0200
Subject: [PATCH 6/6] try another aproche

---
 plugins/nodes_plugin.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/nodes_plugin.py b/plugins/nodes_plugin.py
index ab4de9e..df87d04 100644
--- a/plugins/nodes_plugin.py
+++ b/plugins/nodes_plugin.py
@@ -47,7 +47,7 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
 
         meshtastic_client = connect_meshtastic()
 
-        response = f">**Nodes: {len(meshtastic_client.nodes)}**\n \n"
+        response = f">**Nodes: {len(meshtastic_client.nodes)}**\n\n"
 
         for node, info in meshtastic_client.nodes.items():
             snr = ""
@@ -67,9 +67,10 @@ $shortname $longname / $devicemodel / $battery $voltage / $snr / $lastseen
                 if "batteryLevel" in info["deviceMetrics"]:
                     battery = f"{info['deviceMetrics']['batteryLevel']}% "
 
-            response += f">**{info['user']['shortName']}** {info['user']['longName']}\n"\
-                        f">{info['user']['hwModel']} {battery}{voltage}\n"\
-                        f">{snr}{last_heard}\n \n"
+            response += f"><hr/>\n\n"\
+                        f">**{info['user']['shortName']}** {info['user']['longName']}\n\n"\
+                        f">{info['user']['hwModel']} {battery}{voltage}\n\n"\
+                        f">{snr}{last_heard}\n\n"
 
         return response