cleanup - various bits of cleanup

disco/bot/bot.py

@@ -64,7 +64,6 @@ class BotConfig(Config):
         The directory plugin configuration is located within.
     """
     levels = {}
-    plugins = []
 
     commands_enabled = True
     commands_require_mention = True

disco/bot/command.py

@@ -46,7 +46,10 @@ class CommandEvent(object):
         self.msg = msg
         self.match = match
         self.name = self.match.group(1)
-        self.args = [i for i in self.match.group(2).strip().split(' ') if i]
+        self.args = []
+
+        if self.match.group(2):
+            self.args = [i for i in self.match.group(2).strip().split(' ') if i]
 
     @property
     def codeblock(self):
@@ -133,13 +136,17 @@ class Command(object):
         self.is_regex = None
         self.oob = False
         self.context = {}
+        self.metadata = {}
 
         self.update(*args, **kwargs)
 
+    def __call__(self, *args, **kwargs):
+        return self.func(*args, **kwargs)
+
     def get_docstring(self):
         return (self.func.__doc__ or '').format(**self.context)
 
-    def update(self, args=None, level=None, aliases=None, group=None, is_regex=None, oob=False, context=None, dispatch_func=None):
+    def update(self, args=None, level=None, aliases=None, group=None, is_regex=None, oob=False, context=None, **kwargs):
         self.triggers += aliases or []
 
         def resolve_role(ctx, rid):
@@ -168,7 +175,7 @@ class Command(object):
         self.is_regex = is_regex
         self.oob = oob
         self.context = context or {}
-        self.dispatch_func = dispatch_func
+        self.metadata = kwargs
 
     @staticmethod
     def mention_type(getters, reg, user=False):
@@ -198,7 +205,7 @@ class Command(object):
         """
         A compiled version of this command's regex.
         """
-        return re.compile(self.regex)
+        return re.compile(self.regex, re.I)
 
     @property
     def regex(self):
@@ -238,4 +245,4 @@ class Command(object):
         except ArgumentError as e:
             raise CommandError(e.message)
 
-        return (self.dispatch_func or self.func)(event, *args, **self.context)
+        return self.plugin.dispatch('command', self, event, *args, **self.context)

disco/bot/plugin.py

@@ -244,7 +244,7 @@ class Plugin(LoggingClass, PluginDeco):
         """
         getattr(self, '_' + when)[typ].append(func)
 
-    def _dispatch(self, typ, func, event, *args, **kwargs):
+    def dispatch(self, typ, func, event, *args, **kwargs):
         # TODO: this is ugly
         if typ != 'command':
             self.greenlets.add(gevent.getcurrent())
@@ -283,7 +283,7 @@ class Plugin(LoggingClass, PluginDeco):
         desc
             The descriptor of the event/packet.
         """
-        args = list(args) + [functools.partial(self._dispatch, 'listener', func)]
+        args = list(args) + [functools.partial(self.dispatch, 'listener', func)]
 
         if what == 'event':
             li = self.bot.client.events.on(*args, **kwargs)
@@ -308,13 +308,6 @@ class Plugin(LoggingClass, PluginDeco):
             Keyword arguments to pass onto the :class:`disco.bot.command.Command`
             object.
         """
-        # name = args[0]
-
-        # if kwargs.pop('update', False) and name in self.commands:
-        #    self.commands[name].update(*args, **kwargs)
-        # else:
-        wrapped = functools.partial(self._dispatch, 'command', func)
-        kwargs.setdefault('dispatch_func', wrapped)
         self.commands.append(Command(self, func, *args, **kwargs))
 
     def register_schedule(self, func, interval, repeat=True, init=True):

disco/gateway/client.py

@@ -147,8 +147,6 @@ class GatewayClient(LoggingClass):
         raise Exception('WS recieved error: %s', error)
 
     def on_open(self):
-        self.log.info('Opened, headers: %s', self.ws.sock.headers)
-
         if self.seq and self.session_id:
             self.log.info('WS Opened: attempting resume w/ SID: %s SEQ: %s', self.session_id, self.seq)
             self.send(OPCode.RESUME, {

disco/types/base.py

@@ -34,7 +34,8 @@ class ConversionError(Exception):
 
 
 class Field(object):
-    def __init__(self, value_type, alias=None, default=None, **kwargs):
+    def __init__(self, value_type, alias=None, default=None, create=True, **kwargs):
+        # TODO: fix default bullshit
         self.src_name = alias
         self.dst_name = None
         self.metadata = kwargs
@@ -51,7 +52,7 @@ class Field(object):
 
             if isinstance(self.deserializer, Field) and self.default is None:
                 self.default = self.deserializer.default
-            elif inspect.isclass(self.deserializer) and issubclass(self.deserializer, Model) and self.default is None:
+            elif inspect.isclass(self.deserializer) and issubclass(self.deserializer, Model) and self.default is None and create:
                 self.default = self.deserializer
 
     @property