diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-27 10:45:52 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-27 10:45:52 -0700 |
| commit | c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce (patch) | |
| tree | 88b7dabe06edbbfeb45403c06628230c18301458 /sleekxmpp/plugins/xep_0050 | |
| parent | c9b2cf60431f415584c1d12a7855e0d2ac148ec4 (diff) | |
| parent | e3fab66dfb27abdd8aa28a8d15367a490d4b42dd (diff) | |
| download | slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.gz slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.bz2 slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.tar.xz slixmpp-c2189b4ecd6b022ed9900a6f411bd7e9d57c47ce.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0050')
| -rw-r--r-- | sleekxmpp/plugins/xep_0050/adhoc.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py index a833221a..032b987a 100644 --- a/sleekxmpp/plugins/xep_0050/adhoc.py +++ b/sleekxmpp/plugins/xep_0050/adhoc.py @@ -82,12 +82,18 @@ class XEP_0050(BasePlugin): description = 'XEP-0050: Ad-Hoc Commands' dependencies = set(['xep_0030', 'xep_0004']) stanza = stanza + default_config = { + 'threaded': True, + 'session_db': None + } def plugin_init(self): """Start the XEP-0050 plugin.""" - self.threaded = self.config.get('threaded', True) + self.sessions = self.session_db + if self.sessions is None: + self.sessions = {} + self.commands = {} - self.sessions = self.config.get('session_db', {}) self.xmpp.register_handler( Callback("Ad-Hoc Execute", |