summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-02 17:05:35 -0800
committerLance Stout <lancestout@gmail.com>2013-01-02 17:05:35 -0800
commitef76f923ad885d8faa67e88d76704cbe8253b153 (patch)
tree4fc443614e3551daad8ea174b515ca5037497c8c /sleekxmpp/plugins
parent0e2abe74d5d978ee701576d6e00eb35919dffb70 (diff)
parent2c04ae084ca2233f45776b32614b1e575db93449 (diff)
downloadslixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.tar.gz
slixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.tar.bz2
slixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.tar.xz
slixmpp-ef76f923ad885d8faa67e88d76704cbe8253b153.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0054/vcard_temp.py16
-rw-r--r--sleekxmpp/plugins/xep_0115/caps.py2
2 files changed, 14 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0054/vcard_temp.py b/sleekxmpp/plugins/xep_0054/vcard_temp.py
index 24da1c05..09acd454 100644
--- a/sleekxmpp/plugins/xep_0054/vcard_temp.py
+++ b/sleekxmpp/plugins/xep_0054/vcard_temp.py
@@ -59,10 +59,20 @@ class XEP_0054(BasePlugin):
def make_vcard(self):
return VCardTemp()
- def get_vcard(self, jid=None, ifrom=None, local=False, cached=False,
+ def get_vcard(self, jid=None, ifrom=None, local=None, cached=False,
block=True, callback=None, timeout=None):
- if self.xmpp.is_component and jid.domain == self.xmpp.boundjid.domain:
- local = True
+ if local is None:
+ if jid is not None and not isinstance(jid, JID):
+ jid = JID(jid)
+ if self.xmpp.is_component:
+ if jid.domain == self.xmpp.boundjid.domain:
+ local = True
+ else:
+ if str(jid) == str(self.xmpp.boundjid):
+ local = True
+ jid = jid.full
+ elif jid in (None, ''):
+ local = True
if local:
vcard = self.api['get_vcard'](jid, None, ifrom)
diff --git a/sleekxmpp/plugins/xep_0115/caps.py b/sleekxmpp/plugins/xep_0115/caps.py
index b7a346c0..8bad1410 100644
--- a/sleekxmpp/plugins/xep_0115/caps.py
+++ b/sleekxmpp/plugins/xep_0115/caps.py
@@ -290,7 +290,7 @@ class XEP_0115(BasePlugin):
# can just send a normal presence stanza. If we have, then
# we will send presence to each contact individually so
# that we don't clobber existing statuses.
- directed = False
+ directed = False or self.xmpp.is_component
for contact in self.xmpp.roster[jid]:
if self.xmpp.roster[jid][contact].last_status is not None:
directed = True