Minor updates to PR #48

Changelog

@@ -5,6 +5,7 @@ Version 0.6.15     unreleased
 	* Add .python-version in preferred order to support pyenv.
 	* Use conftest.py to explicitly set the time zone for all unit tests.
 	* Add Sphinx configuration path to .readthedocs.yml.
+	* Ignore commands containing numbers or starting with channel (by @achow101).
 
 Version 0.6.14     08 Jan 2025
 

src/hcoopmeetbotlogic/command.py

@@ -273,15 +273,15 @@ def list_commands() -> List[str]:
 
 def dispatch(meeting: Meeting, context: Context, message: TrackedMessage) -> None:
     """Dispatch any command contained in the message to the dispatcher method with the matching name."""
+    if message.payload.lower().strip().startswith(meeting.channel.lower()):
+        return
     operation_match = _OPERATION_REGEX.match(message.payload)
     url_match = _URL_REGEX.match(message.payload)
     if operation_match:
         operation = operation_match.group(_OPERATION_GROUP).lower().strip()
         operand = operation_match.group(_OPERAND_GROUP).strip()
         if hasattr(_DISPATCHER, "%s%s" % (_METHOD_PREFIX, operation)):
             getattr(_DISPATCHER, "%s%s" % (_METHOD_PREFIX, operation))(meeting, context, operation, operand, message)
-        elif message.payload.lower().strip().startswith(meeting.channel.lower()):
-            return
         else:
             context.send_reply("Unknown command: #%s" % operation)
     elif url_match:

tests/test_command.py

@@ -10,7 +10,7 @@
 
 
 def run_dispatch(payload, operation, operand, method):
-    meeting = MagicMock()
+    meeting = MagicMock(channel="#channel")
     context = MagicMock()
     message = MagicMock(payload=payload)
     method.reset_mock()  # so we can test same method with different scenarios
@@ -88,7 +88,7 @@ def test_dispatch_valid_link(self, dispatcher, protocol):
     @patch("hcoopmeetbotlogic.command._DISPATCHER")
     def test_dispatch_invalid_link(self, dispatcher, protocol):
         url = "%s://whatever" % protocol
-        meeting = MagicMock()
+        meeting = MagicMock(channel="#channel")
         context = MagicMock()
         message = MagicMock(payload=url)
         dispatch(meeting, context, message)
@@ -127,7 +127,7 @@ def test_dispatch_valid_command(self, dispatcher):
     @patch("hcoopmeetbotlogic.command.hasattr")
     @patch("hcoopmeetbotlogic.command.getattr")
     def test_dispatch_invalid_command(self, _getattr, _hasattr):  # pylint: disable=redefined-builtin:
-        meeting = MagicMock(channel="chan")
+        meeting = MagicMock(channel="#channel")
         context = MagicMock()
         message = MagicMock(payload="#bogus")
         _hasattr.return_value = False
@@ -139,9 +139,7 @@ def test_dispatch_invalid_command(self, _getattr, _hasattr):  # pylint: disable=
     @patch("hcoopmeetbotlogic.command.getattr")
     def test_dispatch_non_commands(self, _getattr, _hasattr):  # pylint: disable=redefined-builtin:
         def run_ignored_dispatch(payload, channel=None):
-            if channel is None:
-                channel = "#channel"
-            meeting = MagicMock(channel=channel)
+            meeting = MagicMock(channel=channel if channel else "#channel")
             context = MagicMock()
             message = MagicMock(payload=payload)
             _hasattr.return_value = False