From 9622a1e8b8293ed70fef3eaf5a80de0e73445ca8 Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Wed, 19 Jun 2024 14:21:32 -0700
Subject: [PATCH] Update mesh-bot.py

---
 mesh-bot.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/mesh-bot.py b/mesh-bot.py
index 41306af..ab394f9 100644
--- a/mesh-bot.py
+++ b/mesh-bot.py
@@ -30,7 +30,7 @@ except Exception as e:
     print(f"System: Critical Error script abort. {e}")
     exit()
 
-def auto_response(message,snr,rssi,hop):
+def auto_response(message,snr,rssi,hop,message_from_id):
     #Auto response to messages
     if "ping" in message.lower():
         #Check if the user added @foo to the message
@@ -65,12 +65,12 @@ def auto_response(message,snr,rssi,hop):
     elif "help" in message.lower():
         bot_response = help_message
     elif "sun" in message.lower():
-        suntime = get_sunrise_sunset()
+        suntime = get_sunrise_sunset(get_node_location(message_from_id))
         bot_response = "Sunrise: " + suntime[0] + "\nSunset: " + suntime[1]
     elif "hfcond" in message.lower():
         bot_response = hf_band_conditions()
     elif "solar" in message.lower():
-        bot_response = drap_xray_conditions() + "\n" + solar_conditions()
+        bot_response = drap_xray_conditions() + "\n" + solar_conditions(get_node_location)
     elif "lheard" in message.lower():
         bot_response = "Last 5 nodes heard: " + str(get_node_list())
     else:
@@ -132,20 +132,20 @@ def onReceive(packet, interface):
                 if messageTrap(message_string):
                     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)
+                    send_message(auto_response(message_string,snr,rssi,hop,message_from_id),channel_number,message_from_id)
                 else: 
                     #respond with welcome message
                     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)
+                    send_message(welcome_message,channel_number,message_from_id,message_from_id)
             else:
                 if messageTrap(message_string):
                     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)
+                        send_message(auto_response(message_string,snr,rssi,hop,message_from_id),channel_number,message_from_id)
                     else:
                         # or respond to channel message on the channel itself
-                        send_message(auto_response(message_string,snr,rssi),channel_number,0)
+                        send_message(auto_response(message_string,snr,rssi,message_from_id),channel_number,0)
                 else:
                     print(f"{log_timestamp()} System: Ignoring incoming channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id)}")
                 
@@ -205,6 +205,16 @@ def get_node_list():
     else:
         node_list.append("Nothing heard")
         return node_list
+    
+def get_node_location(number):
+    for node in interface.nodes.values():
+        if number == node['num']:
+            if 'latitudeI' in node:
+                lat = node['latitudeI']
+                lon = node['longitudeI']
+                position = (lat,lon)
+                return position
+    return "No location data"
         
 def send_message(message,ch,nodeid):
     if nodeid == 0: