mirror of
https://github.com/agessaman/meshcore-bot.git
synced 2026-07-03 12:51:37 +00:00
agessaman
24fdfb2370
- Enhanced `CommandManager` to persist normalized message content, preventing prefix stripping from interfering with command matching. - Updated `BaseCommand` to skip prefix handling if already normalized, ensuring all commands can be matched correctly. - Modified `HelpCommand` to ensure unused commands are listed even when command statistics are present, improving user accessibility to all commands. - Added unit tests to verify the correct behavior of command matching and help command functionality under various scenarios.
70 lines
3.0 KiB
Python
70 lines
3.0 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Data models for the MeshCore Bot
|
|
Contains shared data structures used across modules
|
|
"""
|
|
|
|
from dataclasses import dataclass
|
|
from typing import Any, Optional
|
|
|
|
# Firmware reserves extra bytes for regional (non-global) TC_FLOOD scope on channel text.
|
|
CHANNEL_REGIONAL_FLOOD_SCOPE_BODY_OVERHEAD = 10
|
|
|
|
|
|
@dataclass
|
|
class MeshMessage:
|
|
"""Simplified message structure for our bot"""
|
|
content: str
|
|
sender_id: Optional[str] = None
|
|
sender_pubkey: Optional[str] = None
|
|
channel: Optional[str] = None
|
|
hops: Optional[int] = None
|
|
path: Optional[str] = None
|
|
is_dm: bool = False
|
|
timestamp: Optional[int] = None
|
|
snr: Optional[float] = None
|
|
rssi: Optional[int] = None
|
|
elapsed: Optional[str] = None
|
|
# When set from RF routing: path_nodes, path_hex, bytes_per_hop, path_length, route_type, etc.
|
|
routing_info: Optional[dict[str, Any]] = None
|
|
# Matched flood scope for the reply (e.g. "#west"), None means global flood
|
|
reply_scope: Optional[str] = None
|
|
# Lowercased content set by base_command.cleanup_message_for_matching
|
|
content_lower: str = ""
|
|
# Transient flag: True once CommandManager.check_keywords has stripped the
|
|
# configured command prefix (and legacy "!") from content. Prevents per-command
|
|
# cleanup_message_for_matching from re-stripping/re-rejecting an already-normalized
|
|
# message, which previously broke matching for all-but-the-first command.
|
|
prefix_normalized: bool = False
|
|
|
|
def effective_outgoing_flood_scope(self, bot: Any) -> str:
|
|
"""Resolve outbound flood scope the same way as ``CommandManager.send_channel_message``.
|
|
|
|
For channel replies: ``reply_scope`` when set, else per-channel
|
|
``[Channels] flood_scope.<channel>``, else ``[Channels] outgoing_flood_scope_override``.
|
|
Empty string means global flood. DMs return ``""`` (not applicable).
|
|
"""
|
|
if self.is_dm:
|
|
return ""
|
|
if self.reply_scope is not None:
|
|
return (self.reply_scope or "").strip()
|
|
if self.channel and bot.config.has_section("Channels"):
|
|
channel_key = self.channel.strip().removeprefix("#").lower()
|
|
for key, value in bot.config.items("Channels"):
|
|
if not key.startswith("flood_scope."):
|
|
continue
|
|
configured_channel = key[len("flood_scope."):].strip().removeprefix("#").lower()
|
|
if configured_channel == channel_key:
|
|
return (value or "").strip()
|
|
scope_cfg = ""
|
|
if bot.config.has_section("Channels") and bot.config.has_option(
|
|
"Channels", "outgoing_flood_scope_override"
|
|
):
|
|
scope_cfg = (bot.config.get("Channels", "outgoing_flood_scope_override") or "").strip()
|
|
return scope_cfg
|
|
|
|
@staticmethod
|
|
def is_global_flood_scope(scope: str) -> bool:
|
|
"""Match ``send_channel_message`` global markers (before ``_normalize_scope_name``)."""
|
|
return scope in ("", "*", "0", "None") or scope.lower() == "none"
|