mirror of
https://github.com/agessaman/meshcore-bot.git
synced 2026-11-11 07:07:16 +00:00
refactor: restore behavior the branch had changed (codex review)
A codex review of the branch found seven places where earlier refactor commits changed behavior. Each is restored here with a test: - base_service imported flood_scope relatively; the local-service loader also runs that file as local_services.base_service, where the import cannot resolve. Now absolute. - Radio-health fields were initialized after commands and services were built, so a plugin constructor reading is_radio_offline raised. They are now set before any plugin. - Removing the per-command can_execute overrides made 31 commands honor skip_channel_check, which their overrides had dropped. BaseCommand.honors_skip_channel_check (False on exactly those commands) keeps them enforcing their channel list. - CommandManager.get_plugin_metadata, WxCommand.get_weather_for_zipcode and PluginLoader.validate_plugin were public compatibility entry points; they are back. - feed_manager stopped exporting DEFAULT_MAX_FEED_RESPONSE_BYTES and DEFAULT_MAX_PARSED_FEED_ITEMS despite the commit saying it re-exported them; it does now. - wx and gwx logged companion-location lookup failures at WARNING; the shared helper logged at debug. It now takes the level. - The INFO 'MESSAGE ROUTING' / 'DIRECT MESSAGE' lines for pubkey-correlated DMs were removed with the dead path_info computation; they are logged again by a log-only helper.
This commit is contained in:
1 parent
adedfa6c9e
commit
efe074b151
47 files changed
+277
-17
No files matched your search
+8
-3
@@ -628,8 +628,13 @@ def get_config_default_lat_lon(bot: Any, section: str) -> Optional[tuple[float,
|
||||
return None
|
||||
|
||||
|
||||
def get_companion_lat_lon(bot: Any, message: Any, logger: Any = None) -> Optional[tuple[float, float]]:
|
||||
"""The sender's most recent advertised position from contact tracking, or None."""
|
||||
def get_companion_lat_lon(
|
||||
bot: Any, message: Any, logger: Any = None, error_level: str = "debug"
|
||||
) -> Optional[tuple[float, float]]:
|
||||
"""The sender's most recent advertised position from contact tracking, or None.
|
||||
|
||||
A lookup error is logged on ``logger`` at ``error_level`` and returns None.
|
||||
"""
|
||||
try:
|
||||
sender_pubkey = getattr(message, "sender_pubkey", None)
|
||||
if not sender_pubkey or not hasattr(bot, "db_manager"):
|
||||
@@ -649,7 +654,7 @@ def get_companion_lat_lon(bot: Any, message: Any, logger: Any = None) -> Optiona
|
||||
return (float(row["latitude"]), float(row["longitude"]))
|
||||
except Exception as e:
|
||||
if logger is not None:
|
||||
logger.debug(f"Error getting companion location: {e}")
|
||||
getattr(logger, error_level)(f"Error getting companion location: {e}")
|
||||
return None
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user