From fd115916f5f08a04a9e0c02555e385cc2488ea61 Mon Sep 17 00:00:00 2001
From: SpudGunMan <kellykeeton@yahoo.com>
Date: Thu, 30 Oct 2025 18:50:54 -0700
Subject: [PATCH] cleanup

---
 etc/simulator.py  | 6 +++---
 modules/dxspot.py | 7 +++----
 modules/rss.py    | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/etc/simulator.py b/etc/simulator.py
index f420ca6..5f7479e 100644
--- a/etc/simulator.py
+++ b/etc/simulator.py
@@ -2,7 +2,7 @@
 # # Simulate meshing-around de K7MHI 2024
 from modules.log import logger, getPrettyTime # Import the logger; ### --> If you are reading this put the script in the project root <-- ###
 import time
-import datetime
+from datetime import datetime
 import random
 
 # Initialize the tool
@@ -51,8 +51,8 @@ def example_handler(message, nodeID, deviceID):
         msg = f"Hello {get_name_from_number(nodeID)}, simulator ready for testing {projectName} project! on device {deviceID}"
         msg += f" Your location is {location}"
         msg += f" you said: {message}"
-
-
+        # Add timestamp
+        msg += f" [Time: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}]"
         return msg
 
 
diff --git a/modules/dxspot.py b/modules/dxspot.py
index 71e5990..fe2f269 100644
--- a/modules/dxspot.py
+++ b/modules/dxspot.py
@@ -2,7 +2,7 @@
 # Fetches DX spots from Spothole API based on user commands
 # 2025 K7MHI Kelly Keeton
 import requests
-import datetime
+from datetime import datetime, timedelta
 from modules.log import logger
 from modules.settings import latitudeValue, longitudeValue
 
@@ -69,7 +69,6 @@ def get_spothole_spots(source=None, band=None, mode=None, date=None, dx_call=Non
     url = "https://spothole.app/api/v1/spots"
     params = {}
     fetched_count = 0
-    
 
     # Add administrative filters if provided
     qrt = False  # Always fetch active spots
@@ -83,7 +82,7 @@ def get_spothole_spots(source=None, band=None, mode=None, date=None, dx_call=Non
     params["needs_sig"] = str(needs_sig).lower()
     params["needs_sig_ref"] = 'true'
     # Only get spots from last 9 hours
-    received_since_dt = datetime.datetime.utcnow() - datetime.timedelta(hours=9)
+    received_since_dt = datetime.utcnow() - timedelta(hours=9)
     received_since = int(received_since_dt.timestamp())
     params["received_since"] = received_since
     
@@ -170,7 +169,7 @@ def get_spothole_spots(source=None, band=None, mode=None, date=None, dx_call=Non
     return spots
 
 def handle_post_dxspot():
-    time = int(datetime.datetime.utcnow().timestamp())
+    time = int(datetime.utcnow().timestamp())
     freq = 14200000  # 14 MHz
     comment = "Test spot please ignore"
     de_spot = "N0CALL"
diff --git a/modules/rss.py b/modules/rss.py
index e182e2a..dbd035b 100644
--- a/modules/rss.py
+++ b/modules/rss.py
@@ -7,7 +7,7 @@ import html
 from html.parser import HTMLParser
 import bs4 as bs
 import requests
-import datetime
+from datetime import datetime, timedelta
 
 # Common User-Agent for all RSS requests
 COMMON_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'
@@ -146,7 +146,7 @@ def get_newsAPI(user_search="meshtastic"):
     if not user_search:
         user_search = "meshtastic"
     try:
-        last_week = datetime.datetime.now() - datetime.timedelta(days=7)
+        last_week = datetime.now() - timedelta(days=7)
         newsAPIurl = (
             f"https://newsapi.org/v2/everything?"
             f"q={user_search}&language=en&from={last_week.strftime('%Y-%m-%d')}&sortBy={newsAPIsort}shedAt&pageSize=5&apiKey={newsAPI_KEY}"