Various fixes and tweaks

- Add plugin context on load
- Allow providing additional kwargs to a command context
- Commands are now stored using their base trigger instead of function
name, which allows for multiple bindings on a single function
- Use argument passing for register_listener
- Fix RedisProvider.get_many failing when its passed an empty list of
keys
- Add some utility properties on MessageReactionAdd/Remove
- Support type conversion toggling in MessageTable
- Latest holster fixes

disco/bot/bot.py

@@ -383,9 +383,10 @@ class Bot(object):
             else:
                 config = self.load_plugin_config(cls)
 
-        self.plugins[cls.__name__] = cls(self, config)
+        self.ctx['plugin'] = self.plugins[cls.__name__] = cls(self, config)
         self.plugins[cls.__name__].load(ctx or {})
         self.recompute()
+        self.ctx.drop()
 
     def rmv_plugin(self, cls):
         """

disco/bot/command.py

@@ -113,10 +113,11 @@ class Command(object):
         self.group = None
         self.is_regex = None
         self.oob = False
+        self.context = {}
 
         self.update(*args, **kwargs)
 
-    def update(self, args=None, level=None, aliases=None, group=None, is_regex=None, oob=False):
+    def update(self, args=None, level=None, aliases=None, group=None, is_regex=None, oob=False, context=None):
         self.triggers += aliases or []
 
         def resolve_role(ctx, rid):
@@ -135,6 +136,7 @@ class Command(object):
         self.group = group
         self.is_regex = is_regex
         self.oob = oob
+        self.context = context or {}
 
     @staticmethod
     def mention_type(getters, force=False):
@@ -201,4 +203,4 @@ class Command(object):
         except ArgumentError as e:
             raise CommandError(e.message)
 
-        return self.func(event, *args)
+        return self.func(event, *args, **self.context)

disco/bot/plugin.py

@@ -256,7 +256,7 @@ class Plugin(LoggingClass, PluginDeco):
 
         return True
 
-    def register_listener(self, func, what, desc, **kwargs):
+    def register_listener(self, func, what, *args, **kwargs):
         """
         Registers a listener.
 
@@ -269,12 +269,12 @@ class Plugin(LoggingClass, PluginDeco):
         desc
             The descriptor of the event/packet.
         """
-        func = functools.partial(self._dispatch, 'listener', func)
+        args = list(args) + [functools.partial(self._dispatch, 'listener', func)]
 
         if what == 'event':
-            li = self.bot.client.events.on(desc, func, **kwargs)
+            li = self.bot.client.events.on(*args, **kwargs)
         elif what == 'packet':
-            li = self.bot.client.packets.on(desc, func, **kwargs)
+            li = self.bot.client.packets.on(*args, **kwargs)
         else:
             raise Exception('Invalid listener what: {}'.format(what))
 
@@ -294,11 +294,13 @@ class Plugin(LoggingClass, PluginDeco):
             Keyword arguments to pass onto the :class:`disco.bot.command.Command`
             object.
         """
-        if kwargs.pop('update', False) and func.__name__ in self.commands:
-            self.commands[func.__name__].update(*args, **kwargs)
+        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)
-            self.commands[func.__name__] = Command(self, wrapped, *args, **kwargs)
+            self.commands[name] = Command(self, wrapped, *args, **kwargs)
 
     def register_schedule(self, func, interval, repeat=True, init=True):
         """

disco/bot/providers/redis.py

@@ -31,6 +31,10 @@ class RedisProvider(BaseProvider):
                 yield key
 
     def get_many(self, keys):
+        keys = list(keys)
+        if not len(keys):
+            raise StopIteration
+
         for key, value in izip(keys, self.conn.mget(keys)):
             yield (key, Serializer.loads(self.format, value))
 

disco/gateway/events.py

@@ -591,6 +591,14 @@ class MessageReactionAdd(GatewayEvent):
     user_id = Field(snowflake)
     emoji = Field(MessageReactionEmoji)
 
+    @property
+    def channel(self):
+        return self.client.state.channels.get(self.channel_id)
+
+    @property
+    def guild(self):
+        return self.channel.guild
+
 
 class MessageReactionRemove(GatewayEvent):
     """
@@ -611,3 +619,11 @@ class MessageReactionRemove(GatewayEvent):
     message_id = Field(snowflake)
     user_id = Field(snowflake)
     emoji = Field(MessageReactionEmoji)
+
+    @property
+    def channel(self):
+        return self.client.state.channels.get(self.channel_id)
+
+    @property
+    def guild(self):
+        return self.channel.guild

disco/types/message.py

@@ -371,7 +371,8 @@ class MessageTable(object):
         self.recalculate_size_index(args)
 
     def add(self, *args):
-        args = list(map(str, args))
+        convert = lambda v: v if isinstance(v, basestring) else str(v)
+        args = list(map(convert, args))
         self.entries.append(args)
         self.recalculate_size_index(args)
 

disco/types/permissions.py

@@ -76,13 +76,13 @@ class PermissionValue(object):
         return self.sub(other)
 
     def __getattribute__(self, name):
-        if name in Permissions.attrs:
+        if name in Permissions.keys_:
             return (self.value & Permissions[name].value) == Permissions[name].value
         else:
             return object.__getattribute__(self, name)
 
     def __setattr__(self, name, value):
-        if name not in Permissions.attrs:
+        if name not in Permissions.keys_:
             return super(PermissionValue, self).__setattr__(name, value)
 
         if value: