jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2013-01-02 17:05:35 -08:00
commit ef76f923ad
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sleekxmpp/plugins/xep_0054/vcard_temp.py
View File

@ -59,10 +59,20 @@ class XEP_0054(BasePlugin):
def make_vcard(self): def make_vcard(self):
return VCardTemp() 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): block=True, callback=None, timeout=None):
if self.xmpp.is_component and jid.domain == self.xmpp.boundjid.domain: if local is None:
local = True 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: if local:
vcard = self.api['get_vcard'](jid, None, ifrom) vcard = self.api['get_vcard'](jid, None, ifrom)

2
sleekxmpp/plugins/xep_0115/caps.py
View File

@ -290,7 +290,7 @@ class XEP_0115(BasePlugin):
# can just send a normal presence stanza. If we have, then # can just send a normal presence stanza. If we have, then
# we will send presence to each contact individually so # we will send presence to each contact individually so
# that we don't clobber existing statuses. # that we don't clobber existing statuses.
directed = False directed = False or self.xmpp.is_component
for contact in self.xmpp.roster[jid]: for contact in self.xmpp.roster[jid]:
if self.xmpp.roster[jid][contact].last_status is not None: if self.xmpp.roster[jid][contact].last_status is not None:
directed = True directed = True