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

Merge branch 'fix-0030-get-info-ifrom' into 'master'

Browse Source 
XEP-0030: Fix usage of ifrom in get_info

See merge request poezio/slixmpp!152
This commit is contained in:
mathieui 2021-03-10 22:09:54 +01:00
commit d77eb3a7e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slixmpp/plugins/xep_0030/disco.py
View File

@ -385,30 +385,30 @@ class XEP_0030(BasePlugin):
elif jid in (None, ''): elif jid in (None, ''):
local = True local = True
ifrom = kwargs.pop('ifrom', None)
if local: if local:
log.debug("Looking up local disco#info data " log.debug("Looking up local disco#info data "
"for %s, node %s.", jid, node) "for %s, node %s.", jid, node)
info = await self.api['get_info']( info = await self.api['get_info'](
jid, node, kwargs.get('ifrom', None), jid, node, ifrom,
kwargs kwargs
) )
info = self._fix_default_info(info) info = self._fix_default_info(info)
return self._wrap(kwargs.get('ifrom', None), jid, info) return self._wrap(ifrom, jid, info)
if cached: if cached:
log.debug("Looking up cached disco#info data " log.debug("Looking up cached disco#info data "
"for %s, node %s.", jid, node) "for %s, node %s.", jid, node)
info = await self.api['get_cached_info']( info = await self.api['get_cached_info'](
jid, node, jid, node, ifrom,
kwargs.get('ifrom', None),
kwargs kwargs
) )
if info is not None: if info is not None:
return self._wrap(kwargs.get('ifrom', None), jid, info) return self._wrap(ifrom, jid, info)
iq = self.xmpp.Iq() iq = self.xmpp.Iq()
# Check dfrom parameter for backwards compatibility # Check dfrom parameter for backwards compatibility
iq['from'] = kwargs.get('ifrom', kwargs.get('dfrom', '')) iq['from'] = ifrom or kwargs.get('dfrom', '')
iq['to'] = jid iq['to'] = jid
iq['type'] = 'get' iq['type'] = 'get'
iq['disco_info']['node'] = node if node else '' iq['disco_info']['node'] = node if node else ''