From 9b00214dd3efaa2a809fb046ebf31e58af17a9df Mon Sep 17 00:00:00 2001
From: Dylan Hackworth <dhpf@pm.me>
Date: Sun, 29 Mar 2020 17:04:10 -0500
Subject: [PATCH] Command names instead of numbers

---
 modules/cmd.py | 110 ++++++++++++++++++++++++++++---------------------
 1 file changed, 63 insertions(+), 47 deletions(-)

diff --git a/modules/cmd.py b/modules/cmd.py
index a250395..dd431fd 100644
--- a/modules/cmd.py
+++ b/modules/cmd.py
@@ -6,59 +6,62 @@ import shlex
 class MatrixModule(BotModule):
     def __init__(self, name):
         super().__init__(name)
-        self.commands = []
+        self.commands = {}
 
     async def matrix_message(self, bot, room, event):
         args = shlex.split(event.body)
         args.pop(0)
-        if len(args) >= 2:
-            # Get full command without using quotation marks
-            command = f"{args[1]}"
-            for part_of_command in args[2:]:
-                command += f" {part_of_command}"
-
-        if len(args) == 2:
-            if args[0] == 'run':
-                bot.must_be_owner(event)
-                out = self.run_command(args[1], event.sender, room.display_name)
-                await self.send_output(bot, room, out)
-            if args[0] == 'remove':
-                bot.must_be_owner(event)
-                command_number = int(args[1])
-                if self.commands[command_number] is not None:
-                    await bot.send_text(room, f'Removed "{self.commands[command_number]}"')
-                    self.commands.pop(command_number)
-                    bot.save_settings()
-                else:
-                    await bot.send_text(room, f'Could not find command #{command_number}')
-        elif len(args) == 3:
-            if args[0] == 'add':
-                bot.must_be_owner(event)
-                self.commands.append(command)
+        # Message body possibilities:
+        #   ["run", "echo", "Hello", "world"]
+        if args[0] == 'run':
+            command_body = MatrixModule.stitch(args[1:])
+            bot.must_be_owner(event)
+            out = self.run_command(command_body, event.sender, room.display_name)
+            await self.send_output(bot, room, out)
+        # Message body possibilities:
+        #   ["remove", "command_name"]
+        elif args[0] == 'remove':
+            command_name = args[1]
+            bot.must_be_owner(event)
+            if command_name in self.commands:
+                await bot.send_text(room, f'Removed "{self.commands[command_name]}"')
+                del self.commands[command_name]
                 bot.save_settings()
-                await bot.send_text(room, 'Command added.')
-        elif len(args) == 1:
-            if args[0] == 'list':
-                if len(self.commands) == 0:
-                    await bot.send_text(room, "No known commands")
-                else:
-                    list_commands = ""
-                    i = 0
-                    for command_name in self.commands:
-                        list_commands += f"\n - {i}. \"{command_name}\""
-                        i += 1
-                    await bot.send_text(room, 'Known commands: ' + list_commands)
             else:
-                command_number = int(args[0])
-                target_command = self.commands[command_number]
-                if target_command is not None:
-                    self.logger.debug(
-                        f"room: {room.display_name} sender: {event.sender} wants to run cmd {target_command}"
-                    )
-                    out = self.run_command(target_command, event.sender, room.display_name)
-                    await self.send_output(bot, room, out)
-                else:
-                    await bot.send_text(room, 'Unknown command.')
+                await bot.send_text(room, f'Could not find command "{command_name}"')
+        # Message body possibilities:
+        #   ["add", "command_name", "echo", "Hello", "world"]
+        elif args[0] == 'add':
+            command_name = args[1]
+            command_body = MatrixModule.stitch(args[2:])
+            bot.must_be_owner(event)
+            self.commands[command_name] = command_body
+            bot.save_settings()
+            await bot.send_text(room, f'Added "{command_name}" -> "{command_body}".')
+        # Message body possibilities:
+        #   ["list"]
+        elif args[0] == 'list':
+            if len(self.commands) == 0:
+                await bot.send_text(room, "No known commands")
+            else:
+                known_commands = "Known commands:\n"
+                for command_name in self.commands.keys():
+                    command_body = self.commands[command_name]
+                    known_commands += f' - "{command_name}" -> "{command_body}"\n'
+                await bot.send_text(room, known_commands)
+        # Message body possibilities:
+        #   ["command_name"]
+        else:
+            command_name = args[0]
+            if command_name in self.commands:
+                target_command = self.commands[command_name]
+                self.logger.debug(
+                    f"room: {room.display_name} sender: {event.sender} wants to run cmd {target_command}"
+                )
+                out = self.run_command(target_command, event.sender, room.display_name)
+                await self.send_output(bot, room, out)
+            else:
+                await bot.send_text(room, 'Unknown command.')
 
     def help(self):
         return 'Runs shell commands'
@@ -73,6 +76,19 @@ class MatrixModule(BotModule):
         if data.get('commands'):
             self.commands = data['commands']
 
+    @staticmethod
+    def stitch(body: list) -> str:
+        """
+        This is used for stitching arguments again
+        Examples:
+            ["echo", "Hello", "world"] -> "echo Hello world"
+        Args:
+            body: str[]
+
+        Returns: str
+        """
+        return " ".join(body)
+
     def run_command(self, command, user, roomname):
         self.logger.info(f"Running command {command}..")
         environment = {'MATRIX_USER': user, 'MATRIX_ROOM': roomname}