From 02322cdf918f6b150cda295ff123061df488f6bb Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Thu, 2 Oct 2025 04:51:40 -0700 Subject: [PATCH] cleanup fixes per https://github.com/SpudGunMan/meshing-around/issues/192 --- config.template | 2 +- modules/games/joke.py | 1 - modules/settings.py | 2 +- modules/system.py | 10 ++++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config.template b/config.template index 013963e..639d8a7 100644 --- a/config.template +++ b/config.template @@ -154,7 +154,7 @@ lon = -123.0 # Default to metric units rather than imperial useMetric = False -# repeaterList lookup location (rbook / artsci) +# repeaterList lookup location (rbook / artsci / False) repeaterLookup = rbook # NOAA weather forecast days diff --git a/modules/games/joke.py b/modules/games/joke.py index 319d9a1..c909d56 100644 --- a/modules/games/joke.py +++ b/modules/games/joke.py @@ -144,4 +144,3 @@ def tell_joke(nodeID=0): except Exception as e: return lameJokes[nodeID % len(lameJokes)] - diff --git a/modules/settings.py b/modules/settings.py index 55fd426..fa72579 100644 --- a/modules/settings.py +++ b/modules/settings.py @@ -227,7 +227,7 @@ try: ollamaHostName = config['general'].get('ollamaHostName', 'http://localhost:11434') # default localhost llmModel = config['general'].get('ollamaModel', 'gemma3:270m') # default gemma3:270m rawLLMQuery = config['general'].getboolean('rawLLMQuery', True) #default True - llmReplyToNonCommands = config['general'].getboolean('llmReplyToNonCommands', True) + llmReplyToNonCommands = config['general'].getboolean('llmReplyToNonCommands', True) # default True dont_retry_disconnect = config['general'].getboolean('dont_retry_disconnect', False) # default False, retry on disconnect favoriteNodeList = config['general'].get('favoriteNodeList', '').split(',') enableEcho = config['general'].getboolean('enableEcho', False) # default False diff --git a/modules/system.py b/modules/system.py index 9c7fa6b..2f6a65f 100644 --- a/modules/system.py +++ b/modules/system.py @@ -65,7 +65,7 @@ if whoami_enabled: if solar_conditions_enabled: from modules.space import * # from the spudgunman/meshing-around repo trap_list = trap_list + trap_list_solarconditions # items hfcond, solar, sun, moon - help_message = help_message + ", sun, hfcond, solar, moon, howtall" + help_message = help_message + ", sun, hfcond, solar, moon" if n2yoAPIKey != "": help_message = help_message + ", satpass" else: @@ -80,7 +80,7 @@ if enableCmdHistory: if location_enabled: from modules.locationdata import * # from the spudgunman/meshing-around repo trap_list = trap_list + trap_list_location - help_message = help_message + ", whereami, wx, rlist, howfar" + help_message = help_message + ", whereami, wx, howfar" if enableGBalerts and not enableDEalerts: from modules.globalalert import * # from the spudgunman/meshing-around repo logger.warning(f"System: GB Alerts not functional at this time need to find a source API") @@ -103,6 +103,12 @@ if location_enabled: if riverListDefault != ['']: help_message = help_message + ", riverflow" + if repeater_lookup != False: + help_message = help_message + ", rlist" + + if solar_conditions_enabled: + help_message = help_message + ", howtall" + # NOAA alerts needs location module if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled or volcanoAlertBroadcastEnabled: from modules.locationdata import * # from the spudgunman/meshing-around repo