CORE-9 Potential fix #4

app/ui-sidenav/client/roomList.js

@@ -6,6 +6,20 @@ import { ChatSubscription, Rooms, Users, Subscriptions } from '../../models';
 import { UiTextContext, getUserPreference, roomTypes } from '../../utils';
 import { settings } from '../../settings';
 
+const updateLastMessage = (subscription) => {
+	const room = Rooms.findOne(subscription.rid);
+	if (room && room.lastMessage) {
+		Subscriptions.update({
+			rid: room._id,
+		}, {
+			$set: {
+				lastMessage: room.lastMessage,
+				lm: room._updatedAt,
+			},
+		});
+	}
+};
+
 Template.roomList.helpers({
 	rooms() {
 		/*
@@ -100,8 +114,15 @@ Template.roomList.helpers({
 				query.f = { $ne: favoritesEnabled };
 			}
 		}
-		return ChatSubscription.find(query, { sort });
+
+		const subscriptions = ChatSubscription.find(query, { sort }).fetch();
+		subscriptions
+			.filter((s) => s.t === 'd' && !s.lastMessage)
+			.forEach((s) => setTimeout(() => updateLastMessage(s), 1000));
+
+		return subscriptions;
 	},
+
 	isLivechat() {
 		return this.identifier === 'l';
 	},