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

Fix RPC command

Browse Source
This commit is contained in:
yflory
2020-02-05 18:12:10 +01:00
parent 6655f493e0
commit 4079f1bfdb
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rpc.js
View File

@@ -46,7 +46,7 @@ const AUTHENTICATED_CALLS = [
'OWNED_UPLOAD_COMPLETE', 'OWNED_UPLOAD_COMPLETE',
'UPLOAD_CANCEL', 'UPLOAD_CANCEL',
'EXPIRE_SESSION', 'EXPIRE_SESSION',
'TRIM_OWNED_CHANNEL_HISTORY', 'TRIM_HISTORY',
'CLEAR_OWNED_CHANNEL', 'CLEAR_OWNED_CHANNEL',
'REMOVE_OWNED_CHANNEL', 'REMOVE_OWNED_CHANNEL',
'REMOVE_PINS', 'REMOVE_PINS',

5
www/common/outer/history.js
View File

@@ -105,6 +105,8 @@ define([
return void cb({error: 'EINVAL'}); return void cb({error: 'EINVAL'});
} }
if (!obj.length) { return; }
hash = obj[0].hash; hash = obj[0].hash;
var messages = obj.map(function(data) { var messages = obj.map(function(data) {
return data.msg; return data.msg;
@@ -161,6 +163,7 @@ define([
return; return;
} }
size += obj.size; size += obj.size;
if (!obj.hash) { return; }
res.push({ res.push({
channel: channel, channel: channel,
hash: obj.hash hash: obj.hash
@@ -188,7 +191,9 @@ define([
nThen(function (waitFor) { nThen(function (waitFor) {
channels.forEach(function (obj) { channels.forEach(function (obj) {
console.warn(obj); // XXX
rpc.trimHistory(obj, waitFor(function (err) { rpc.trimHistory(obj, waitFor(function (err) {
console.error(obj.channel, arguments); // XXX
if (err) { if (err) {
warning.push(err); warning.push(err);
return; return;