From 7333df0b861465dd27e6a4478ebde2457ed8d9b3 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Mon, 28 Dec 2020 14:44:40 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Change=20the=20interface=20of=20?=
 =?UTF-8?q?Command?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 royalnet/engineer/command.py | 56 ++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/royalnet/engineer/command.py b/royalnet/engineer/command.py
index 36d3bdb9..33c8ebc3 100644
--- a/royalnet/engineer/command.py
+++ b/royalnet/engineer/command.py
@@ -31,8 +31,9 @@ class Command:
                  prefix: str,
                  name: str,
                  syntax: str,
+                 conversation: t.Conversation,
                  *,
-                 pattern: str = r"^{prefix}{name} {syntax}",
+                 pattern: str = r"^{prefix}{name} ?{syntax}",
                  doc: str = ""):
         self.prefix: str = prefix
         """
@@ -63,31 +64,48 @@ class Command:
         A string explaining how this command should be used. Useful for command lists or help commands.
         """
 
-    def __call__(self, f):
+        self.conversation: t.Conversation = conversation
         """
-        The decorator interface of the command.
+        The conversation to run when this command is called.
         """
-        log.debug("Making function {f} a teleporter...")
-        teleported: t.Callable = teleporter.teleport(is_async=True, validate_output=False)(f)
 
-        @functools.wraps(teleported)
-        async def decorated(_msg: bullet.Message, **original_kwargs) -> t.Optional[t.Conversation]:
-            log.debug("Getting message text...")
-            text: str = await _msg.text()
+    @classmethod
+    def new(cls,
+            prefix: str,
+            name: str,
+            syntax: str,
+            *,
+            pattern: str = r"^{prefix}{name} {syntax}",
+            doc: str = ""):
+        """
+        Create a new :class:`.Command` using the decorated function as :attr:`.conversation`.
+        :return: The created :class:`.Command`.
+        """
+        def decorator(f):
+            log.debug(f"Making function {f} a teleporter...")
+            teleporter_f = teleporter.teleport(is_async=True, validate_output=False)(f)
 
-            log.debug(f"Matching text {text} to {self.pattern}...")
-            match: re.Match = self.pattern.search(text)
+            log.debug(f"Creating command: {prefix} {name} {syntax} - {doc}")
+            return cls(prefix=prefix, name=name, syntax=syntax, conversation=teleporter_f, pattern=pattern, doc=doc)
+        return decorator
 
-            if match is None:
-                log.debug(f"Pattern didn't match, returning...")
-                return
+    async def run(self, _text: str, **original_kwargs) -> t.Optional[t.Conversation]:
+        """
+        Run the command.
 
-            log.debug(f"Pattern matched, getting named groups...")
-            match_kwargs: dict = match.groupdict()
+        :param _text: The text of the message that was received.
+        """
+        log.debug(f"Matching text {_text} to {self.pattern}...")
+        match: re.Match = self.pattern.search(_text)
+        if match is None:
+            log.debug(f"Pattern didn't match, returning...")
+            return
 
-            log.debug(f"Running teleported function with args: {match_kwargs}")
-            return await teleported(_msg=_msg, **original_kwargs, **match_kwargs)
-        return decorated
+        log.debug(f"Pattern matched, getting named groups...")
+        match_kwargs: dict = match.groupdict()
+
+        log.debug(f"Running teleported function with args: {match_kwargs}")
+        return await self.conversation(**original_kwargs, **match_kwargs)
 
 
 __all__ = (