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

Revert "Reject the waitUntilFeaturesDiscovered promise if query failed"

Browse Source 
This reverts commit 01f0a65209.

Updates #1410
This commit is contained in:
JC Brand 2019-02-13 15:43:09 +01:00
parent 3fe6efc2cf
commit 4c83a23382
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES.md
View File

@ -8,12 +8,13 @@
- Set releases URL to new Github repo - Set releases URL to new Github repo
- #1369 Don't wrongly interpret message with `subject` as a topic change. - #1369 Don't wrongly interpret message with `subject` as a topic change.
- #1405 Status of contacts list are not displayed properly - #1405 Status of contacts list are not displayed properly
- #1408 new config option `roomconfig_whitelist` - #1408 New config option `roomconfig_whitelist`
- #1412 muc moderator commands can be disabled selectively by config - #1410 HTTP upload not working if conversations push proxy is used
- #1413 fix moderator commands that change affiliation - #1412 MUC moderator commands can be disabled selectively by config
- #1413 Fix moderator commands that change affiliation
- #1414 Prevent duplicate messages on MUC join - #1414 Prevent duplicate messages on MUC join
- #1417 Margin between nickname and badge - #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 - #1422 Resurrect the `muc_show_join_leave` option
- #1442 MUC read receipts causing empty lines - #1442 MUC read receipts causing empty lines

2
dist/converse.js vendored
View File

@ -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); const stanza = await _converse.api.disco.info(this.get('jid'), null);
this.onInfo(stanza); this.onInfo(stanza);
} catch (iq) { } catch (iq) {
this.waitUntilFeaturesDiscovered.reject(iq); this.waitUntilFeaturesDiscovered.resolve(this);
_converse.log(iq, Strophe.LogLevel.ERROR); _converse.log(iq, Strophe.LogLevel.ERROR);
} }

4
src/headless/converse-disco.js
View File

@ -130,8 +130,8 @@ converse.plugins.add('converse-disco', {
try { try {
const stanza = await _converse.api.disco.info(this.get('jid'), null); const stanza = await _converse.api.disco.info(this.get('jid'), null);
this.onInfo(stanza); this.onInfo(stanza);
} catch (iq) { } catch(iq) {
this.waitUntilFeaturesDiscovered.reject(iq); this.waitUntilFeaturesDiscovered.resolve(this);
_converse.log(iq, Strophe.LogLevel.ERROR); _converse.log(iq, Strophe.LogLevel.ERROR);
} }
}, },