diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-02-12 09:38:57 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-02-12 09:38:57 -0800 |
| commit | ec5e819b16e5326638551b80464c0c3714b3dc3c (patch) | |
| tree | 17ed422677a9bccdfc2c929861e1e5ca4ac76615 /sleekxmpp/plugins/xep_0047/ibb.py | |
| parent | 88c7c299549cbe1aeeecae9ca7f7ed18eb74a327 (diff) | |
| parent | 55e50ad9798247f1730ae51ebe39e9ebf3a643a9 (diff) | |
| download | slixmpp-ec5e819b16e5326638551b80464c0c3714b3dc3c.tar.gz slixmpp-ec5e819b16e5326638551b80464c0c3714b3dc3c.tar.bz2 slixmpp-ec5e819b16e5326638551b80464c0c3714b3dc3c.tar.xz slixmpp-ec5e819b16e5326638551b80464c0c3714b3dc3c.zip | |
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/plugins/xep_0047/ibb.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0047/ibb.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/xep_0047/ibb.py b/sleekxmpp/plugins/xep_0047/ibb.py index fb48a9b9..e341433f 100644 --- a/sleekxmpp/plugins/xep_0047/ibb.py +++ b/sleekxmpp/plugins/xep_0047/ibb.py @@ -36,6 +36,7 @@ class XEP_0047(BasePlugin): register_stanza_plugin(Iq, Open) register_stanza_plugin(Iq, Close) register_stanza_plugin(Iq, Data) + register_stanza_plugin(Message, Data) self.xmpp.register_handler(Callback( 'IBB Open', @@ -52,10 +53,16 @@ class XEP_0047(BasePlugin): StanzaPath('iq@type=set/ibb_data'), self._handle_data)) + self.xmpp.register_handler(Callback( + 'IBB Message Data', + StanzaPath('message/ibb_data'), + self._handle_data)) + def plugin_end(self): self.xmpp.remove_handler('IBB Open') self.xmpp.remove_handler('IBB Close') self.xmpp.remove_handler('IBB Data') + self.xmpp.remove_handler('IBB Message Data') self.xmpp['xep_0030'].del_feature(feature='http://jabber.org/protocol/ibb') def session_bind(self, jid): @@ -69,7 +76,7 @@ class XEP_0047(BasePlugin): return True return False - def open_stream(self, jid, block_size=4096, sid=None, window=1, + def open_stream(self, jid, block_size=4096, sid=None, window=1, use_messages=False, ifrom=None, block=True, timeout=None, callback=None): if sid is None: sid = str(uuid.uuid4()) @@ -83,7 +90,8 @@ class XEP_0047(BasePlugin): iq['ibb_open']['stanza'] = 'iq' stream = IBBytestream(self.xmpp, sid, block_size, - iq['to'], iq['from'], window) + iq['to'], iq['from'], window, + use_messages) with self._stream_lock: self.pending_streams[iq['id']] = stream @@ -139,11 +147,11 @@ class XEP_0047(BasePlugin): self.xmpp.event('ibb_stream_start', stream) - def _handle_data(self, iq): - sid = iq['ibb_data']['sid'] + def _handle_data(self, stanza): + sid = stanza['ibb_data']['sid'] stream = self.streams.get(sid, None) - if stream is not None and iq['from'] != stream.sender: - stream._recv_data(iq) + if stream is not None and stanza['from'] != stream.sender: + stream._recv_data(stanza) else: raise XMPPError('item-not-found') |