From 8dc8b1d564cf87493e9c64f4326481cb8f649cbf Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Sun, 12 Jun 2022 10:25:41 +0200
Subject: [PATCH] Insert only the MUC JID when clicking an auto-complete
 suggestion

---
 src/plugins/muc-views/modals/add-muc.js    | 1 -
 src/plugins/muc-views/search.js            | 9 +++++++--
 src/plugins/muc-views/templates/add-muc.js | 2 +-
 src/shared/autocomplete/autocomplete.js    | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/plugins/muc-views/modals/add-muc.js b/src/plugins/muc-views/modals/add-muc.js
index 0756da8fc..091ac7a07 100644
--- a/src/plugins/muc-views/modals/add-muc.js
+++ b/src/plugins/muc-views/modals/add-muc.js
@@ -32,7 +32,6 @@ export default BootstrapModal.extend({
             placeholder = muc_domain ? `name@${muc_domain}` : __('name@conference.example.org');
         }
         return tpl_add_muc(Object.assign(this.model.toJSON(), {
-            '_converse': _converse,
             'label_room_address': api.settings.get('muc_domain') ? __('Groupchat name') :  __('Groupchat address'),
             'chatroom_placeholder': placeholder,
             'muc_roomid_policy_error_msg': this.muc_roomid_policy_error_msg,
diff --git a/src/plugins/muc-views/search.js b/src/plugins/muc-views/search.js
index b020e11ab..627727378 100644
--- a/src/plugins/muc-views/search.js
+++ b/src/plugins/muc-views/search.js
@@ -41,7 +41,13 @@ async function searchRooms (query) {
         return [];
     }
     const s = `result[xmlns="${Strophe.NS.MUCSEARCH}"] item`;
-    return sizzle(s, iq_result).map(i => `${i.querySelector('name')?.textContent} (${i.getAttribute('address')})`);
+    return sizzle(s, iq_result).map(i => {
+        const jid = i.getAttribute('address');
+        return {
+            'label': `${i.querySelector('name')?.textContent} (${jid})`,
+            'value': jid
+        }
+    });
 }
 
 export function getAutoCompleteList (query) {
@@ -50,4 +56,3 @@ export function getAutoCompleteList (query) {
     }
     return rooms_cache[query];
 }
-
diff --git a/src/plugins/muc-views/templates/add-muc.js b/src/plugins/muc-views/templates/add-muc.js
index 822f79d15..67871c404 100644
--- a/src/plugins/muc-views/templates/add-muc.js
+++ b/src/plugins/muc-views/templates/add-muc.js
@@ -36,7 +36,7 @@ export default (o) => {
                             <label for="chatroom">${o.label_room_address}:</label>
                             ${ (o.muc_roomid_policy_error_msg) ? html`<label class="roomid-policy-error">${o.muc_roomid_policy_error_msg}</label>` : '' }
                             <converse-autocomplete
-                                .getAutoCompleteList="${getAutoCompleteList}"
+                                .getAutoCompleteList=${getAutoCompleteList}
                                 ?autofocus=${true}
                                 min_chars="3"
                                 position="below"
diff --git a/src/shared/autocomplete/autocomplete.js b/src/shared/autocomplete/autocomplete.js
index 4241725f2..853f985ff 100644
--- a/src/shared/autocomplete/autocomplete.js
+++ b/src/shared/autocomplete/autocomplete.js
@@ -59,7 +59,6 @@ export class AutoComplete {
     }
 
     bindEvents () {
-        // Bind events
         const input = {
             "blur": () => this.close({'reason': 'blur'})
         }