diff options
| author | Lance Stout <lancestout@gmail.com> | 2014-02-06 09:20:24 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2014-02-06 09:20:24 -0800 |
| commit | 49acdac7765498f11b79dd826742ce8570aae5d2 (patch) | |
| tree | 318b38ce41c99b47f4235c69202b93135837a092 | |
| parent | 654420e351630523d9954e98da566cfd3be4b929 (diff) | |
| parent | 7e1587faa28067b635068282acf4affe7a97e2ea (diff) | |
| download | slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.tar.gz slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.tar.bz2 slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.tar.xz slixmpp-49acdac7765498f11b79dd826742ce8570aae5d2.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
| -rw-r--r-- | sleekxmpp/plugins/xep_0045.py | 9 | ||||
| -rw-r--r-- | sleekxmpp/util/sasl/mechanisms.py | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py index 6e3f10a9..9587fa1a 100644 --- a/sleekxmpp/plugins/xep_0045.py +++ b/sleekxmpp/plugins/xep_0045.py @@ -126,6 +126,7 @@ class XEP_0045(BasePlugin): # load MUC support in presence stanzas register_stanza_plugin(Presence, MUCPresence) self.xmpp.register_handler(Callback('MUCPresence', MatchXMLMask("<presence xmlns='%s' />" % self.xmpp.default_ns), self.handle_groupchat_presence)) + self.xmpp.register_handler(Callback('MUCError', MatchXMLMask("<message xmlns='%s' type='error'><error/></message>" % self.xmpp.default_ns), self.handle_groupchat_error_message)) self.xmpp.register_handler(Callback('MUCMessage', MatchXMLMask("<message xmlns='%s' type='groupchat'><body/></message>" % self.xmpp.default_ns), self.handle_groupchat_message)) self.xmpp.register_handler(Callback('MUCSubject', MatchXMLMask("<message xmlns='%s' type='groupchat'><subject/></message>" % self.xmpp.default_ns), self.handle_groupchat_subject)) self.xmpp.register_handler(Callback('MUCConfig', MatchXMLMask("<message xmlns='%s' type='groupchat'><x xmlns='http://jabber.org/protocol/muc#user'><status/></x></message>" % self.xmpp.default_ns), self.handle_config_change)) @@ -179,6 +180,14 @@ class XEP_0045(BasePlugin): self.xmpp.event('groupchat_message', msg) self.xmpp.event("muc::%s::message" % msg['from'].bare, msg) + def handle_groupchat_error_message(self, msg): + """ Handle a message error event in a muc. + """ + self.xmpp.event('groupchat_message_error', msg) + self.xmpp.event("muc::%s::message_error" % msg['from'].bare, msg) + + + def handle_groupchat_subject(self, msg): """ Handle a message coming from a muc indicating a change of subject (or announcing it when joining the room) diff --git a/sleekxmpp/util/sasl/mechanisms.py b/sleekxmpp/util/sasl/mechanisms.py index 1eb6af83..523eabc2 100644 --- a/sleekxmpp/util/sasl/mechanisms.py +++ b/sleekxmpp/util/sasl/mechanisms.py @@ -111,7 +111,7 @@ class X_FACEBOOK_PLATFORM(Mech): b'api_key': self.credentials['api_key'] } - resp = '&'.join(['%s=%s' % (k, v) for k, v in resp_data.items()]) + resp = '&'.join(['%s=%s' % (k.decode("utf-8"), v.decode("utf-8")) for k, v in resp_data.items()]) return bytes(resp) return b'' |