Преглед на файлове

Use nickname from VCard when joining a room

updates #968
JC Brand преди 7 години
родител
ревизия
e76dc01265
променени са 1 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      src/converse-muc-views.js

+ 5 - 2
src/converse-muc-views.js

@@ -110,7 +110,7 @@
 
 
                     if (!this.roomspanel.model.get('nick')) {
                     if (!this.roomspanel.model.get('nick')) {
                         this.roomspanel.model.save({
                         this.roomspanel.model.save({
-                            nick: _converse.xmppstatus.get('nickname') || Strophe.getNodeFromJid(_converse.bare_jid)
+                            nick: _converse.xmppstatus.vcard.get('nickname') || Strophe.getNodeFromJid(_converse.bare_jid)
                         });
                         });
                     }
                     }
                     _converse.emit('roomsPanelRendered');
                     _converse.emit('roomsPanelRendered');
@@ -1106,7 +1106,10 @@
                 },
                 },
 
 
                 onNickNameNotFound (message) {
                 onNickNameNotFound (message) {
-                    if (_converse.muc_nickname_from_jid) {
+                    const nick = _converse.xmppstatus.vcard.get('nickname');
+                    if (nick) {
+                        this.join(nick);
+                    } else if (_converse.muc_nickname_from_jid) {
                         // We try to enter the room with the node part of
                         // We try to enter the room with the node part of
                         // the user's JID.
                         // the user's JID.
                         this.join(this.getDefaultNickName());
                         this.join(this.getDefaultNickName());