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

Merge branch 'staging' into communities-trim

pull/1/head
yflory 2020-02-05 18:23:10 +01:00
parent 4079f1bfdb 3741cbcbc0
commit 1d56c08700
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rpc.js
View File

@ -140,7 +140,6 @@ const AUTHENTICATED_USER_SCOPED = {
var handleAuthenticatedMessage = function (Env, map) {
var msg = map.msg;
var safeKey = map.safeKey;
var publicKey = map.publicKey;
var Respond = map.Respond;
var Server = map.Server;
@ -278,7 +277,6 @@ var rpc = function (Env, Server, data, respond) {
handleAuthenticatedMessage(Env, {
msg: msg,
safeKey: safeKey,
publicKey: publicKey,
Respond: Respond,
Server: Server,
});

6
storage/file.js
View File

@ -959,17 +959,17 @@ var trimChannel = function (env, channelName, hash, _cb) {
return readMore();
}
var s_msg = msgObj.buff.toString('utf8');
if (retain) {
// if this flag is set then you've already found
// the message you were looking for.
// write it to your temp buffer and keep going
return void tempStream.write(msgObj.buff, function () {
return void tempStream.write(s_msg + '\n', function () {
readMore();
});
}
var msg = Util.tryParse(msgObj.buff.toString('utf8'));
var msg = Util.tryParse(s_msg);
var msgHash = Extras.getHash(msg[4]);
if (msgHash === hash) {