Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

More usage of async/await

Browse Source
This commit is contained in:
JC Brand 2018-10-25 21:26:58 +02:00
parent 55fce912df
commit e3bce02975
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/converse-bookmarks.js
View File

@ -517,15 +517,12 @@ converse.plugins.add('converse-bookmarks', {
}
});
_converse.checkBookmarksSupport = function () {
return new Promise((resolve, reject) => {
Promise.all([
_converse.api.disco.getIdentity('pubsub', 'pep', _converse.bare_jid),
_converse.api.disco.supports(Strophe.NS.PUBSUB+'#publish-options', _converse.bare_jid)
]).then((args) => {
resolve(args[0] && (args[1].length || _converse.allow_public_bookmarks));
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
_converse.checkBookmarksSupport = async function () {
const args = await Promise.all([
_converse.api.disco.getIdentity('pubsub', 'pep', _converse.bare_jid),
_converse.api.disco.supports(Strophe.NS.PUBSUB+'#publish-options', _converse.bare_jid)
]);
return args[0] && (args[1].length || _converse.allow_public_bookmarks);
}
const initBookmarks = async function () {
@ -537,10 +534,8 @@ converse.plugins.add('converse-bookmarks', {
_converse.bookmarks = new _converse.Bookmarks();
_converse.bookmarksview = new _converse.BookmarksView({'model': _converse.bookmarks});
await _converse.bookmarks.fetchBookmarks();
_converse.emit('bookmarksInitialized');
} else {
_converse.emit('bookmarksInitialized');
}
_converse.emit('bookmarksInitialized');
}
u.onMultipleEvents([

4
src/converse-chatview.js
View File

@ -408,8 +408,8 @@ converse.plugins.add('converse-chatview', {
if (_.isEmpty(resources)) {
return;
}
const results = await Promise.all(_.map(_.keys(resources), (resource) =>
_converse.api.disco.supports(Strophe.NS.SPOILER, `${contact_jid}/${resource}`)
const results = await Promise.all(_.map(_.keys(resources),
resource => _converse.api.disco.supports(Strophe.NS.SPOILER, `${contact_jid}/${resource}`)
));
if (_.filter(results, 'length').length) {
const html = tpl_spoiler_button(this.model.toJSON());