web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
ansuz 2019-01-14 16:42:37 +01:00
commit 5a61453492
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/common/outer/async-store.js
View File

@ -958,12 +958,20 @@ define([
history: [], history: [],
pushHistory: function (msg, isCp) { pushHistory: function (msg, isCp) {
if (isCp) { if (isCp) {
// the current message is a checkpoint.
// push it to your worker's history, prepending it with cp|
// cp| and anything else related to checkpoints has already
// been stripped by chainpad-netflux-worker or within async store
// when the message was outgoing.
channel.history.push('cp|' + msg); channel.history.push('cp|' + msg);
// since the latest message is a checkpoint, we are able to drop
// some of the older history, but we can't rely on checkpoints being
// correct, as they might be checkpoints from different forks
var i; var i;
for (i = channel.history.length - 2; i > 0; i--) { for (i = channel.history.length - 101; i > 0; i--) {
if (/^cp\|/.test(channel.history[i])) { break; } if (/^cp\|/.test(channel.history[i])) { break; }
} }
channel.history = channel.history.slice(i); channel.history = channel.history.slice(Math.max(i, 0));
return; return;
} }
channel.history.push(msg); channel.history.push(msg);