mmrelay 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

mmrelay/plugins/base_plugin.py

@@ -7,6 +7,11 @@ import markdown
 import schedule
 
 from mmrelay.config import get_plugin_data_dir
+from mmrelay.constants.database import (
+    DEFAULT_MAX_DATA_ROWS_PER_NODE_BASE,
+    DEFAULT_TEXT_TRUNCATION_LENGTH,
+)
+from mmrelay.constants.queue import DEFAULT_MESSAGE_DELAY
 from mmrelay.db_utils import (
     delete_plugin_data,
     get_plugin_data,
@@ -14,10 +19,14 @@ from mmrelay.db_utils import (
     store_plugin_data,
 )
 from mmrelay.log_utils import get_logger
+from mmrelay.message_queue import queue_message
 
 # Global config variable that will be set from main.py
 config = None
 
+# Track if we've already shown the deprecated warning
+_deprecated_warning_shown = False
+
 
 class BasePlugin(ABC):
     """Abstract base class for all mmrelay plugins.
@@ -43,7 +52,7 @@ class BasePlugin(ABC):
 
     # Class-level default attributes
     plugin_name = None  # Must be overridden in subclasses
-    max_data_rows_per_node = 100
+    max_data_rows_per_node = DEFAULT_MAX_DATA_ROWS_PER_NODE_BASE
     priority = 10
 
     @property
@@ -59,20 +68,16 @@ class BasePlugin(ABC):
         return ""
 
     def __init__(self, plugin_name=None) -> None:
-        """Initialize the plugin with configuration and logging.
+        """
+        Initialize the plugin instance, setting its name, logger, configuration, mapped channels, and response delay.
 
-        Args:
-            plugin_name (str, optional): Plugin name override. If not provided,
-                                       uses class-level plugin_name attribute.
+        Parameters:
+            plugin_name (str, optional): Overrides the plugin's name. If not provided, uses the class-level `plugin_name` attribute.
 
         Raises:
-            ValueError: If plugin_name is not set via parameter or class attribute
+            ValueError: If the plugin name is not set via parameter or class attribute.
 
-        Sets up:
-        - Plugin-specific logger
-        - Configuration from global config
-        - Channel mapping and validation
-        - Response delay settings
+        Loads plugin-specific configuration from the global config, validates assigned channels, and determines the response delay, enforcing a minimum of 2.0 seconds. Logs a warning if deprecated configuration options are used or if channels are not mapped.
         """
         # Allow plugin_name to be passed as a parameter for simpler initialization
         # This maintains backward compatibility while providing a cleaner API
@@ -132,26 +137,43 @@ class BasePlugin(ABC):
                 f"Plugin '{self.plugin_name}': Channels {invalid_channels} are not mapped in configuration."
             )
 
-        # Get the response delay from the meshtastic config only
-        self.response_delay = 3  # Default value
+        # Get the response delay from the meshtastic config
+        self.response_delay = DEFAULT_MESSAGE_DELAY
         if config is not None:
-            self.response_delay = config.get("meshtastic", {}).get(
-                "plugin_response_delay", self.response_delay
-            )
+            meshtastic_config = config.get("meshtastic", {})
+
+            # Check for new message_delay option first, with fallback to deprecated option
+            delay = None
+            delay_key = None
+            if "message_delay" in meshtastic_config:
+                delay = meshtastic_config["message_delay"]
+                delay_key = "message_delay"
+            elif "plugin_response_delay" in meshtastic_config:
+                delay = meshtastic_config["plugin_response_delay"]
+                delay_key = "plugin_response_delay"
+                # Show deprecated warning only once globally
+                global _deprecated_warning_shown
+                if not _deprecated_warning_shown:
+                    self.logger.warning(
+                        "Configuration option 'plugin_response_delay' is deprecated. "
+                        "Please use 'message_delay' instead. Support for 'plugin_response_delay' will be removed in a future version."
+                    )
+                    _deprecated_warning_shown = True
+
+            if delay is not None:
+                self.response_delay = delay
+                # Enforce minimum delay of 2 seconds due to firmware constraints
+                if self.response_delay < 2.0:
+                    self.logger.warning(
+                        f"{delay_key} of {self.response_delay}s is below minimum of 2.0s (firmware constraint). Using 2.0s."
+                    )
+                    self.response_delay = 2.0
 
     def start(self):
