core (memory/disco): getInfos now handle node + use client instead of profile in many methods

This commit is contained in:
Goffi 2017-02-12 20:43:20 +01:00
commit 3bc851abf2

View file

@ -362,8 +362,9 @@ class XEP_0045(object):
@param jid_: entity which may have a MUC service, or None for our own server
@param profile: %(doc_profile)s
"""
client = self.host.getClient(profile)
muc_service = None
services = yield self.host.findServiceEntities("conference", "text", jid_, profile=profile)
services = yield self.host.findServiceEntities(client, "conference", "text", jid_)
for service in services:
if ".irc." not in service.userhost():
# FIXME:
@ -712,7 +713,7 @@ class XEP_0045(object):
msg = D_(u"{} is not a valid JID!".format(unparsed))
self.text_cmds.feedBack(client, msg, mess_data)
return False
d = self.host.getDiscoItems(service, profile=client.profile)
d = self.host.getDiscoItems(client, service)
d.addCallback(self._showListUI, client, service)
return False