core (memory/disco): getInfos now handle node + use client instead of profile in many methods
This commit is contained in:
parent
a205ff4e90
commit
3bc851abf2
1 changed files with 69 additions and 60 deletions
|
|
@ -66,7 +66,7 @@ class XEP_0115(object):
|
|||
client.caps_optimize = None
|
||||
|
||||
if XEP_0115.cap_hash is None:
|
||||
disco_d.addCallback(lambda dummy: self.host.hasFeature(NS_CAPS_OPTIMIZE, profile=profile))
|
||||
disco_d.addCallback(lambda dummy: self.host.hasFeature(client, NS_CAPS_OPTIMIZE))
|
||||
def updateOptimize(optimize):
|
||||
client.caps_optimize = optimize
|
||||
if optimize:
|
||||
|
|
@ -163,6 +163,6 @@ class XEP_0115_handler(XMPPHandler):
|
|||
msg = failure.value.condition if hasattr(failure.value, 'condition') else failure.getErrorMessage()
|
||||
log.error(_(u"Couldn't retrieve disco info for {jid}: {error}").format(jid=from_jid.full(), error=msg))
|
||||
|
||||
d = self.host.getDiscoInfos(from_jid, self.profile)
|
||||
d = self.host.getDiscoInfos(self.parent, from_jid)
|
||||
d.addCallbacks(cb, eb)
|
||||
# TODO: me must manage the full algorithm described at XEP-0115 #5.4 part 3
|
||||
|
|
|
|||
Loading…
Reference in a new issue