-        """Start the plugin and set up scheduled tasks if configured.
-
-        Called automatically when the plugin is loaded. Checks plugin configuration
-        for scheduling settings and sets up background jobs accordingly.
-
-        Supported schedule formats in config:
-        - schedule.hours + schedule.at: Run every N hours at specific time
-        - schedule.minutes + schedule.at: Run every N minutes at specific time
-        - schedule.hours: Run every N hours
-        - schedule.minutes: Run every N minutes
+        """
+        Starts the plugin and configures scheduled background tasks based on plugin settings.
 
-        Creates a daemon thread to run the scheduler if any schedule is configured.
+        If scheduling options are present in the plugin configuration, sets up periodic execution of the `background_job` method using the specified schedule. Runs scheduled jobs in a separate daemon thread. If no scheduling is configured, the plugin starts without background tasks.
         """
         if "schedule" not in self.config or (
             "at" not in self.config["schedule"]
@@ -224,28 +246,106 @@ class BasePlugin(ABC):
         return data
 
     def get_response_delay(self):
-        """Get the configured response delay for meshtastic messages.
+        """
+        Return the configured delay in seconds before sending a Meshtastic response.
 
-        Returns:
-            int: Delay in seconds before sending responses (default: 3)
+        The delay is determined by the `meshtastic.message_delay` configuration option, defaulting to 2.2 seconds with a minimum of 2.0 seconds. The deprecated `plugin_response_delay` option is also supported for backward compatibility.
 
-        Used to prevent message flooding and ensure proper radio etiquette.
-        Delay is configured via meshtastic.plugin_response_delay in config.
+        Returns:
+            float: The response delay in seconds.
         """
         return self.response_delay
 
-    def is_channel_enabled(self, channel, is_direct_message=False):
-        """Check if the plugin should respond on a specific channel.
+    def get_my_node_id(self):
+        """Get the relay's Meshtastic node ID.
+
+        Returns:
+            int: The relay's node ID, or None if unavailable
+
+        This method provides access to the relay's own node ID without requiring
+        plugins to call connect_meshtastic() directly. Useful for determining
+        if messages are direct messages or for other node identification needs.
+
+        The node ID is cached after first successful retrieval to avoid repeated
+        connection calls, as the relay's node ID is static during runtime.
+        """
+        if hasattr(self, "_my_node_id"):
+            return self._my_node_id
+
+        from mmrelay.meshtastic_utils import connect_meshtastic
+
+        meshtastic_client = connect_meshtastic()
+        if meshtastic_client and meshtastic_client.myInfo:
+            self._my_node_id = meshtastic_client.myInfo.my_node_num
+            return self._my_node_id
+        return None
+
+    def is_direct_message(self, packet):
+        """Check if a Meshtastic packet is a direct message to this relay.
 
         Args:
-            channel: Channel identifier to check
-            is_direct_message (bool): Whether this is a direct message
+            packet (dict): Meshtastic packet data
+
+        Returns:
+            bool: True if the packet is a direct message to this relay, False otherwise
+
+        This method encapsulates the common pattern of checking if a message
+        is addressed directly to the relay node, eliminating the need for plugins
+        to call connect_meshtastic() directly for DM detection.
+        """
+        toId = packet.get("to")
+        if toId is None:
+            return False
+
+        myId = self.get_my_node_id()
+        return toId == myId
+
+    def send_message(self, text: str, channel: int = 0, destination_id=None) -> bool:
+        """
+        Send a message to the Meshtastic network using the message queue.
+
+        Queues the specified text for broadcast or direct delivery on the given channel. Returns True if the message was successfully queued, or False if the Meshtastic client is unavailable.
+
+        Parameters:
+            text (str): The message content to send.
+            channel (int, optional): The channel index for sending the message. Defaults to 0.
+            destination_id (optional): The destination node ID for direct messages. If None, the message is broadcast.
 
         Returns:
