Merge branch 'main' into dev

Author: agessaman

.github/workflows/docker-build.yml

@@ -68,4 +68,4 @@ jobs:
           cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64
           # Build for both amd64 and arm64 architectures
-          # This enables the image to run on both x86_64 and ARM devices (Raspberry Pi, Orange Pi, etc.)
+          # This enables the image to run on both x86_64 and ARM devices (Raspberry Pi, Orange Pi, etc.)

config.ini.example

@@ -1133,6 +1133,7 @@ auto_start = false
 # Optional: database path for web viewer. If unset, the viewer uses [Bot] db_path (recommended).
 # Only set this if you use a separate database for the viewer; you will see a startup warning.
 # See docs/WEB_VIEWER.md for migrating from a separate database.
+# db_path = meshcore_bot.db
 
 # Additional hashtag channels to decode in the packet stream
 # The web viewer can decrypt GroupText messages from hashtag channels

modules/commands/alternatives/wx_international.py

@@ -109,8 +109,7 @@ def matches_keyword(self, message: MeshMessage) -> bool:
             content = content[1:].strip()
         content_lower = content.lower()
         for keyword in self.keywords:
-            # Match exact keyword or keyword followed by space
-            if content_lower == keyword or content_lower.startswith(keyword + ' '):
+            if content_lower.startswith(keyword + ' ') or content_lower == keyword:
                 return True
         return False
 

modules/commands/wx_command.py

@@ -149,8 +149,7 @@ def matches_keyword(self, message: MeshMessage) -> bool:
             content = content[1:].strip()
         content_lower = content.lower()
         for keyword in self.keywords:
-            # Match exact keyword or keyword followed by space
-            if content_lower == keyword or content_lower.startswith(keyword + ' '):
+            if content_lower.startswith(keyword + ' ') or content_lower == keyword:
                 return True
         return False
 

modules/web_viewer/app.py

@@ -171,6 +171,17 @@ def inject_template_vars():
                 self.logger.exception("Template context processor failed: %s", e)
                 return dict(greeter_enabled=False, feed_manager_enabled=False, bot_name='MeshCore Bot')
 
+    def _get_db_path(self):
+        """Get the database path, falling back to [Bot] db_path if [Web_Viewer] db_path is unset"""
+        # Use [Bot] db_path when [Web_Viewer] db_path is unset
+        bot_db = self.config.get('Bot', 'db_path', fallback='meshcore_bot.db')
+        if (self.config.has_section('Web_Viewer') and self.config.has_option('Web_Viewer', 'db_path')
+                and self.config.get('Web_Viewer', 'db_path', fallback='').strip()):
+            use_db = self.config.get('Web_Viewer', 'db_path').strip()
+        else:
+            use_db = bot_db
+        return str(resolve_path(use_db, self.bot_root))
+    
     def _init_databases(self):
         """Initialize database connections"""
         try: