Fix some failing tests after #2803

src/headless/plugins/chat/parsers.js

@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 import log from '@converse/headless/log';
 import u from '@converse/headless/utils/core';
-import { api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless/core';
 import { rejectMessage } from '@converse/headless/shared/actions';
 
 import {
@@ -36,7 +36,7 @@ const { Strophe, sizzle } = converse.env;
  * @param { _converse } _converse
  * @returns { (MessageAttributes|Error) }
  */
-export async function parseMessage (stanza, _converse) {
+export async function parseMessage (stanza) {
     throwErrorIfInvalidForward(stanza);
 
     let to_jid = stanza.getAttribute('to');

src/headless/plugins/mam/utils.js

@@ -77,21 +77,19 @@ export function preMUCJoinMAMFetch (muc) {
 export async function handleMAMResult (model, result, query, options, should_page) {
     await api.emojis.initialize();
     const is_muc = model.get('type') === _converse.CHATROOMS_TYPE;
-    
-    const doParseMessage = async (s) => {
-        return await (is_muc ? parseMUCMessage(s, model, _converse) : parseMessage(s, _converse))
-    }
-    await Promise.all(result.messages.map(doParseMessage));
+    const doParseMessage = s => is_muc ? parseMUCMessage(s, model) : parseMessage(s);
+    const messages = await Promise.all(result.messages.map(doParseMessage));
+    result.messages = messages;
 
     /**
      * Synchronous event which allows listeners to first do some
      * work based on the MAM result before calling the handlers here.
      * @event _converse#MAMResult
      */
-    const data = { query, 'chatbox': model, 'messages': result.messages };
+    const data = { query, 'chatbox': model, messages };
     await api.trigger('MAMResult', data, { 'synchronous': true });
 
-    result.messages.forEach(m => model.queueMessage(m));
+    messages.forEach(m => model.queueMessage(m));
     if (result.error) {
         const event_id = (result.error.retry_event_id = u.getUniqueId());
         api.listen.once(event_id, () => fetchArchivedMessages(model, options, should_page));

src/headless/plugins/muc/parsers.js

@@ -20,7 +20,7 @@ import {
     isValidReceiptRequest,
     throwErrorIfInvalidForward,
 } from '@converse/headless/shared/parsers';
-import { api, converse } from '@converse/headless/core';
+import { _converse, api, converse } from '@converse/headless/core';
 
 const { Strophe, sizzle, u } = converse.env;
 const { NS } = Strophe;
@@ -126,7 +126,7 @@ function getOccupantID (stanza, chatbox) {
  * @param { _converse } _converse
  * @returns { Promise<MUCMessageAttributes|Error> }
  */
-export async function parseMUCMessage (stanza, chatbox, _converse) {
+export async function parseMUCMessage (stanza, chatbox) {
     throwErrorIfInvalidForward(stanza);
 
     const selector = `[xmlns="${NS.MAM}"] > forwarded[xmlns="${NS.FORWARD}"] > message`;