From 741be5cc04551bef946087384e82adf9a005a3bd Mon Sep 17 00:00:00 2001 From: JC Brand Date: Tue, 23 Apr 2019 12:32:59 +0200 Subject: [PATCH] converse-muc: Handle VCards not being available --- dist/converse.js | 2 +- src/headless/converse-muc.js | 2 +- src/headless/dist/converse-headless.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/converse.js b/dist/converse.js index c7a8b65b1..6e99b7a02 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -66787,7 +66787,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc throw new Error("Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."); } - const nick = _converse.nickname || _converse.xmppstatus.vcard.get('nickname'); + const nick = _converse.nickname || _converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined; if (nick) { return nick; diff --git a/src/headless/converse-muc.js b/src/headless/converse-muc.js index 3584d16b6..4905a4478 100644 --- a/src/headless/converse-muc.js +++ b/src/headless/converse-muc.js @@ -147,7 +147,7 @@ converse.plugins.add('converse-muc', { throw new Error( "Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."); } - const nick = _converse.nickname || _converse.xmppstatus.vcard.get('nickname'); + const nick = _converse.nickname || _converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined; if (nick) { return nick; } else if (_converse.muc_nickname_from_jid) { diff --git a/src/headless/dist/converse-headless.js b/src/headless/dist/converse-headless.js index 84695ad2a..e29579e01 100644 --- a/src/headless/dist/converse-headless.js +++ b/src/headless/dist/converse-headless.js @@ -45181,7 +45181,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc throw new Error("Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."); } - const nick = _converse.nickname || _converse.xmppstatus.vcard.get('nickname'); + const nick = _converse.nickname || _converse.vcards ? _converse.xmppstatus.vcard.get('nickname') : undefined; if (nick) { return nick;