Commit c9b54028 authored by JC Brand's avatar JC Brand

Use async/await

parent 267d91a4
This diff is collapsed.
...@@ -15,16 +15,13 @@ ...@@ -15,16 +15,13 @@
} }
utils.waitUntil = waitUntilPromise.default; utils.waitUntil = waitUntilPromise.default;
utils.waitUntilDiscoConfirmed = function (_converse, entity_jid, identities, features, items, type) { utils.waitUntilDiscoConfirmed = async function (_converse, entity_jid, identities, features, items, type='info') {
if (_.isNil(type)) { const iq = await utils.waitUntil(() => {
type = 'info';
}
return utils.waitUntil(() => {
return _.filter( return _.filter(
_converse.connection.IQ_stanzas, _converse.connection.IQ_stanzas,
(iq) => sizzle(`iq[to="${entity_jid}"] query[xmlns="http://jabber.org/protocol/disco#${type}"]`, iq.nodeTree).length (iq) => sizzle(`iq[to="${entity_jid}"] query[xmlns="http://jabber.org/protocol/disco#${type}"]`, iq.nodeTree).length
).pop(); ).pop();
}, 300).then(iq => { }, 300);
const stanza = $iq({ const stanza = $iq({
'type': 'result', 'type': 'result',
'from': entity_jid, 'from': entity_jid,
...@@ -42,7 +39,6 @@ ...@@ -42,7 +39,6 @@
stanza.c('item', {'jid': item}).up(); stanza.c('item', {'jid': item}).up();
}); });
_converse.connection._dataRecv(utils.createRequest(stanza)); _converse.connection._dataRecv(utils.createRequest(stanza));
}).catch(_.partial(console.error, _));
} }
utils.createRequest = function (iq) { utils.createRequest = function (iq) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment