Allow loading multiple plugins per module, set more context

disco/bot/bot.py

@@ -418,12 +418,14 @@ class Bot(object):
         """
 
         mod = importlib.import_module(path)
+        loaded = False
 
         for entry in map(lambda i: getattr(mod, i), dir(mod)):
             if inspect.isclass(entry) and issubclass(entry, Plugin) and not entry == Plugin:
+                loaded = True
                 self.add_plugin(entry, config)
-                break
-        else:
+
+        if not loaded:
             raise Exception('Could not find any plugins to load within module {}'.format(path))
 
     def load_plugin_config(self, cls):

disco/bot/plugin.py

@@ -193,11 +193,6 @@ class Plugin(LoggingClass, PluginDeco):
         """
         Executes a CommandEvent this plugin owns
         """
-        self.ctx['plugin'] = self
-        self.ctx['guild'] = event.guild
-        self.ctx['channel'] = event.channel
-        self.ctx['user'] = event.author
-
         try:
             return event.command.execute(event)
         except CommandError as e:
@@ -213,6 +208,15 @@ class Plugin(LoggingClass, PluginDeco):
         getattr(self, '_' + when)[typ].append(func)
 
     def _dispatch(self, typ, func, event, *args, **kwargs):
+        self.ctx['plugin'] = self
+
+        if hasattr(event, 'guild'):
+            self.ctx['guild'] = event.guild
+        if hasattr(event, 'channel'):
+            self.ctx['channel'] = event.channel
+        if hasattr(event, 'author'):
+            self.ctx['user'] = event.author
+
         for pre in self._pre[typ]:
             event = pre(event, args, kwargs)