summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-25 01:47:26 -0700
committerLance Stout <lancestout@gmail.com>2012-07-25 01:47:26 -0700
commit16ec0f151a18030a948038aa6eca1f9f1b488928 (patch)
treefba9d3ec4bd4350a1399dc2375b0aef6b55f8fc8 /sleekxmpp
parentc42f1ad4c79863261977a9c5ea3b33be0b51b946 (diff)
parent26dc6e90eae1b9e2675194dbf0a0836561fe62a0 (diff)
downloadslixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.tar.gz
slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.tar.bz2
slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.tar.xz
slixmpp-16ec0f151a18030a948038aa6eca1f9f1b488928.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/api.py4
-rw-r--r--sleekxmpp/plugins/xep_0153/vcard_avatar.py39
-rw-r--r--sleekxmpp/xmlstream/stanzabase.py12
3 files changed, 35 insertions, 20 deletions
diff --git a/sleekxmpp/api.py b/sleekxmpp/api.py
index 4004f5b7..8de61b34 100644
--- a/sleekxmpp/api.py
+++ b/sleekxmpp/api.py
@@ -101,8 +101,10 @@ class APIRegistry(object):
if not jid:
jid = self.xmpp.boundjid
- if jid and not isinstance(jid, JID):
+ elif jid and not isinstance(jid, JID):
jid = JID(jid)
+ elif jid == JID(''):
+ jid = self.xmpp.boundjid
if node is None:
node = ''
diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/sleekxmpp/plugins/xep_0153/vcard_avatar.py
index bec792cb..d61bf571 100644
--- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py
+++ b/sleekxmpp/plugins/xep_0153/vcard_avatar.py
@@ -8,7 +8,9 @@
import hashlib
import logging
+import threading
+from sleekxmpp import JID
from sleekxmpp.stanza import Presence
from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.xmlstream.matcher import StanzaPath
@@ -30,11 +32,14 @@ class XEP_0153(BasePlugin):
def plugin_init(self):
self._hashes = {}
+ self._allow_advertising = threading.Event()
+
register_stanza_plugin(Presence, VCardTempUpdate)
self.xmpp.add_filter('out', self._update_presence)
self.xmpp.add_event_handler('session_start', self._start)
+ self.xmpp.add_event_handler('session_end', self._end)
self.xmpp.add_event_handler('presence_available', self._recv_presence)
self.xmpp.add_event_handler('presence_dnd', self._recv_presence)
@@ -44,10 +49,12 @@ class XEP_0153(BasePlugin):
self.api.register(self._set_hash, 'set_hash', default=True)
self.api.register(self._get_hash, 'get_hash', default=True)
+ self.api.register(self._reset_hash, 'reset_hash', default=True)
def plugin_end(self):
self.xmpp.del_filter('out', self._update_presence)
self.xmpp.del_event_handler('session_start', self._start)
+ self.xmpp.del_event_handler('session_end', self._end)
self.xmpp.del_event_handler('presence_available', self._recv_presence)
self.xmpp.del_event_handler('presence_dnd', self._recv_presence)
self.xmpp.del_event_handler('presence_xa', self._recv_presence)
@@ -56,15 +63,25 @@ class XEP_0153(BasePlugin):
def set_avatar(self, jid=None, avatar=None, mtype=None, block=True,
timeout=None, callback=None):
+ if jid is None:
+ jid = self.xmpp.boundjid.bare
+
vcard = self.xmpp['xep_0054'].get_vcard(jid, cached=True)
vcard = vcard['vcard_temp']
vcard['PHOTO']['TYPE'] = mtype
vcard['PHOTO']['BINVAL'] = avatar
+
self.xmpp['xep_0054'].publish_vcard(jid=jid, vcard=vcard)
- self._reset_hash(jid)
+
+ self.api['reset_hash'](jid)
+ self.xmpp.roster[jid].send_last_presence()
def _start(self, event):
- self.xmpp['xep_0054'].get_vcard()
+ vcard = self.xmpp['xep_0054'].get_vcard()
+ self._allow_advertising.set()
+
+ def _end(self, event):
+ self._allow_advertising.clear()
def _update_presence(self, stanza):
if not isinstance(stanza, Presence):
@@ -74,41 +91,35 @@ class XEP_0153(BasePlugin):
stanza['vcard_temp_update']['photo'] = current_hash
return stanza
- def _reset_hash(self, jid=None):
- if jid is None:
- jid = self.xmpp.boundjid
-
+ def _reset_hash(self, jid, node, ifrom, args):
own_jid = (jid.bare == self.xmpp.boundjid.bare)
if self.xmpp.is_component:
own_jid = (jid.domain == self.xmpp.boundjid.domain)
- if jid is not None:
- jid = jid.bare
self.api['set_hash'](jid, args=None)
if own_jid:
self.xmpp.roster[jid].send_last_presence()
- iq = self.xmpp['xep_0054'].get_vcard(
- jid=jid,
- ifrom=self.xmpp.boundjid)
+ iq = self.xmpp['xep_0054'].get_vcard(jid=jid.bare, ifrom=ifrom)
+
data = iq['vcard_temp']['PHOTO']['BINVAL']
if not data:
new_hash = ''
else:
new_hash = hashlib.sha1(data).hexdigest()
+
self.api['set_hash'](jid, args=new_hash)
- if own_jid:
- self.xmpp.roster[jid].send_last_presence()
def _recv_presence(self, pres):
if not pres.match('presence/vcard_temp_update'):
self.api['set_hash'](pres['from'], args=None)
return
+
data = pres['vcard_temp_update']['photo']
if data is None:
return
elif data == '' or data != self.api['get_hash'](pres['to']):
- self._reset_hash(pres['from'])
+ self.api['reset_hash'](pres['from'], ifrom=pres['to'])
self.xmpp.event('vcard_avatar_update', pres)
# =================================================================
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index 4af441cc..abe0abdc 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -514,8 +514,9 @@ class ElementBase(object):
:param string attrib: The :attr:`plugin_attrib` value of the
plugin to enable.
"""
- if lang is None:
- lang = self.get_lang()
+ default_lang = self.get_lang()
+ if not lang:
+ lang = default_lang
plugin_class = self.plugin_attrib_map[attrib]
@@ -528,7 +529,7 @@ class ElementBase(object):
existing_xml = self.xml.find(plugin_class.tag_name())
if existing_xml is not None:
- if existing_xml.attrib.get('{%s}lang' % XML_NS, '') != lang:
+ if existing_xml.attrib.get('{%s}lang' % XML_NS, default_lang) != lang:
existing_xml = None
plugin = plugin_class(parent=self, xml=existing_xml)
@@ -536,7 +537,8 @@ class ElementBase(object):
if plugin.is_extension:
self.plugins[(attrib, None)] = plugin
else:
- plugin['lang'] = lang
+ if lang != default_lang:
+ plugin['lang'] = lang
self.plugins[(attrib, lang)] = plugin
if plugin_class in self.plugin_iterables:
@@ -576,7 +578,7 @@ class ElementBase(object):
for plugin, stanza in self.plugins.items():
lang = stanza['lang']
if lang:
- values['%s|%s' % (plugin, lang)] = stanza.values
+ values['%s|%s' % (plugin[0], lang)] = stanza.values
else:
values[plugin[0]] = stanza.values
if self.iterables: