chatboxees: wait until messages are fixed before returning new chatbox

Fixes #1691

Author: jcbrand

CHANGES.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 5.0.4
+## 6.0.0 (Unreleased)
+
+- #1691 Fix `collection.chatbox is undefined` errors
+
+## 5.0.4 (Unreleased)
 
 - New config option [allow_message_corrections](https://conversejs.org/docs/html/configuration.html#allow_message_corrections)
   which, if set to `last`, limits editing of sent messages to the last message sent.

src/headless/converse-chatboxes.js

@@ -325,9 +325,9 @@ converse.plugins.add('converse-chatboxes', {
 
             initMessages () {
                 this.messages = new this.messagesCollection();
+                this.messages.chatbox = this;
                 const storage = _converse.config.get('storage');
                 this.messages.browserStorage = _converse.createStore(this.getMessagesCacheKey(), storage);
-                this.messages.chatbox = this;
                 this.listenTo(this.messages, 'change:upload', message => {
                     if (message.get('upload') === _converse.SUCCESS) {
                         _converse.api.send(this.createMessageStanza(message));
@@ -1202,7 +1202,7 @@ converse.plugins.add('converse-chatboxes', {
             /**
              * Handler method for all incoming single-user chat "message" stanzas.
              * @private
-             * @method _converse.ChatBox#onMessage
+             * @method _converse.ChatBoxes#onMessage
              * @param { XMLElement } stanza - The incoming message stanza
              */
             async onMessage (stanza) {
@@ -1337,6 +1337,7 @@ converse.plugins.add('converse-chatboxes', {
                             _converse.log(response.responseText);
                         }
                     });
+                    await chatbox.messages.fetched;
                     if (!chatbox.isValid()) {
                         chatbox.destroy();
                         return null;