-            bool: True if plugin should respond, False otherwise
+            bool: True if the message was queued successfully; False otherwise.
+        """
+        from mmrelay.meshtastic_utils import connect_meshtastic
+
+        meshtastic_client = connect_meshtastic()
+        if not meshtastic_client:
+            self.logger.error("No Meshtastic client available")
+            return False
+
+        description = f"Plugin {self.plugin_name}: {text[:DEFAULT_TEXT_TRUNCATION_LENGTH]}{'...' if len(text) > DEFAULT_TEXT_TRUNCATION_LENGTH else ''}"
+
+        send_kwargs = {
+            "text": text,
+            "channelIndex": channel,
+        }
+        if destination_id:
+            send_kwargs["destinationId"] = destination_id
+
+        return queue_message(
+            meshtastic_client.sendText,
+            description=description,
+            **send_kwargs,
+        )
 
-        Direct messages always return True if the plugin is active.
-        For channel messages, checks if channel is in plugin's configured channels list.
+    def is_channel_enabled(self, channel, is_direct_message=False):
+        """
+        Determine whether the plugin should respond to a message on the specified channel or direct message.
+
+        Parameters:
+            channel: The channel identifier to check.
+            is_direct_message (bool): Set to True if the message is a direct message.
+
+        Returns:
+            bool: True if the plugin should respond on the given channel or to a direct message; False otherwise.
         """
         if is_direct_message:
             return True  # Always respond to DMs if the plugin is active

mmrelay/plugins/drop_plugin.py

@@ -2,6 +2,8 @@ import re
 
 from haversine import haversine
 
+from mmrelay.constants.database import DEFAULT_DISTANCE_KM_FALLBACK, DEFAULT_RADIUS_KM
+from mmrelay.constants.formats import TEXT_MESSAGE_APP
 from mmrelay.meshtastic_utils import connect_meshtastic
 from mmrelay.plugins.base_plugin import BasePlugin
 
@@ -25,6 +27,14 @@ class Plugin(BasePlugin):
     async def handle_meshtastic_message(
         self, packet, formatted_message, longname, meshnet_name
     ):
+        """
+        Handles incoming Meshtastic packets for the drop message plugin, delivering or storing dropped messages based on packet content and node location.
+
+        When a packet is received, attempts to deliver any stored dropped messages to the sender if they are within a configured radius of the message's location and are not the original dropper. If the packet contains a properly formatted drop command, extracts the message and stores it with the sender's current location for future delivery.
+
+        Returns:
+            True if a drop command was processed and stored, False otherwise.
+        """
         meshtastic_client = connect_meshtastic()
         nodeInfo = meshtastic_client.getMyNodeInfo()
 
@@ -55,10 +65,8 @@ class Plugin(BasePlugin):
                             message["location"],
                         )
                     except (ValueError, TypeError):
-                        distance_km = 1000
-                    radius_km = (
-                        self.config["radius_km"] if "radius_km" in self.config else 5
-                    )
+                        distance_km = DEFAULT_DISTANCE_KM_FALLBACK
+                    radius_km = self.config.get("radius_km", DEFAULT_RADIUS_KM)
                     if distance_km <= radius_km:
                         target_node = packet["fromId"]
                         self.logger.debug(f"Sending dropped message to {target_node}")
@@ -76,7 +84,7 @@ class Plugin(BasePlugin):
         if (
             "decoded" in packet
             and "portnum" in packet["decoded"]
-            and packet["decoded"]["portnum"] == "TEXT_MESSAGE_APP"
+            and packet["decoded"]["portnum"] == TEXT_MESSAGE_APP
         ):
             text = packet["decoded"]["text"] if "text" in packet["decoded"] else None
             if f"!{self.plugin_name}" not in text:

mmrelay/plugins/mesh_relay_plugin.py

@@ -6,6 +6,7 @@ import re
 
 from meshtastic import mesh_pb2
 
+from mmrelay.constants.database import DEFAULT_MAX_DATA_ROWS_PER_NODE_MESH_RELAY
 from mmrelay.plugins.base_plugin import BasePlugin, config
 
 
@@ -25,21 +26,17 @@ class Plugin(BasePlugin):
     """
 
     plugin_name = "mesh_relay"
