From 37a37fcb5739b4a1ea9afc08bbfe2baa626c35a8 Mon Sep 17 00:00:00 2001 From: Andrei Date: Fri, 7 Oct 2016 11:09:52 -0500 Subject: [PATCH] Allow passing plugin config on load, add API channel invite --- README.md | 2 +- disco/bot/bot.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 564b1b3..f11a3fa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # disco -Disco is a simple and extendable library for the [Discord API](https://discordapp.com/developers/docs/intro). +Disco is a simple and extendable library for the [Discord API](https://discordapp.com/developers/docs/intro). Join the Official channel and chat [here](https://discord.gg/XJRZSQk). - Expressive, functional interface that gets out of the way - Built for high-performance and efficiency diff --git a/disco/bot/bot.py b/disco/bot/bot.py index 7a70ceb..f8633b7 100644 --- a/disco/bot/bot.py +++ b/disco/bot/bot.py @@ -227,7 +227,7 @@ class Bot(object): self.last_message_cache[msg.channel_id] = (msg, triggered) - def add_plugin(self, cls): + def add_plugin(self, cls, config=None): """ Adds and loads a plugin, based on its class. @@ -235,11 +235,14 @@ class Bot(object): ---------- cls : subclass of :class:`disco.bot.plugin.Plugin` Plugin class to initialize and load. + config : Optional + The configuration to load the plugin with. """ if cls.__name__ in self.plugins: raise Exception('Cannot add already added plugin: {}'.format(cls.__name__)) - config = self.config.plugin_config_provider(cls.__name__) if self.config.plugin_config_provider else None + if not config and callable(self.config.plugin_config_provider): + config = self.config.plugin_config_provider(cls.__name__) self.plugins[cls.__name__] = cls(self, config) self.plugins[cls.__name__].load()