From 9c6bb740bfed715720f03154a9e6c044e5cc0005 Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Wed, 19 Jun 2024 00:42:29 -0700
Subject: [PATCH] Update mesh-bot.py

---
 mesh-bot.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mesh-bot.py b/mesh-bot.py
index 1c199db..7bbedb4 100644
--- a/mesh-bot.py
+++ b/mesh-bot.py
@@ -129,16 +129,16 @@ def onReceive(packet, interface):
             # If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us
             if packet['to'] == myNodeNum:
                 if messageTrap(message_string):
-                    print(f"{log_timestamp()} Received DM: {message_string} on Channel: {channel_number} From: {message_from_id}")
+                    print(f"{log_timestamp()} Received DM: {message_string} on Channel: {channel_number} From: {get_name_from_number(message_from_id)}")
                     # respond with a direct message
                     send_message(auto_response(message_string,snr,rssi,hop),channel_number,message_from_id)
                 else: 
                     #respond with welcome message
-                    print(f"{log_timestamp()} Ignoring DM: {message_string} From: {message_from_id}")
+                    print(f"{log_timestamp()} Ignoring DM: {message_string} From: {get_name_from_number(message_from_id)}")
                     send_message(welcome_message,channel_number,message_from_id)
             else:
                 if messageTrap(message_string):
-                    print(f"{log_timestamp()} Received On Channel {channel_number}: {message_string} From: {message_from_id}")
+                    print(f"{log_timestamp()} Received On Channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id)}")
                     if RESPOND_BY_DM_ONLY:
                         # respond to channel message via direct message to keep the channel clean
                         send_message(auto_response(message_string,snr,rssi,hop),channel_number,message_from_id)
@@ -146,7 +146,7 @@ def onReceive(packet, interface):
                         # or respond to channel message on the channel itself
                         send_message(auto_response(message_string,snr,rssi),channel_number,0)
                 else:
-                    print(f"{log_timestamp()} System: Ignoring incoming channel {channel_number}: {message_string} From: {message_from_id}")
+                    print(f"{log_timestamp()} System: Ignoring incoming channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id)}")
                 
     except KeyError as e:
         print(f"System: Error processing packet: {e}")
@@ -212,7 +212,7 @@ def send_message(message,ch,nodeid):
         print (f"{log_timestamp()} System: Sending: {message} on Channel: {ch}")
     else:
         #Send to DM
-        print (f"{log_timestamp()} System: Sending: {message} To: {nodeid}")
+        print (f"{log_timestamp()} System: Sending: {message} To: {get_name_from_number(nodeid)}")
         interface.sendText(text=message,channelIndex=ch,destinationId=nodeid)
 
 def exit_handler(signum, frame):