chat-router: Move ping handler from matrix-router

services/chat-router/hive/chat_router/handlers/ping.py

@@ -0,0 +1,84 @@
+import logging
+import re
+
+from typing import Optional
+
+from hive.messaging import Channel
+from hive.chat import ChatMessage, tell_user
+
+from ..handler import Handler
+
+logger = logging.getLogger(__name__)
+d = logger.info
+
+
+class PingHandler(Handler):
+    def handle(self, channel: Channel, message: ChatMessage) -> bool:
+        challenge = message.text
+        if not challenge:
+            return False
+
+        response = self.response_for_challenge(challenge)
+        if not response:
+            return False
+
+        d("Challenge: %r: Response: %r", challenge, response)
+        tell_user(response, in_reply_to=message, channel=channel)
+
+        return True
+
+    STATIC_RESPONSES = {
+        "ping": "pong",
+        "pong": "ping",
+        "bonjour": "salop",
+        "salop": "bonjour",
+        "hello": "hi",
+        "hi": "hello",
+    }
+
+    @classmethod
+    def response_for_challenge(cls, challenge: str) -> Optional[str]:
+        user_input = challenge.strip()
+        cased_challenge = cls._the_one_word(user_input)
+        if not cased_challenge:
+            return None
+
+        lower_challenge = cased_challenge.lower()
+        lower_response = cls.STATIC_RESPONSES.get(lower_challenge)
+        if not lower_response:
+            return None
+
+        extra_cased = f"{lower_challenge[0]}{cased_challenge[1:]}"
+        cased_challenge = list(cased_challenge)
+        while len(cased_challenge) < len(lower_response):
+            cased_challenge.extend(extra_cased)
+        while len(cased_challenge) > len(lower_response):
+            cased_challenge.pop(2)
+        assert len(lower_response) == len(cased_challenge)
+
+        response = [
+            b.upper() if a.isupper() else b
+            for a, b in zip(cased_challenge, lower_response)
+        ]
+
+        if (x := sum(1 for c in user_input if c == "!")):
+            response.append("!" * x)  # match num excls in user input
+        elif len(user_input) > len(lower_challenge):
+            response.append("!")  # there was punctuation
+        elif not lower_challenge[1:] in user_input:
+            response.append("!")  # uppercase after first letter
+
+        return "".join(response)
+
+    @staticmethod
+    def _the_one_word(s: str) -> Optional[str]:
+        words = re.finditer(r"\w+", s)
+        try:
+            first_match = next(words)
+        except StopIteration:
+            return None
+        try:
+            _ = next(words)
+            return None
+        except StopIteration:
+            return first_match.group(0)

services/chat-router/tests/test_ping.py

@@ -0,0 +1,28 @@
+import pytest
+
+from hive.chat_router.handlers.ping import PingHandler
+
+
+@pytest.mark.parametrize(
+    "challenge,want_out",
+    (("", None),
+     ("He'ershingenmosiken", None),
+     ("ping", "pong"),
+     ("ping!", "pong!"),
+     ("PiNG", "PoNG!"),
+     ("pINg!", "pONg!"),
+     ("Bonjour", "Salop"),
+     ("boNJOUr", "saLOp!"),
+     ("boNJOUr!", "saLOp!"),
+     ("hello", "hi"),
+     ("helLO", "hi!"),
+     ("sALoP", "bOnJOuR!"),
+     ("Hi", "Hello"),
+     ("hi!", "hello!"),
+     ("Hello?", "Hi!"),
+     (" Hello ? ", "Hi!"),
+     ("HeLlo?", "Hi!"),
+     (" ponG ", "pinG!"),
+     ))
+def test_responses(challenge, want_out):
+    assert PingHandler.response_for_challenge(challenge) == want_out

services/matrix-router/hive/matrix_router/router.py

@@ -3,7 +3,6 @@
 from hive.messaging import Channel
 
 from .event import MatrixEvent
-from .ping_pong import response_for_challenge, route_response_for_challenge
 from .reading_list import is_reading_list_update, route_reading_list_update
 
 logger = logging.getLogger(__name__)
@@ -28,9 +27,6 @@ def _on_room_message(self, channel: Channel, event: MatrixEvent):
                 raise NotImplementedError(unhandled_type)
 
     def _on_text_message(self, channel: Channel, event: MatrixEvent):
-        if (response := response_for_challenge(event.body)):
-            route_response_for_challenge(channel, response)
-            return
         if is_reading_list_update(event):
             route_reading_list_update(channel, event)
             return

services/matrix-router/tests/test_router.py

@@ -59,34 +59,3 @@ def test_reading_list_update(channel, body):
         },
         "routing_key": "readinglist.update.requests",
     }]
-
-
-@pytest.mark.parametrize(
-    "challenge,expect_response",
-    (("ping", "pong"),
-     ("Hello?", "Hi!"),
-     (" Hello ? ", "Hi!"),
-     ("HeLlo?", "Hi!"),
-     (" pinG ", "ponG!"),
-     ))
-def test_challenge_response(channel, challenge, expect_response):
-    router = Router()
-    router.on_matrix_event(channel, MatrixEvent({
-        "source": {
-            "type": "m.room.message",
-            "content": {
-                "msgtype": "m.text",
-                "body": challenge,
-            },
-            "event_id": "$26RqwJMLw-yds1GAH_QxjHRC1Da9oasK0e5VLnck_45",
-            "origin_server_ts": 1730071727043,
-            "sender": "@neo:matrix.org",
-        },
-    }))
-    assert channel.published_requests == [{
-        "message": {
-            "format": "text",
-            "messages": [expect_response],
-        },
-        "routing_key": "matrix.message.send.requests",
-    }]