Merge pull request #15 from agessaman/dev

v0.6

Author: agessaman

.gitignore

@@ -121,6 +121,8 @@ Thumbs.db
 *.log
 config.ini
 *.db
+*.db-wal
+*.db-shm
 mctomqtt.py
 bot_cli.py
 bot_start_time.txt

README.md

@@ -99,7 +99,7 @@ startup_advert = flood            # Send advert on startup
 # Format: keyword = response_template
 # Variables: {sender}, {connection_info}, {snr}, {timestamp}, {path}
 test = "Message received from {sender} | {connection_info}"
-help = "Bot Help: test, ping, help, hello, cmd, wx, aqi, sun, moon, solar, hfcond, satpass, dice, roll, joke, dadjoke, sports, channels, path, prefix, repeater, stats"
+help = "Bot Help: test, ping, help, hello, cmd, wx, aqi, sun, moon, solar, hfcond, satpass, dice, roll, joke, dadjoke, sports, channels, path, prefix, repeater, stats, alert"
 ```
 
 ### Channels
@@ -117,6 +117,16 @@ n2yo_api_key =                    # Satellite pass data
 airnow_api_key =                  # Air quality data
 ```
 
+### Alert Command
+```ini
+[Alert_Command]
+alert_enabled = true                    # Enable/disable alert command
+max_incident_age_hours = 24             # Maximum age for incidents (hours)
+max_distance_km = 20.0                  # Maximum distance for proximity queries (km)
+agency.city.<city_name> = <agency_ids>   # City-specific agency IDs (e.g., agency.city.seattle = 17D20,17M15)
+agency.county.<county_name> = <agency_ids> # County-specific agency IDs (aggregates all city agencies)
+```
+
 ### Logging
 ```ini
 [Logging]
@@ -139,43 +149,68 @@ python meshcore_bot.py
 The bot responds to these commands:
 
 **Basic Commands:**
-- `test` - Test message response
+- `test` or `t` - Test message response (can include optional phrase: `test <phrase>`)
 - `ping` - Ping/pong response
-- `help` - Show available commands
-- `hello` - Greeting response
-- `cmd` - List available commands
+- `help` - Show available commands (use `help <command>` for command details)
+- `hello` - Greeting response (also responds to: hi, hey, howdy, greetings, etc.)
+- `cmd` - List available commands in compact format
 
 **Information Commands:**
-- `wx <location>` - Weather information
-- `aqi <location>` - Air quality index
+- `channels` - List hashtag channels (use `channels` for general, `channels list` for all categories, `channels <category>` for specific categories, `channels #channel` for specific channel info)
+- `wx <zipcode>` - Weather information for US zip code (also: `weather`, `wxa`, `wxalert`)
+- `gwx <location>` - Global weather for any location worldwide (also: `globalweather`, `gwxa`)
+- `aqi <location>` - Air quality index (usage: `aqi seattle`, `aqi greenwood`, `aqi vancouver canada`, `aqi 47.6,-122.3`, or `aqi help`)
 - `sun` - Sunrise/sunset times
 - `moon` - Moon phase and times
-- `solar` - Solar conditions
+- `solar` - Solar conditions and HF band status
+- `solarforecast` or `sf` - Solar panel production forecast (usage: `sf <location|repeater_name|coordinates|zipcode> [panel_size] [azimuth, 0=south] [angle]`)
 - `hfcond` - HF band conditions
 - `satpass <NORAD>` - Satellite pass information (default: radio passes, all passes above horizon)
 - `satpass <NORAD> visual` - Visual passes only (must be visually observable)
 - `satpass <shortcut>` - Use shortcuts like `iss`, `hst`, `hubble`, `goes18`, `tiangong`
 
+**Emergency Commands:**
+- `alert <city|zipcode|street city|lat,lon|county> [all]` - Get active emergency incidents (e.g., `alert seattle`, `alert 98101`, `alert seattle all`)
+
 **Gaming Commands:**
 - `dice` - Roll dice (d6 by default, or specify like `dice d20`, `dice 2d6`)
 - `roll` - Roll random number (1-100 by default, or specify like `roll 50`)
 
 **Entertainment Commands:**
-- `joke` - Get a random joke
+- `joke` - Get a random joke (use `joke [category]` for specific category)
 - `dadjoke` - Get a dad joke from icanhazdadjoke.com
+- `hacker` - Responds to Linux commands (`sudo`, `ps aux`, `grep`, `ls -l`, etc.) with supervillain mainframe errors
 
 **Sports Commands:**
 - `sports` - Get scores for default teams
 - `sports <team>` - Get scores for specific team
 - `sports <league>` - Get scores for league (nfl, mlb, nba, etc.)
 
