[FIX] Main thread title on replies

app/ui-message/client/message.js

@@ -480,10 +480,10 @@ const renderBody = (msg, settings) => {
 };
 
 Template.message.onCreated(function() {
-	const { msg, settings } = Template.currentData();
+	const { msg, settings, shouldCollapseReplies } = Template.currentData();
 
 	this.wasEdited = msg.editedAt && !MessageTypes.isSystemMessage(msg);
-	if (msg.tmid && !msg.threadMsg) {
+	if (shouldCollapseReplies && msg.tmid && !msg.threadMsg) {
 		findParentMessage(msg.tmid);
 	}
 	return this.body = Tracker.nonreactive(() => renderBody(msg, settings));

app/ui-utils/client/lib/RoomHistoryManager.js

@@ -1,4 +1,3 @@
-import mem from 'mem';
 import s from 'underscore.string';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
@@ -10,7 +9,8 @@ import { RoomManager } from './RoomManager';
 import { readMessage } from './readMessages';
 import { renderMessageBody } from './renderMessageBody';
 
-export const normalizeThreadMessage = mem((message) => {
+export const normalizeThreadMessage = (message) => {
+
 	if (message.msg) {
 		return renderMessageBody(message).replace(/<br\s?\\?>/g, ' ');
 	}
@@ -26,7 +26,7 @@ export const normalizeThreadMessage = mem((message) => {
 			return s.escapeHTML(attachment.title);
 		}
 	}
-}, { maxAge: 1000 });
+};
 
 export const upsertMessage = ({ msg: { _id, ...msg }, subscription }) => {
 	const userId = msg.u && msg.u._id;

app/ui-utils/client/lib/renderMessageBody.js

@@ -1,11 +1,32 @@
 import { callbacks } from '../../../callbacks';
 import s from 'underscore.string';
 
-export const renderMessageBody = (message) => {
+const generateKeyDefault = (...args) => args.map((item) => JSON.stringify(item)).join('-');
+
+const mem = (fn, tm = 500, generateKey = generateKeyDefault) => {
+	const cache = {};
+	const timeout = {};
+
+	const invalidateCache = (key) => delete cache[key];
+	return (...args) => {
+		const key = generateKey(...args);
+		if (!cache[key]) {
+			cache[key] = fn(...args);
+		}
+		if (timeout[key]) {
+			clearTimeout(timeout[key]);
+		}
+		timeout[key] = setTimeout(invalidateCache, tm, key);
+		return cache[key];
+	};
+};
+
+export const renderMessageBody = mem((message) => {
+
 	message.html = s.trim(message.msg) ? s.escapeHTML(message.msg) : '';
 
 	const { tokens, html } = callbacks.run('renderMessage', message);
 
 	return (Array.isArray(tokens) ? tokens.reverse() : [])
 		.reduce((html, { token, text }) => html.replace(token, () => text), html);
-};
+}, 5000, ({ _id, _updatedAt }) => (_id + _updatedAt));

tests/pageobjects/main-content.page.js

@@ -107,10 +107,9 @@ class MainContent extends Page {
 	}
 
 	waitForLastMessageTextAttachmentEqualsText(text) {
-		browser.waitUntil(function() {
-			browser.waitForVisible('.message:last-child .attachment-text', 5000);
-			return browser.getText('.message:last-child .attachment-text') === text;
-		}, 5000);
+
+		browser.waitForVisible('.message:last-child .attachment-text', 5000);
+		return browser.getText('.message:last-child .attachment-text') === text;
 	}
 
 	// Wait for the last message author username to equal the provided text