Node.js based forum software built for the modern web
fix: keep the server timestamp on live chat messages (#14778)
palmoni52f3df9ca0a1a
diff --git a/public/src/client/chats/events.js b/public/src/client/chats/events.jsindex 17f11f91ce..7dec38e574 100644--- a/public/src/client/chats/events.js+++ b/public/src/client/chats/events.js@@ -43,8 +43,7 @@ define('forum/chats/events', [}data.self = parseInt(app.user.uid, 10) === parseInt(data.fromUid, 10) ? 1 : 0;data.message.self = data.self;- data.message.timestamp = Math.min(Date.now(), data.message.timestamp);- data.message.timestampISO = utils.toISOString(data.message.timestamp);+ data.message.timestampISO = utils.toISOString(Math.min(Date.now(), data.message.timestamp));const isMessageForCurrentRoom = parseInt(data.roomId, 10) === parseInt(ajaxify.data.roomId, 10);if (isMessageForCurrentRoom) {diff --git a/public/src/modules/chat.js b/public/src/modules/chat.jsindex 40892c68e2..765a88c888 100644--- a/public/src/modules/chat.js+++ b/public/src/modules/chat.js@@ -193,8 +193,7 @@ define('chat', [modal.attr('new-message', data.self === 0 ? 1 : 0);}data.message.self = data.self;- data.message.timestamp = Math.min(Date.now(), data.message.timestamp);- data.message.timestampISO = utils.toISOString(data.message.timestamp);+ data.message.timestampISO = utils.toISOString(Math.min(Date.now(), data.message.timestamp));addMessageToModal(data);}};