Enhance bot response to include triggering packet ID for native replies

tests/test_bot_handler.py

@@ -5,6 +5,8 @@ import types
 from unittest import mock
 
 import contact.ui.default_config as config
+from contact.utilities.singleton import interface_state, ui_state
+from tests.test_support import reset_singletons
 
 
 class BotHandlerTests(unittest.TestCase):
@@ -16,6 +18,13 @@ class BotHandlerTests(unittest.TestCase):
         )
         cls.bot_handler = importlib.import_module("contact.message_handlers.bot_handler")
 
+    def setUp(self) -> None:
+        reset_singletons()
+        self.bot_handler.send_message.reset_mock()
+
+    def tearDown(self) -> None:
+        reset_singletons()
+
     def test_is_bot_message_uses_configured_catch_words(self) -> None:
         with mock.patch.object(config, "ping_bot_catch_words", "ping; test; pong"):
             self.assertTrue(self.bot_handler.is_bot_message("PING"))
@@ -26,6 +35,25 @@ class BotHandlerTests(unittest.TestCase):
         with mock.patch.object(config, "ping_bot_catch_words", " ;  ; "):
             self.assertTrue(self.bot_handler.is_bot_message("ping"))
 
+    def test_bot_response_replies_to_triggering_packet(self) -> None:
+        ui_state.bot_mode_enabled = True
+        interface_state.myNodeNum = 111
+        packet = {"id": 900, "from": 222, "decoded": {}}
+
+        with mock.patch.object(self.bot_handler.threading, "Thread") as thread:
+            self.assertTrue(self.bot_handler.bot_respond(packet, "ping", 0))
+            send_response = thread.call_args.kwargs["target"]
+            with mock.patch.object(self.bot_handler.time, "sleep"):
+                with mock.patch.dict(
+                    sys.modules,
+                    {"contact.ui.contact_ui": types.SimpleNamespace(request_ui_redraw=mock.Mock())},
+                ):
+                    send_response()
+
+        self.bot_handler.send_message.assert_called_once_with(
+            "Pong!", channel=0, reply_id=900
+        )
+
 
 if __name__ == "__main__":
     unittest.main()