Compare commits

..

No commits in common. "disco-tasks" and "master" have entirely different histories.

2 changed files with 4 additions and 4 deletions

View file

@ -315,13 +315,13 @@ class XEP_0030(BasePlugin):
domain = self.xmpp.boundjid.domain domain = self.xmpp.boundjid.domain
if not cached or domain not in self.domain_infos: if not cached or domain not in self.domain_infos:
infos = [asyncio.create_task(self.get_info( infos = [self.get_info(
domain, timeout=timeout, **iqkwargs))] domain, timeout=timeout, **iqkwargs)]
iq_items = await self.get_items( iq_items = await self.get_items(
domain, timeout=timeout, **iqkwargs) domain, timeout=timeout, **iqkwargs)
items = iq_items['disco_items']['items'] items = iq_items['disco_items']['items']
infos += [ infos += [
asyncio.create_task(self.get_info(item[0], timeout=timeout, **iqkwargs)) self.get_info(item[0], timeout=timeout, **iqkwargs)
for item in items] for item in items]
info_futures, _ = await asyncio.wait( info_futures, _ = await asyncio.wait(
infos, infos,

View file

@ -162,7 +162,7 @@ class XEP_0115(BasePlugin):
if pres['caps']['hash'] not in self.hashes: if pres['caps']['hash'] not in self.hashes:
try: try:
log.debug("Unknown caps hash: %s", pres['caps']['hash']) log.debug("Unknown caps hash: %s", pres['caps']['hash'])
await self.xmpp['xep_0030'].get_info(jid=pres['from'], ifrom=ifrom) self.xmpp['xep_0030'].get_info(jid=pres['from'], ifrom=ifrom)
return return
except XMPPError: except XMPPError:
return return