-**MeshCore Network Commands:**
-- `channels` - List hashtag channels
-- `path` - Decode message routing path
-- `prefix <XX>` - Look up repeaters by prefix
-- `repeater` - Manage repeater contacts and scan for new ones (DM only)
-- `stats` - Show bot usage statistics
-- `advert` - Send network advert (DM only)
+**MeshCore Utility Commands:**
+- `path` or `decode` or `route` - Decode message routing path
+- `prefix <XX>` - Look up repeaters by two-character prefix (e.g., `prefix 1A`)
+  - `prefix refresh` - Refresh prefix cache
+  - `prefix free` or `prefix available` - Show available prefixes
+  - `prefix <XX> all` - Include all repeaters (not just active)
+- `stats` - Show bot usage statistics for past 24 hours
+  - `stats messages` - Message statistics
+  - `stats channels` - Channel statistics
+  - `stats paths` - Path statistics
+- `multitest` or `mt` - Listens for 6 seconds and collects all unique paths from incoming messages
+
+**Management Commands (DM only):**
+- `repeater` or `repeaters` or `rp` - Manage repeater contacts (DM only, requires ACL permissions)
+  - `repeater scan` - Scan and catalog new repeaters
+  - `repeater list` - List repeater contacts (use `--all` to show purged ones)
+  - `repeater purge <days>` - Purge repeaters older than specified days
+  - `repeater purge <name>` - Purge specific repeater by name
+  - `repeater purge all` - Purge all repeaters
+  - `repeater restore <name>` - Restore a previously purged repeater
+  - `repeater stats` - Show repeater management statistics
+  - `repeater status` - Show contact list status and limits
+  - `repeater manage` - Auto-manage contact list (use `--dry-run` to preview)
+  - See `help repeater` for full list of subcommands
+- `advert` - Send network flood advert (DM only, 1hr cooldown)
 
 ## Message Response Templates
 
@@ -192,7 +227,7 @@ Example:
 [Keywords]
 test = "Message received from {sender} | {connection_info}"
 ping = "Pong!"
