From f3cf69796d0041c433e3879f8a1e695f8d817066 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Thu, 17 Jan 2019 22:35:14 +0200 Subject: [PATCH] Don't merge messages on client if server sends over 100 of them --- client/js/socket-events/init.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/js/socket-events/init.js b/client/js/socket-events/init.js index e700b2c0..e4b1669f 100644 --- a/client/js/socket-events/init.js +++ b/client/js/socket-events/init.js @@ -44,7 +44,8 @@ socket.on("init", function(data) { channel.pendingMessage = currentChannel.pendingMessage; // Reconnection only sends new messages, so merge it on the client - if (currentChannel.messages) { + // Only concat if server sent us less than 100 messages so we don't introduce gaps + if (currentChannel.messages && channel.messages.length < 100) { channel.messages = currentChannel.messages.concat(channel.messages); }