[FIX] Regression in prune by user, and update lastMessage (#11646)

* Fix regression * Also update lastMessage * code style fix
RocketChat · Aug 10, 2018 · e3df820 · e3df820
1 parent 90be09e
commit e3df820
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 579 deletions.
diff --git a/packages/rocketchat-lib/server/functions/cleanRoomHistory.js b/packages/rocketchat-lib/server/functions/cleanRoomHistory.js
@@ -24,14 +24,10 @@ RocketChat.cleanRoomHistory = function({ rid, latest = new Date(), oldest = new
 		return fileCount;
 	}
 
-	let count = 0;
-	if (limit) {
-		count = RocketChat.models.Messages.removeByIdPinnedTimestampLimitAndUsers(rid, excludePinned, ts, limit, fromUsers);
-	} else {
-		count = RocketChat.models.Messages.removeByIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers);
-	}
+	const count = limit ? RocketChat.models.Messages.removeByIdPinnedTimestampLimitAndUsers(rid, excludePinned, ts, limit, fromUsers) : RocketChat.models.Messages.removeByIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers);
 
 	if (count) {
+		RocketChat.models.Rooms.resetLastMessageById(rid);
 		RocketChat.Notifications.notifyRoom(rid, 'deleteMessageBulk', {
 			rid,
 			excludePinned,

diff --git a/packages/rocketchat-lib/server/functions/deleteMessage.js b/packages/rocketchat-lib/server/functions/deleteMessage.js
@@ -39,8 +39,7 @@ RocketChat.deleteMessage = function(message, user) {
 	if (RocketChat.settings.get('Store_Last_Message')) {
 		const room = RocketChat.models.Rooms.findOneById(message.rid, { fields: { lastMessage: 1 } });
 		if (!room.lastMessage || room.lastMessage._id === message._id) {
-			const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(message.rid, message._id);
-			RocketChat.models.Rooms.setLastMessageById(message.rid, lastMessage);
+			RocketChat.models.Rooms.resetLastMessageById(message.rid);
 		}
 	}
 

diff --git a/packages/rocketchat-lib/server/models/Rooms.js b/packages/rocketchat-lib/server/models/Rooms.js
@@ -439,6 +439,23 @@ class ModelRooms extends RocketChat.models._Base {
 		return this.update(query, update);
 	}
 
+	resetLastMessageById(_id) {
+		const query = { _id };
+		const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(_id);
+
+		const update = lastMessage ? {
+			$set: {
+				lastMessage
+			}
+		} : {
+			$unset: {
+				lastMessage: 1
+			}
+		};
+
+		return this.update(query, update);
+	}
+
 	replaceUsername(previousUsername, username) {
 		const query = {usernames: previousUsername};