-    max_data_rows_per_node = 50
+    max_data_rows_per_node = DEFAULT_MAX_DATA_ROWS_PER_NODE_MESH_RELAY
 
     def normalize(self, dict_obj):
-        """Normalize packet data to consistent dictionary format.
+        """
+        Converts packet data in various formats (dict, JSON string, or plain string) into a normalized dictionary with raw data fields removed.
 
-        Args:
-            dict_obj: Packet data (dict, JSON string, or plain string)
+        Parameters:
+            dict_obj: Packet data as a dictionary, JSON string, or plain string.
 
         Returns:
-            dict: Normalized packet dictionary with raw data stripped
-
-        Handles various packet formats:
-        - Dict objects (passed through)
-        - JSON strings (parsed)
-        - Plain strings (wrapped in TEXT_MESSAGE_APP format)
+            A dictionary representing the normalized packet with raw fields stripped.
         """
         if not isinstance(dict_obj, dict):
             try:

mmrelay/plugins/weather_plugin.py

@@ -3,6 +3,7 @@ import asyncio
 import requests
 from meshtastic.mesh_interface import BROADCAST_NUM
 
+from mmrelay.constants.formats import TEXT_MESSAGE_APP
 from mmrelay.plugins.base_plugin import BasePlugin
 
 
@@ -122,10 +123,18 @@ class Plugin(BasePlugin):
     async def handle_meshtastic_message(
         self, packet, formatted_message, longname, meshnet_name
     ):
+        """
+        Processes incoming Meshtastic text messages and responds with a weather forecast if the plugin command is detected.
+
+        Checks if the message is a valid text message on the expected port, verifies channel and command enablement, retrieves the sender's GPS location, generates a weather forecast, and sends the response either as a direct message or broadcast depending on the message type.
+
+        Returns:
+            bool: True if the message was handled and a response was sent; False otherwise.
+        """
         if (
             "decoded" in packet
             and "portnum" in packet["decoded"]
-            and packet["decoded"]["portnum"] == "TEXT_MESSAGE_APP"
+            and packet["decoded"]["portnum"] == TEXT_MESSAGE_APP
             and "text" in packet["decoded"]
         ):
             message = packet["decoded"]["text"].strip()

mmrelay/setup_utils.py

@@ -14,6 +14,7 @@ import subprocess
 import sys
 from pathlib import Path
 
+from mmrelay.constants.database import PROGRESS_COMPLETE, PROGRESS_TOTAL_STEPS
 from mmrelay.tools import get_service_template_path
 
 
@@ -54,7 +55,11 @@ def print_service_commands():
 
 
 def wait_for_service_start():
-    """Wait for the service to start with a Rich progress indicator."""
+    """
+    Displays a progress spinner while waiting up to 10 seconds for the mmrelay service to become active.
+
+    The function checks the service status after 5 seconds and completes early if the service is detected as active.
+    """
     import time
 
     from rich.progress import Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
@@ -67,7 +72,7 @@ def wait_for_service_start():
         transient=True,
     ) as progress:
         # Add a task that will run for approximately 10 seconds
-        task = progress.add_task("Starting", total=100)
+        task = progress.add_task("Starting", total=PROGRESS_TOTAL_STEPS)
 
         # Update progress over 10 seconds
         for i in range(10):
@@ -76,7 +81,7 @@ def wait_for_service_start():
 
             # Check if service is active after 5 seconds to potentially finish early
             if i >= 5 and is_service_active():
-                progress.update(task, completed=100)
+                progress.update(task, completed=PROGRESS_COMPLETE)
                 break
 
 
@@ -372,10 +377,11 @@ def check_loginctl_available():
 
 
 def check_lingering_enabled():
-    """Check if user lingering is enabled.
+    """
+    Determine whether user lingering is enabled for the current user.
 
     Returns:
-        bool: True if lingering is enabled, False otherwise.
+        bool: True if user lingering is enabled, False otherwise.
     """
     try:
         username = os.environ.get("USER", os.environ.get("USERNAME"))
