From 4c83a233824735013336b0b8d11d22ac26b76a38 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Wed, 13 Feb 2019 15:43:09 +0100 Subject: [PATCH] Revert "Reject the `waitUntilFeaturesDiscovered` promise if query failed" This reverts commit 01f0a652099e717e5a3fb46cab64e064404af8c7. Updates #1410 --- CHANGES.md | 9 +++++---- dist/converse.js | 2 +- src/headless/converse-disco.js | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5e490e745..cfacaca2b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,12 +8,13 @@ - Set releases URL to new Github repo - #1369 Don't wrongly interpret message with `subject` as a topic change. - #1405 Status of contacts list are not displayed properly -- #1408 new config option `roomconfig_whitelist` -- #1412 muc moderator commands can be disabled selectively by config -- #1413 fix moderator commands that change affiliation +- #1408 New config option `roomconfig_whitelist` +- #1410 HTTP upload not working if conversations push proxy is used +- #1412 MUC moderator commands can be disabled selectively by config +- #1413 Fix moderator commands that change affiliation - #1414 Prevent duplicate messages on MUC join - #1417 Margin between nickname and badge -- #1421 fix direct invite for membersonly room +- #1421 Fix direct invite for membersonly room - #1422 Resurrect the `muc_show_join_leave` option - #1442 MUC read receipts causing empty lines diff --git a/dist/converse.js b/dist/converse.js index 1d29c0193..6bd052509 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -64551,7 +64551,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-dis const stanza = await _converse.api.disco.info(this.get('jid'), null); this.onInfo(stanza); } catch (iq) { - this.waitUntilFeaturesDiscovered.reject(iq); + this.waitUntilFeaturesDiscovered.resolve(this); _converse.log(iq, Strophe.LogLevel.ERROR); } diff --git a/src/headless/converse-disco.js b/src/headless/converse-disco.js index e87d0cbfd..132eac8b4 100644 --- a/src/headless/converse-disco.js +++ b/src/headless/converse-disco.js @@ -130,8 +130,8 @@ converse.plugins.add('converse-disco', { try { const stanza = await _converse.api.disco.info(this.get('jid'), null); this.onInfo(stanza); - } catch (iq) { - this.waitUntilFeaturesDiscovered.reject(iq); + } catch(iq) { + this.waitUntilFeaturesDiscovered.resolve(this); _converse.log(iq, Strophe.LogLevel.ERROR); } },