infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Add author and time of patches in debug app

pull/1/head
yflory 2020-02-14 12:06:52 +01:00
parent b7b2685f14
commit 1d24c85ca4
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1969,7 +1969,11 @@ define([
first = false;
}
msg = msg.replace(/cp\|(([A-Za-z0-9+\/=]+)\|)?/, '');
msgs.push(msg);
msgs.push({
msg: msg,
author: parsed[2][1],
time: parsed[2][5]
});
}
};

6
www/common/sframe-common-history.js
View File

@ -70,7 +70,11 @@ define([
if (!Array.isArray(data.messages)) { return void console.error('Not an array!'); }
lastKnownHash = data.lastKnownHash;
isComplete = data.isFull;
Array.prototype.unshift.apply(allMessages, data.messages); // Destructive concat
var messages = (data.messages || []).map(function (obj) {
return obj.msg;
});
if (config.debug) { console.log(data.messages); }
Array.prototype.unshift.apply(allMessages, messages); // Destructive concat
fillChainPad(realtime, allMessages);
cb (null, realtime, data.isFull);
});

8
www/common/sframe-common-outer.js
View File

@ -859,10 +859,14 @@ define([
}, function (data) {
cb({
isFull: data.isFull,
messages: data.messages.map(function (msg) {
messages: data.messages.map(function (obj) {
// The 3rd parameter "true" means we're going to skip signature validation.
// We don't need it since the message is already validated serverside by hk
return crypto.decrypt(msg, true, true);
return {
msg: crypto.decrypt(obj.msg, true, true),
author: obj.author,
time: obj.time
};
}),
lastKnownHash: data.lastKnownHash
});