Merge branch 'xep-0030-component' into 'master'
xep_0030: small fixes for components See merge request poezio/slixmpp!236
This commit is contained in:
commit
4fa068da54
@ -457,9 +457,12 @@ class XEP_0030(BasePlugin):
|
|||||||
the XEP-0059 plugin, if the plugin is loaded.
|
the XEP-0059 plugin, if the plugin is loaded.
|
||||||
Otherwise the parameter is ignored.
|
Otherwise the parameter is ignored.
|
||||||
"""
|
"""
|
||||||
|
if ifrom is None and self.xmpp.is_component:
|
||||||
|
ifrom = self.xmpp.boundjid.bare
|
||||||
|
|
||||||
if local or local is None and jid is None:
|
if local or local is None and jid is None:
|
||||||
items = await self.api['get_items'](jid, node, ifrom, kwargs)
|
items = await self.api['get_items'](jid, node, ifrom, kwargs)
|
||||||
return self._wrap(kwargs.get('ifrom', None), jid, items)
|
return self._wrap(ifrom, jid, items)
|
||||||
|
|
||||||
iq = self.xmpp.Iq()
|
iq = self.xmpp.Iq()
|
||||||
# Check dfrom parameter for backwards compatibility
|
# Check dfrom parameter for backwards compatibility
|
||||||
|
Loading…
x
Reference in New Issue
Block a user