A bit more

README.md

@@ -1,2 +1,11 @@
 # disco
 A Discord Python bot built to be easy to use and scale.
+
+## TODOS
+
+- rate limits
+- flesh out gateway paths (reconnect/resume)
+- flesh out API client
+- flesh out type methods
+- plugin reload
+- voice support

disco/bot/bot.py

@@ -73,8 +73,9 @@ class Bot(object):
             return False
 
         for command in self.commands:
-            if command.compiled_regex.match(content):
+            match = command.compiled_regex.match(content)
-                command.execute(msg)
+            if match:
+                command.execute(msg, match)
 
         return False
 

disco/bot/command.py

@@ -5,6 +5,13 @@ from disco.util.cache import cached_property
 ARGS_REGEX = '( (.*)$|$)'
 
 
+class CommandEvent(object):
+    def __init__(self, msg, match):
+        self.msg = msg
+        self.match = match
+        self.args = self.match.group(1).split(' ')
+
+
 class Command(object):
     def __init__(self, func, trigger, aliases=None, group=None, is_regex=False):
         self.func = func
@@ -13,8 +20,8 @@ class Command(object):
         self.group = group
         self.is_regex = is_regex
 
-    def execute(self, msg):
+    def execute(self, msg, match):
-        self.func(msg)
+        self.func(CommandEvent(msg, match))
 
     @cached_property
     def compiled_regex(self):