-help = "Bot Help: test, ping, help, hello, cmd, wx, aqi, sun, moon, solar, hfcond, satpass, dice, roll, joke, dadjoke, sports, channels, path, prefix, repeater, stats"
+help = "Bot Help: test, ping, help, hello, cmd, wx, gwx, aqi, sun, moon, solar, solarforecast, hfcond, satpass, dice, roll, joke, dadjoke, sports, channels, path, prefix, repeater, stats, multitest, alert, webviewer"
 ```
 
 ## Hardware Setup

com.meshcore.bot.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.meshcore.bot</string>
+    
+    <key>ProgramArguments</key>
+    <array>
+        <string>/usr/local/meshcore-bot/venv/bin/python</string>
+        <string>/usr/local/meshcore-bot/meshcore_bot.py</string>
+    </array>
+    
+    <key>WorkingDirectory</key>
+    <string>/usr/local/meshcore-bot</string>
+    
+    <key>RunAtLoad</key>
+    <true/>
+    
+    <key>KeepAlive</key>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    
+    <key>StandardOutPath</key>
+    <string>/usr/local/var/log/meshcore-bot/meshcore-bot.log</string>
+    
+    <key>StandardErrorPath</key>
+    <string>/usr/local/var/log/meshcore-bot/meshcore-bot.error.log</string>
+    
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PYTHONPATH</key>
+        <string>/usr/local/meshcore-bot</string>
+        <key>PYTHONUNBUFFERED</key>
+        <string>1</string>
+    </dict>
+    
+    <key>ThrottleInterval</key>
+    <integer>10</integer>
+    
+    <key>ProcessType</key>
+    <string>Background</string>
+    
+    <key>Nice</key>
+    <integer>1</integer>
+</dict>
+</plist>
+

config.ini.example

@@ -85,6 +85,29 @@ bot_latitude = 40.7128
 # Example: -74.0060 for New York City, -123.00 for Victoria BC
 bot_longitude = -74.0060
 
+# Maximum number of channels to fetch from MeshCore node
+# MeshCore supports up to 40 channels (default: 40)
+# Set to a lower value if you want to limit channel fetching for performance
+max_channels = 12
+
+# Interval-based advertising settings
+# Send periodic flood adverts at specified intervals
+# 0: Disabled (default)
+# >0: Send flood advert every N hours
+advert_interval_hours = 0
+
+# Send startup advert when bot finishes initializing
+# false: No startup advert (default)
+# zero-hop: Send local broadcast advert
+# flood: Send network-wide flood advert
+startup_advert = false
+
+# Auto-manage contact list when new contacts are discovered
+# device: Device handles auto-addition using standard auto-discovery mode, bot manages contact list capacity (purge old contacts when near limits)
+# bot: Bot automatically adds new companion contacts to device, bot manages contact list capacity (purge old contacts when near limits)
+# false: Manual mode - no automatic actions, use !repeater commands to manage contacts (default)
+auto_manage_contacts = false
+
 [Localization]
 # Language code for bot responses (en, es, es-MX, es-ES, fr, de, ja, etc.)
 # Default: en (English)
@@ -166,24 +189,6 @@ dadjoke_enabled = true
 # true: Split long jokes into multiple messages
 long_jokes = false
 
-# Send startup advert when bot finishes initializing
-# false: No startup advert (default)
-# zero-hop: Send local broadcast advert
-# flood: Send network-wide flood advert
-startup_advert = false
-
-# Auto-manage contact list when new contacts are discovered
-# device: Device handles auto-addition using standard auto-discovery mode, bot manages contact list capacity (purge old contacts when near limits)
-# bot: Bot automatically adds new companion contacts to device, bot manages contact list capacity (purge old contacts when near limits)
-# false: Manual mode - no automatic actions, use !repeater commands to manage contacts (default)
-auto_manage_contacts = false
-
-# Interval-based advertising settings
-# Send periodic flood adverts at specified intervals
-# 0: Disabled (default)
-# >0: Send flood advert every N hours
-advert_interval_hours = 0
-
 [Keywords]
 # Keyword-response pairs (keyword = response format)
 # Available fields: {sender}, {connection_info}, {snr}, {timestamp}, {path}, {path_distance}, {firstlast_distance}
@@ -198,7 +203,7 @@ advert_interval_hours = 0
 test = "ack @[{sender}]{phrase_part} | {connection_info} | Received at: {timestamp}"
 ping = "Pong!"
 pong = "Ping!"
-help = "Bot Help: test (or t), ping, help, hello, cmd, advert, @string, wx, aqi, sun, moon, solar, hfcond, satpass, prefix, path, sports, dice, roll, stats | Use 'help <command>' for details"
+help = "Bot Help: test (or t), ping, help, hello, cmd, advert, @string, wx, aqi, sun, moon, solar, hfcond, satpass, prefix, path, sports, dice, roll, stats | More: 'help <command>'"
 cmd = "Available commands: test (or t), ping, help, hello, cmd, advert, @string, wx, aqi, sun, moon, solar, hfcond, satpass, prefix, path, sports, dice, roll, stats"
 
 [Channels]
@@ -249,6 +254,73 @@ colored_output = true
 # Options: DEBUG, INFO, WARNING, ERROR, CRITICAL
 meshcore_log_level = INFO
 
+[Greeter_Command]
+# Enable or disable the greeter command
+# true: Bot will greet users on their first public channel message
+# false: Greeter is disabled
+enabled = false
+
+# Channels where greetings should occur (comma-separated)
+# IMPORTANT: Leave commented out (or omit entirely) to use global monitor_channels (default behavior)
+# If uncommented with empty value (channels = ), command will be DM-only
+# Comma-separated list to restrict to specific channels (only greeter command works there)
+# Example: channels = general,welcome,newbies
+# If not specified, uses the channels from [Channels] monitor_channels setting
+# channels = 
+
+# Greeting message template (default for all channels)
+# Available fields: {sender} - the user's name/ID
+# For multi-part greetings, separate messages with pipe (|)
+# Example (single): "Welcome to the mesh, @[{sender}]!"
+# Example (multi-part): "Welcome to the mesh, @[{sender}]!|This is a great place to chat.|Use !help for commands."
+greeting_message = Welcome to the mesh, @[{sender}]!
+
+# Channel-specific greeting messages (optional)
+# Format: channel_name:greeting_message,channel_name2:greeting_message2
+# If a channel has a specific greeting, it will be used instead of the default greeting_message
+# Example: Public:Welcome to Public channel, @[{sender}]!|general:Welcome to general, @[{sender}]!
+# Multi-part greetings are supported per channel using pipe (|) separator
+# Leave empty to use greeting_message for all channels
+channel_greetings = 
+
+# Per-channel greetings (tracking behavior)
+# false: Greet each user only once globally (default - user gets one greeting total)
+# true: Greet each user once per channel (user can be greeted on each channel separately)
+# Note: This controls tracking, not the greeting message itself. Use channel_greetings for different messages.
+per_channel_greetings = false
+
+# Include mesh network information in greeting
+# true: Add mesh statistics to greeting (total contacts, repeaters, etc.)
+# false: Only send the greeting message
+include_mesh_info = true
+
+# Mesh info format template
+# Available fields: {total_contacts}, {repeaters}, {companions}, {recent_activity_24h}
+# Example: "\n\nMesh Info: {total_contacts} contacts, {repeaters} repeaters"
+# Note: Mesh info is appended to the last greeting message part
+mesh_info_format = \n\nMesh Info: {total_contacts} contacts, {repeaters} repeaters, {recent_activity_24h} active in last 24h
+
+# Rollout period in days
+# When greeter is first enabled on an active mesh, this sets how many days
+# to listen and mark all active users as already greeted before beginning
+# to greet new users. This prevents greeting everyone on an established mesh.
+# Set to 0 to disable rollout (will greet all new users immediately)
+# Note: Use auto_backfill to mark historical users and shorten/eliminate rollout period
+rollout_days = 7
+
+# Auto-backfill from historical message_stats data
+# true: Automatically mark all users who have posted on public channels in the past
+# false: Only mark users during rollout period (default)
+# This allows shortening or eliminating the rollout period by using existing data
+auto_backfill = false
+
+# Backfill lookback period in days
+# Number of days to look back when auto-backfilling (0 = all time)
+# Only used if auto_backfill = true
+# Example: 30 = only mark users who posted in last 30 days
+# Example: 0 = mark all users who have ever posted (all time)
+backfill_lookback_days = 30
+
 [Custom_Syntax]
 # Custom syntax patterns for special message formats
 # Format: pattern = "response_format"
@@ -419,9 +491,12 @@ sports_enabled = true
 # Comma-separated list of team names (use lowercase)
 teams = seahawks,mariners,sounders,kraken
 
-# Channels where sports command is allowed (leave empty for all channels)
-# Comma-separated list of channel names
-channels = general,#bot,#sounders,#seahawks
+# Channels where sports command is allowed
+# IMPORTANT: Leave commented out (or omit entirely) to use global monitor_channels (default behavior)
+# If uncommented with empty value (channels = ), command will be DM-only
+# Comma-separated list to restrict to specific channels (only sports command works there)
+# Example: channels = #sounders,#seahawks (only sports command works in these channels)
+# channels = general,#bot,#sounders,#seahawks
 
 # Channel overrides for sports command
 # Format: channel_name = default_team
@@ -488,6 +563,13 @@ max_proximity_range = 200
 # Set to 0 to disable age filtering
 max_repeater_age_days = 14
 
+# Star bias multiplier for path command
+# When a contact is starred in the web viewer, multiply its selection score by this value
+# Higher values = stronger preference for starred repeaters
+# Default: 2.5 (starred repeaters get 2.5x their normal score)
+# Set to 1.0 to disable star bias
+star_bias_multiplier = 2.5
+
 # Recency vs Proximity weighting (0.0 to 1.0)
 # Controls how much recency (when last heard) vs proximity (distance) matters
 # 0.0 = 100% proximity (only distance matters)
@@ -517,6 +599,39 @@ enable_p_shortcut = false
 # false: Hacker command is disabled
 hacker_enabled = false
 
+[Multitest_Command]
+# Response format for multitest command results
+# Available fields: {sender}, {path_count}, {paths}, {listening_duration}
+# {sender}: Name/ID of message sender
+# {path_count}: Number of unique paths found
+# {paths}: Newline-separated list of paths
+# {listening_duration}: Listening window duration in seconds
+# Leave empty to use default format
+# Example: "Found {path_count} unique path(s) for @[{sender}]:\n{paths}"
+response_format = 
+
+[Alert_Command]
+# Enable or disable the alert command
+# true: Alert command is available
+# false: Alert command is disabled
+alert_enabled = false
+
+# PulsePoint agency IDs by county/region
+# Format: agency.<county_name> = comma-separated agency IDs
+# Get agency IDs from: https://web.pulsepoint.org/ or PulsePoint searchagencies API
+# You can use any naming convention that makes sense for your region
+# Examples: agency.county1, agency.city1, agency.region1, etc.
+
+# Example: County agencies
+# agency.county1 = 
+
+# Example: City agencies (can have multiple entries for the same region)
+# agency.city1 = 
+# agency.city1_alias = 
+
+# Example: Combined region (all counties/agencies)
+# agency.region_all = 
+
 [Web_Viewer]
 # Enable or disable the web data viewer
 # true: web viewer is available for viewing bot data