This commit is contained in:
the-djmaze 2024-07-15 16:13:32 +02:00
parent 3161961faa
commit becaaaa2fd

View file

@ -28,10 +28,15 @@ export class MessageCollectionModel extends AbstractCollectionModel
*/
static reviveFromJson(object/*, cached*/) {
let msg = MessageUserStore.message();
return super.reviveFromJson(object, message =>
return super.reviveFromJson(object, message => {
// If message is currently viewed, use that.
// Maybe then use msg.revivePropertiesFromJson(message) ?
(msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message)
);
if (msg && msg.hash === message.hash) {
msg.revivePropertiesFromJson(message);
message = msg;
} else {
message = MessageModel.reviveFromJson(message);
}
return message;
});
}
}