Regression: thread loading parent msg if is not loaded (#14839)

app/ui-message/client/message.js

@@ -429,33 +429,34 @@ Template.message.helpers({
 
 const findParentMessage = (() => {
 	const waiting = [];
-
+	const uid = Tracker.nonreactive(() => Meteor.userId());
 	const getMessages = _.debounce(async function() {
-		const uid = Tracker.nonreactive(() => Meteor.userId());
 		const _tmp = [...waiting];
 		waiting.length = 0;
-		(await call('getMessages', _tmp)).map((msg) => upsertMessage({ msg: { ...msg, _hidden: true }, uid }));
+		(await call('getMessages', _tmp)).map((msg) => Messages.findOne({ _id: msg._id }) || upsertMessage({ msg: { ...msg, _hidden: true }, uid }));
 	}, 500);
 
+
 	return (tmid) => {
 		if (waiting.indexOf(tmid) > -1) {
 			return;
 		}
-
 		const message = Messages.findOne({ _id: tmid });
-		if (message) {
-			const uid = Tracker.nonreactive(() => Meteor.userId());
-			return Messages.update({ tmid, repliesCount: { $exists: 0 } }, {
+		if (!message) {
+			waiting.push(tmid);
+			return getMessages();
+		}
+		return Messages.update(
+			{ tmid, repliesCount: { $exists: 0 } },
+			{
 				$set: {
 					following: message.replies && message.replies.indexOf(uid) > -1,
 					threadMsg: normalizeThreadMessage(message),
 					repliesCount: message.tcount,
 				},
-			}, { multi: true });
-		}
-
-		waiting.push(tmid);
-		getMessages();
+			},
+			{ multi: true }
+		);
 	};
 })();