[FIX] Last message not updating after message delete if show deleted status is on (#12350)

pull/11212/head^2
Diego Sampaio 7 years ago committed by GitHub
parent 2ea96a5a68
commit ee3c78d2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/rocketchat-lib/server/functions/deleteMessage.js
  2. 4
      packages/rocketchat-lib/server/models/Rooms.js

@ -39,7 +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) {
RocketChat.models.Rooms.resetLastMessageById(message.rid);
RocketChat.models.Rooms.resetLastMessageById(message.rid, message._id);
}
}

@ -435,9 +435,9 @@ class ModelRooms extends RocketChat.models._Base {
return this.update(query, update);
}
resetLastMessageById(_id) {
resetLastMessageById(_id, messageId) {
const query = { _id };
const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(_id);
const lastMessage = RocketChat.models.Messages.getLastVisibleMessageSentWithNoTypeByRoomId(_id, messageId);
const update = lastMessage ? {
$set: {

Loading…
Cancel
Save