From 958e8a98a8916aa548ad39658fdecdd6da20bc4c Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 18 Aug 2018 21:30:56 +0100
Subject: [PATCH] Use the roster name or vCard nickname before falling back to
 vCard fullname or JID.

---
 src/converse-chatview.js        | 2 +-
 src/converse-roster.js          | 2 +-
 src/templates/chatbox_head.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index dd113dc41..82b5e53bc 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -208,8 +208,8 @@
                 render () {
                     this.el.innerHTML = tpl_chatbox_head(
                         _.extend(
-                            this.model.toJSON(),
                             this.model.vcard.toJSON(),
+                            this.model.toJSON(),
                             { '_converse': _converse,
                               'info_close': __('Close this chat box')
                             }
diff --git a/src/converse-roster.js b/src/converse-roster.js
index 9ffa14f56..41097db44 100644
--- a/src/converse-roster.js
+++ b/src/converse-roster.js
@@ -247,7 +247,7 @@
                 },
 
                 getDisplayName () {
-                    return this.vcard.get('fullname') || this.get('jid');
+                    return this.get('nickname') || this.vcard.get('nickname') || this.vcard.get('fullname') || this.get('jid');
                 },
 
                 getFullname () {
diff --git a/src/templates/chatbox_head.html b/src/templates/chatbox_head.html
index e82106fbd..322d0722b 100644
--- a/src/templates/chatbox_head.html
+++ b/src/templates/chatbox_head.html
@@ -7,7 +7,7 @@
                 {[ if (o.url) { ]}
                     <a href="{{{o.url}}}" target="_blank" rel="noopener" class="user">
                 {[ } ]}
-                        {{{ o.fullname || o.jid }}}
+                        {{{ o.nickname || o.fullname || o.jid }}}
                 {[ if (o.url) { ]}
                     </a>
                 {[ } ]}