@@ -386,7 +392,8 @@ def check_lingering_enabled():
             text=True,
         )
         return result.returncode == 0 and "Linger=yes" in result.stdout
-    except Exception:
+    except Exception as e:
+        print(f"Error checking lingering status: {e}")
         return False
 
 
@@ -417,7 +424,14 @@ def enable_lingering():
 
 
 def install_service():
-    """Install or update the MMRelay user service."""
+    """
+    Install or update the MMRelay systemd user service, guiding the user through creation, updating, enabling, and starting the service as needed.
+
+    Prompts the user for confirmation before updating an existing service file, enabling user lingering, enabling the service to start at boot, and starting or restarting the service. Handles user interruptions gracefully and prints a summary of the service status and management commands upon completion.
+
+    Returns:
+        bool: True if the installation or update process completes successfully, False otherwise.
+    """
     # Check if service already exists
     existing_service = read_service_file()
     service_path = get_user_service_path()
@@ -431,11 +445,14 @@ def install_service():
 
         if update_needed:
             print(f"The service file needs to be updated: {reason}")
-            if (
-                not input("Do you want to update the service file? (y/n): ")
-                .lower()
-                .startswith("y")
-            ):
+            try:
+                user_input = input("Do you want to update the service file? (y/n): ")
+                if not user_input.lower().startswith("y"):
+                    print("Service update cancelled.")
+                    print_service_commands()
+                    return True
+            except (EOFError, KeyboardInterrupt):
+                print("\nInput cancelled. Proceeding with default behavior.")
                 print("Service update cancelled.")
                 print_service_commands()
                 return True
@@ -450,9 +467,11 @@ def install_service():
         if not create_service_file():
             return False
 
-        # Reload daemon
+        # Reload daemon (continue even if this fails)
         if not reload_daemon():
-            return False
+            print(
+                "Warning: Failed to reload systemd daemon. You may need to run 'systemctl --user daemon-reload' manually."
+            )
 
         if existing_service:
             print("Service file updated successfully")
@@ -473,13 +492,16 @@ def install_service():
             print(
                 "Lingering allows user services to run even when you're not logged in."
             )
