Fetch messages in MUC model

spec/http-file-upload.js

@@ -8,8 +8,8 @@
     const Strophe = converse.env.Strophe;
     const $iq = converse.env.$iq;
     const _ = converse.env._;
+    const sizzle = converse.env.sizzle;
     const u = converse.env.utils;
-    const f = converse.env.f;
 
     describe("XEP-0363: HTTP File Upload", function () {
 
@@ -366,6 +366,11 @@
                         await test_utils.waitUntilDiscoConfirmed(_converse, _converse.domain, [], [], ['upload.montague.tld'], 'items');
                         await test_utils.waitUntilDiscoConfirmed(_converse, 'upload.montague.tld', [], [Strophe.NS.HTTPUPLOAD], []);
                         await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'localhost', 'dummy');
+
+                        // Wait until MAM query has been sent out
+                        const sent_stanzas = _converse.connection.sent_stanzas;
+                        await test_utils.waitUntil(() => sent_stanzas.filter(s => sizzle(`[xmlns="${Strophe.NS.MAM}"]`, s).length).pop());
+
                         const view = _converse.chatboxviews.get('lounge@localhost');
                         const file = {
                             'type': 'image/jpeg',

spec/mam.js

@@ -9,6 +9,7 @@
     const $msg = converse.env.$msg;
     const dayjs = converse.env.dayjs;
     const u = converse.env.utils;
+    const sizzle = converse.env.sizzle;
     // See: https://xmpp.org/rfcs/rfc3921.html
 
     describe("Message Archive Management", function () {
@@ -215,18 +216,17 @@
                     null, [], {},
                     async function (done, _converse) {
 
-                await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'nicky', [Strophe.NS.MAM]);
-                let sent_stanza, IQ_id;
-                const sendIQ = _converse.connection.sendIQ;
-                spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
-                    sent_stanza = iq;
-                    IQ_id = sendIQ.bind(this)(iq, callback, errback);
-                });
-                _converse.api.archive.query({'with': 'coven@chat.shakespeare.lit', 'groupchat': true});
-                await test_utils.waitUntil(() => sent_stanza);
-                const queryid = sent_stanza.nodeTree.querySelector('query').getAttribute('queryid');
-                expect(sent_stanza.toString()).toBe(
-                    `<iq id="${IQ_id}" to="coven@chat.shakespeare.lit" type="set" xmlns="jabber:client">`+
+                const room_jid = 'coven@chat.shakespeare.lit';
+                _converse.api.archive.query({'with': room_jid, 'groupchat': true});
+                await test_utils.waitUntilDiscoConfirmed(_converse, room_jid, null, [Strophe.NS.MAM]);
+
+                const sent_stanzas = _converse.connection.sent_stanzas;
+                const stanza = await test_utils.waitUntil(
+                    () => sent_stanzas.filter(s => sizzle(`[xmlns="${Strophe.NS.MAM}"]`, s).length).pop());
+
+                const queryid = stanza.querySelector('query').getAttribute('queryid');
+                expect(Strophe.serialize(stanza)).toBe(
+                    `<iq id="${stanza.getAttribute('id')}" to="coven@chat.shakespeare.lit" type="set" xmlns="jabber:client">`+
                         `<query queryid="${queryid}" xmlns="urn:xmpp:mam:2">`+
                             `<x type="submit" xmlns="jabber:x:data">`+
                                 `<field type="hidden" var="FORM_TYPE">`+
@@ -243,16 +243,15 @@
                     null, [], {},
                     async function (done, _converse) {
 
-                await test_utils.openAndEnterChatRoom(_converse, 'coven', 'chat.shakespeare.lit', 'nicky', [Strophe.NS.MAM]);
-                let sent_stanza, IQ_id;
-                const sendIQ = _converse.connection.sendIQ;
-                spyOn(_converse.connection, 'sendIQ').and.callFake(function (iq, callback, errback) {
-                    sent_stanza = iq;
-                    IQ_id = sendIQ.bind(this)(iq, callback, errback);
-                });
-                const promise = _converse.api.archive.query({'with': 'coven@chat.shakespear.lit', 'groupchat': true, 'max':'10'});
-                await test_utils.waitUntil(() => sent_stanza);
-                const queryid = sent_stanza.nodeTree.querySelector('query').getAttribute('queryid');
+                const room_jid = 'coven@chat.shakespeare.lit';
+                const promise = _converse.api.archive.query({'with': room_jid, 'groupchat': true, 'max':'10'});
+
+                await test_utils.waitUntilDiscoConfirmed(_converse, room_jid, null, [Strophe.NS.MAM]);
+
+                const sent_stanzas = _converse.connection.sent_stanzas;
+                const sent_stanza = await test_utils.waitUntil(
+                    () => sent_stanzas.filter(s => sizzle(`[xmlns="${Strophe.NS.MAM}"]`, s).length).pop());
+                const queryid = sent_stanza.querySelector('query').getAttribute('queryid');
 
                 /* <message id='iasd207' from='coven@chat.shakespeare.lit' to='hag66@shakespeare.lit/pda'>
                  *     <result xmlns='urn:xmpp:mam:2' queryid='g27' id='34482-21985-73620'>
@@ -297,7 +296,7 @@
                  *     </set>
                  * </iq>
                  */
-                const stanza = $iq({'type': 'result', 'id': IQ_id})
+                const stanza = $iq({'type': 'result', 'id': sent_stanza.getAttribute('id')})
                     .c('fin', {'xmlns': 'urn:xmpp:mam:2'})
                         .c('set',  {'xmlns': 'http://jabber.org/protocol/rsm'})
                             .c('first', {'index': '0'}).t('23452-4534-1').up()

spec/messages.js

@@ -2633,8 +2633,9 @@
                     <origin-id xmlns="urn:xmpp:sid:0" id="CE08D448-5ED8-4B6A-BB5B-07ED9DFE4FF0"/>
                 </message>`);
             spyOn(_converse.api, "trigger").and.callThrough();
+            spyOn(view.model, "isReceipt").and.callThrough();
             _converse.connection._dataRecv(test_utils.createRequest(stanza));
-            await test_utils.waitUntil(() => _converse.api.trigger.calls.count() === 1);
+            await test_utils.waitUntil(() => view.model.isReceipt.calls.count() === 1);
             expect(view.el.querySelectorAll('.chat-msg').length).toBe(1);
             expect(view.el.querySelectorAll('.chat-msg__receipt').length).toBe(0);
             expect(_converse.api.trigger).toHaveBeenCalledWith('message', jasmine.any(Object));
@@ -2667,12 +2668,11 @@
                          from="lounge@localhost/some1" type="groupchat" xmlns="jabber:client">
                     <received xmlns="urn:xmpp:chat-markers:0" id="${msg_obj.get('msgid')}"/>
                 </message>`);
-            spyOn(_converse.api, "trigger").and.callThrough();
+            spyOn(view.model, "isChatMarker").and.callThrough();
             _converse.connection._dataRecv(test_utils.createRequest(stanza));
-            await test_utils.waitUntil(() => _converse.api.trigger.calls.count() === 1);
+            await test_utils.waitUntil(() => view.model.isChatMarker.calls.count() === 1);
             expect(view.el.querySelectorAll('.chat-msg').length).toBe(1);
             expect(view.el.querySelectorAll('.chat-msg__receipt').length).toBe(0);
-            expect(_converse.api.trigger).toHaveBeenCalledWith('message', jasmine.any(Object));
 
             stanza = u.toStanza(`
                 <message xml:lang="en" to="dummy@localhost/resource"
@@ -2680,10 +2680,9 @@
                     <displayed xmlns="urn:xmpp:chat-markers:0" id="${msg_obj.get('msgid')}"/>
                 </message>`);
             _converse.connection._dataRecv(test_utils.createRequest(stanza));
-            await test_utils.waitUntil(() => _converse.api.trigger.calls.count() === 2);
+            await test_utils.waitUntil(() => view.model.isChatMarker.calls.count() === 2);
             expect(view.el.querySelectorAll('.chat-msg').length).toBe(1);
             expect(view.el.querySelectorAll('.chat-msg__receipt').length).toBe(0);
-            expect(_converse.api.trigger).toHaveBeenCalledWith('message', jasmine.any(Object));
 
             stanza = u.toStanza(`
                 <message xml:lang="en" to="dummy@localhost/resource"
@@ -2692,12 +2691,9 @@
                 </message>`);
             _converse.connection._dataRecv(test_utils.createRequest(stanza));
 
-            spyOn(view.model, "isChatMarker").and.callThrough();
-
-            await test_utils.waitUntil(() => view.model.isChatMarker.calls.count() === 1);
+            await test_utils.waitUntil(() => view.model.isChatMarker.calls.count() === 3);
             expect(view.el.querySelectorAll('.chat-msg').length).toBe(1);
             expect(view.el.querySelectorAll('.chat-msg__receipt').length).toBe(0);
-            expect(_converse.api.trigger).toHaveBeenCalledWith('message', jasmine.any(Object));
 
             stanza = u.toStanza(`
                 <message xml:lang="en" to="dummy@localhost/resource"
@@ -2706,10 +2702,9 @@
                     <markable xmlns="urn:xmpp:chat-markers:0"/>
                 </message>`);
             _converse.connection._dataRecv(test_utils.createRequest(stanza));
-            await test_utils.waitUntil(() => view.model.isChatMarker.calls.count() === 2);
+            await test_utils.waitUntil(() => view.model.isChatMarker.calls.count() === 4);
             expect(view.el.querySelectorAll('.chat-msg').length).toBe(2);
             expect(view.el.querySelectorAll('.chat-msg__receipt').length).toBe(0);
-            expect(_converse.api.trigger).toHaveBeenCalledWith('message', jasmine.any(Object));
             done();
         }));
 

spec/roomslist.js

@@ -208,7 +208,7 @@
             info_el.click();
 
             const  modal = view.model.room_details_modal;
-            await test_utils.waitUntil(() => u.isVisible(modal.el), 2000);
+            await test_utils.waitUntil(() => u.isVisible(modal.el), 1000);
             let els = modal.el.querySelectorAll('p.room-info');
             expect(els[0].textContent).toBe("Name: A Dark Cave")
             expect(els[1].textContent).toBe("Groupchat address (JID): coven@chat.shakespeare.lit")

src/converse-mam-views.js

@@ -65,7 +65,7 @@ converse.plugins.add('converse-mam-views', {
                 } else {
                     message_handler = _converse.chatboxes.onMessage.bind(_converse.chatboxes)
                 }
-                let result;
+                let result = {};
                 try {
                     result = await _converse.api.archive.query(
                         Object.assign({

src/converse-muc-views.js

@@ -572,8 +572,7 @@ converse.plugins.add('converse-muc-views', {
                 this.enterRoom();
             },
 
-            async enterRoom (ev) {
-                if (ev) { ev.preventDefault(); }
+            async enterRoom () {
                 if (this.model.get('connection_status') !==  converse.ROOMSTATUS.ENTERED) {
                     await this.model.getRoomFeatures();
                     if (!u.isPersistableModel(this.model)) {
@@ -582,8 +581,6 @@ converse.plugins.add('converse-muc-views', {
                         return;
                     }
                     this.populateAndJoin();
-                } else {
-                    this.model.fetchMessages();
                 }
                 /**
                  * Triggered once a groupchat has been opened
@@ -772,7 +769,9 @@ converse.plugins.add('converse-muc-views', {
             },
 
             afterConnected () {
-                if (this.model.get('connection_status') === converse.ROOMSTATUS.ENTERED) {
+                if (this.model.get('connection_status') === converse.ROOMSTATUS.CONNECTING) {
+                    this.showSpinner();
+                } else if (this.model.get('connection_status') === converse.ROOMSTATUS.ENTERED) {
                     this.hideSpinner();
                     this.setChatState(_converse.ACTIVE);
                     this.scrollDown();
@@ -1197,7 +1196,6 @@ converse.plugins.add('converse-muc-views', {
             populateAndJoin () {
                 this.model.occupants.fetchMembers();
                 this.join();
-                this.model.fetchMessages();
             },
 
             /**

src/headless/converse-chatboxes.js

@@ -293,7 +293,6 @@ converse.plugins.add('converse-chatboxes', {
                 }
                 this.on('change:chat_state', this.sendChatState, this);
                 this.initMessages();
-                this.fetchMessages();
             },
 
             initMessages () {
@@ -302,12 +301,14 @@ converse.plugins.add('converse-chatboxes', {
                 this.messages.browserStorage = new Backbone.BrowserStorage.session(
                     `converse.messages-${this.get('jid')}-${_converse.bare_jid}`);
                 this.messages.chatbox = this;
+                this.messages.fetched = u.getResolveablePromise();
 
                 this.messages.on('change:upload', (message) => {
                     if (message.get('upload') === _converse.SUCCESS) {
                         _converse.api.send(this.createMessageStanza(message));
                     }
                 });
+                this.fetchMessages();
             },
 
             afterMessagesFetched () {
@@ -322,12 +323,11 @@ converse.plugins.add('converse-chatboxes', {
             },
 
             fetchMessages () {
-                this.messages.fetched = new Promise(resolve => {
-                    this.messages.fetch({
-                        'add': true,
-                        'success': _.flow(this.afterMessagesFetched.bind(this), resolve),
-                        'error': _.flow(this.afterMessagesFetched.bind(this), resolve)
-                    });
+                const resolve = this.messages.fetched.resolve;
+                this.messages.fetch({
+                    'add': true,
+                    'success': _.flow(this.afterMessagesFetched.bind(this), resolve),
+                    'error': _.flow(this.afterMessagesFetched.bind(this), resolve)
                 });
             },
 

src/headless/converse-muc.js

@@ -211,10 +211,26 @@ converse.plugins.add('converse-muc', {
                 }
                 this.set('box_id', `box-${btoa(this.get('jid'))}`);
 
-                this.initMessages();
                 this.on('change:chat_state', this.sendChatState, this);
                 this.on('change:connection_status', this.onConnectionStatusChanged, this);
 
+                this.initFeatures();
+                this.initOccupants();
+                this.initMessages();
+                this.registerHandlers();
+            },
+
+            async onConnectionStatusChanged () {
+                if (this.get('connection_status') === converse.ROOMSTATUS.ENTERED &&
+                        _converse.auto_register_muc_nickname &&
+                        !this.get('reserved_nick') &&
+                        await _converse.api.disco.supports(Strophe.NS.MUC_REGISTER, this.get('jid'))) {
+
+                    this.registerNickname()
+                }
+            },
+
+            initFeatures () {
                 const storage = _converse.config.get('storage');
                 const id = `converse.muc-features-${_converse.bare_jid}-${this.get('jid')}`;
                 this.features = new Backbone.Model(
@@ -222,7 +238,9 @@ converse.plugins.add('converse-muc', {
                 );
                 this.features.browserStorage = new Backbone.BrowserStorage.session(id);
                 this.features.fetch();
+            },
 
+            initOccupants () {
                 this.occupants = new _converse.ChatRoomOccupants();
                 this.occupants.browserStorage = new Backbone.BrowserStorage.session(
                     `converse.occupants-${_converse.bare_jid}${this.get('jid')}`
@@ -236,18 +254,6 @@ converse.plugins.add('converse-muc', {
                         'error': resolve
                     });
                 });
-
-                this.registerHandlers();
-            },
-
-            async onConnectionStatusChanged () {
-                if (this.get('connection_status') === converse.ROOMSTATUS.ENTERED &&
-                        _converse.auto_register_muc_nickname &&
-                        !this.get('reserved_nick') &&
-                        await _converse.api.disco.supports(Strophe.NS.MUC_REGISTER, this.get('jid'))) {
-
-                    this.registerNickname()
-                }
             },
 
             registerHandlers () {