Minor refactor

RocketChat · Feb 26, 2021 · 8a605ca · 8a605ca
1 parent 630f079
commit 8a605ca
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/app/lib/methods/helpers/mergeSubscriptionsRooms.js b/app/lib/methods/helpers/mergeSubscriptionsRooms.js
@@ -18,11 +18,6 @@ export const merge = (subscription, room) => {
 	if (room) {
 		if (room._updatedAt) {
 			subscription.lastMessage = normalizeMessage(room.lastMessage);
-			if (serverVersion && lte(coerce(serverVersion), '3.7.0')) {
-				const updatedAt = room?._updatedAt ? new Date(room._updatedAt) : null;
-				const lastMessageTs = subscription?.lastMessage?.ts ? new Date(subscription.lastMessage.ts) : null;
-				subscription.roomUpdatedAt = Math.max(updatedAt, lastMessageTs);
-			}
 			subscription.description = room.description;
 			subscription.topic = room.topic;
 			subscription.announcement = room.announcement;
@@ -33,7 +28,11 @@ export const merge = (subscription, room) => {
 			subscription.usernames = room.usernames;
 			subscription.uids = room.uids;
 		}
-		if (serverVersion && gt(coerce(serverVersion), '3.7.0')) {
+		if (serverVersion && lte(coerce(serverVersion), '3.7.0')) {
+			const updatedAt = room?._updatedAt ? new Date(room._updatedAt) : null;
+			const lastMessageTs = subscription?.lastMessage?.ts ? new Date(subscription.lastMessage.ts) : null;
+			subscription.roomUpdatedAt = Math.max(updatedAt, lastMessageTs);
+		} else {
 			// https://github.com/RocketChat/Rocket.Chat/blob/develop/app/ui-sidenav/client/roomList.js#L180
 			const lastRoomUpdate = room.lm || subscription.ts || subscription._updatedAt;
 			subscription.roomUpdatedAt = subscription.lr ? Math.max(new Date(subscription.lr), new Date(lastRoomUpdate)) : lastRoomUpdate;