-            if (
-                input(
+            try:
+                user_input = input(
                     "Do you want to enable lingering for your user? (requires sudo) (y/n): "
                 )
-                .lower()
-                .startswith("y")
-            ):
+                should_enable_lingering = user_input.lower().startswith("y")
+            except (EOFError, KeyboardInterrupt):
+                print("\nInput cancelled. Skipping lingering setup.")
+                should_enable_lingering = False
+
+            if should_enable_lingering:
                 enable_lingering()
 
     # Check if the service is already enabled
@@ -488,11 +510,16 @@ def install_service():
         print("The service is already enabled to start at boot.")
     else:
         print("The service is not currently enabled to start at boot.")
-        if (
-            input("Do you want to enable the service to start at boot? (y/n): ")
-            .lower()
-            .startswith("y")
-        ):
+        try:
+            user_input = input(
+                "Do you want to enable the service to start at boot? (y/n): "
+            )
+            enable_service = user_input.lower().startswith("y")
+        except (EOFError, KeyboardInterrupt):
+            print("\nInput cancelled. Skipping service enable.")
+            enable_service = False
+
+        if enable_service:
             try:
                 subprocess.run(
                     ["/usr/bin/systemctl", "--user", "enable", "mmrelay.service"],
@@ -509,7 +536,14 @@ def install_service():
     service_active = is_service_active()
     if service_active:
         print("The service is already running.")
-        if input("Do you want to restart the service? (y/n): ").lower().startswith("y"):
+        try:
+            user_input = input("Do you want to restart the service? (y/n): ")
+            restart_service = user_input.lower().startswith("y")
+        except (EOFError, KeyboardInterrupt):
+            print("\nInput cancelled. Skipping service restart.")
+            restart_service = False
+
+        if restart_service:
             try:
                 subprocess.run(
                     ["/usr/bin/systemctl", "--user", "restart", "mmrelay.service"],
@@ -526,11 +560,14 @@ def install_service():
                 print(f"Error: {e}")
     else:
         print("The service is not currently running.")
-        if (
-            input("Do you want to start the service now? (y/n): ")
-            .lower()
-            .startswith("y")
-        ):
+        try:
+            user_input = input("Do you want to start the service now? (y/n): ")
+            start_now = user_input.lower().startswith("y")
+        except (EOFError, KeyboardInterrupt):
+            print("\nInput cancelled. Skipping service start.")
+            start_now = False
+
+        if start_now:
             if start_service():
                 # Wait for the service to start
                 wait_for_service_start()

mmrelay/tools/sample_config.yaml

@@ -3,6 +3,10 @@ matrix:
   access_token: reaalllllyloooooongsecretttttcodeeeeeeforrrrbot # See: https://t2bot.io/docs/access_tokens/
   bot_user_id: "@botuser:example.matrix.org"
 
+  # Message prefix customization (Meshtastic → Matrix direction)
+  #prefix_enabled: true # Enable prefixes on messages from mesh (e.g., "[Alice/MyMesh]: message")
+  #prefix_format: "[{long}/{mesh}]: " # Default format. Variables: {long1-20}, {long}, {short}, {mesh1-20}, {mesh}
+
 matrix_rooms: # Needs at least 1 room & channel, but supports all Meshtastic channels
   - id: "#someroomalias:example.matrix.org" # Matrix room aliases & IDs supported
     meshtastic_channel: 0
@@ -15,9 +19,6 @@ meshtastic:
   serial_port: /dev/ttyUSB0 # Only used when connection is "serial"
   ble_address: AA:BB:CC:DD:EE:FF # Only used when connection is "ble" - Uses either an address or name from a `meshtastic --ble-scan`
   meshnet_name: Your Meshnet Name # This is displayed in full on Matrix, but is truncated when sent to a Meshnet
-  broadcast_enabled: true # Must be set to true to enable Matrix to Meshtastic messages
-  detection_sensor: true # Must be set to true to forward messages of Meshtastic's detection sensor module
-  plugin_response_delay: 3 # Default response delay in seconds for plugins that respond on the mesh;
   message_interactions: # Configure reactions and replies (both require message storage in database)
     reactions: false # Enable reaction relaying between platforms
     replies: false   # Enable reply relaying between platforms
@@ -29,6 +30,15 @@ meshtastic:
   #                                   # Note: BLE connections use real-time disconnection detection and skip periodic checks
   #                                   # Legacy: heartbeat_interval at meshtastic level still supported but deprecated
 
+  # Additional configuration options (commented out with defaults)
+  #broadcast_enabled: true # Must be set to true to enable Matrix to Meshtastic messages
+  #detection_sensor: true # Must be set to true to forward messages of Meshtastic's detection sensor module
+  #message_delay: 2.2 # Delay in seconds between messages sent to mesh (minimum: 2.0 due to firmware)
+
+  # Message prefix customization (Matrix → Meshtastic direction)
+  #prefix_enabled: true # Enable username prefixes on messages sent to mesh (e.g., "Alice[M]: message")
+  #prefix_format: "{display5}[M]: " # Default format. See EXTRA_CONFIGURATION.md for all variables.
+
 logging:
   level: info
   #log_to_file: true                          # Set to true to enable file logging

{mmrelay-1.1.2.dist-info → mmrelay-1.1.4.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: mmrelay
-Version: 1.1.2
+Version: 1.1.4
 Summary: Bridge between Meshtastic mesh networks and Matrix chat rooms
-Home-page: https://github.com/geoffwhittington/meshtastic-matrix-relay
+Home-page: https://github.com/jeremiah-k/meshtastic-matrix-relay
 Author: Geoff Whittington, Jeremiah K., and contributors
 Author-email: jeremiahk@gmx.com
-Project-URL: Bug Tracker, https://github.com/geoffwhittington/meshtastic-matrix-relay/issues
+Project-URL: Bug Tracker, https://github.com/jeremiah-k/meshtastic-matrix-relay/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 4 - Beta
 Classifier: Topic :: Communications
@@ -24,7 +24,7 @@ Requires-Dist: haversine==2.9.0
 Requires-Dist: schedule==1.2.2
 Requires-Dist: platformdirs==4.3.8
 Requires-Dist: py-staticmaps>=0.4.0
-Requires-Dist: rich==14.0.0
+Requires-Dist: rich==14.1.0
 Requires-Dist: setuptools==80.9.0
 Dynamic: author
 Dynamic: author-email
@@ -58,11 +58,11 @@ A powerful and easy-to-use relay between Meshtastic devices and Matrix chat room
 - ✨️ _Bidirectional replies and reactions support_ ✨️ **NEW!!**
 - ✨️ _Native Docker support_ ✨️ **NEW!!**
 
-_We would love to support [Matrix E2EE rooms](https://github.com/geoffwhittington/meshtastic-matrix-relay/issues/33), but this is currently not implemented._
+_We would love to support [Matrix E2EE rooms](https://github.com/jeremiah-k/meshtastic-matrix-relay/issues/33), but this is currently not implemented._
 
 ## Documentation
 
-Visit our [Wiki](https://github.com/geoffwhittington/meshtastic-matrix-relay/wiki) for comprehensive guides and information.
+Visit our [Wiki](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki) for comprehensive guides and information.
 
 - [Installation Instructions](docs/INSTRUCTIONS.md) - Setup and configuration guide
 
@@ -101,15 +101,13 @@ Docker provides isolated environment, easy deployment, automatic restarts, and v
 
 For detailed Docker setup instructions, see the [Docker Guide](docs/DOCKER.md).
 
-> **Note**: Docker builds currently use a temporary fork of the meshtastic library with BLE hanging fixes. PyPI releases use the upstream library. This will be resolved when the fixes are merged upstream.
-
 ---
 
 ## Windows Installer
 
 ![Windows Installer Screenshot](https://user-images.githubusercontent.com/1770544/235249050-8c79107a-50cc-4803-b989-39e58100342d.png)
 
-The latest installer is available in the [releases section](https://github.com/geoffwhittington/meshtastic-matrix-relay/releases).
+The latest installer is available in the [releases section](https://github.com/jeremiah-k/meshtastic-matrix-relay/releases).
 
 ---
 
@@ -127,7 +125,7 @@ Produce high-level details about your mesh:
 
 ![Mesh Details Screenshot](https://user-images.githubusercontent.com/1770544/235245873-1ddc773b-a4cd-4c67-b0a5-b55a29504b73.png)
 
-See the full list of [core plugins](https://github.com/geoffwhittington/meshtastic-matrix-relay/wiki/Core-Plugins).
+See the full list of [core plugins](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Core-Plugins).
 
 ### Community & Custom Plugins
 
@@ -136,9 +134,9 @@ MMRelay's plugin system allows you to extend functionality in two ways:
 - **Custom Plugins**: Create personal plugins for your own use, stored in `~/.mmrelay/plugins/custom/`
 - **Community Plugins**: Share your creations with others or use plugins developed by the community
 
-Check the [Community Plugins Development Guide](https://github.com/geoffwhittington/meshtastic-matrix-relay/wiki/Community-Plugin-Development-Guide) in our wiki to get started.
+Check the [Community Plugins Development Guide](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Community-Plugin-Development-Guide) in our wiki to get started.
 
-✨️ Visit the [Community Plugins List](https://github.com/geoffwhittington/meshtastic-matrix-relay/wiki/Community-Plugin-List)!
+✨️ Visit the [Community Plugins List](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Community-Plugin-List)!
 
 #### Install a Community Plugin
 
@@ -164,7 +162,7 @@ Plugins make it easy to extend functionality without modifying the core program.
 
 ## Getting Started with Matrix
 
-See our Wiki page [Getting Started With Matrix & MM Relay](https://github.com/geoffwhittington/meshtastic-matrix-relay/wiki/Getting-Started-With-Matrix-&-MM-Relay).
+See our Wiki page [Getting Started With Matrix & MM Relay](https://github.com/jeremiah-k/meshtastic-matrix-relay/wiki/Getting-Started-With-Matrix-&-MM-Relay).
 
 ---