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

Add history trim in the properties modal

Browse Source
This commit is contained in:
yflory
2020-02-03 17:38:15 +01:00
parent 5ead391706
commit 4ac2f64726
4 changed files with 149 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ define([
// Shared folders owned by me
var sf = ctx.store.proxy[UserObject.SHARED_FOLDERS];
if (sf) {
console.log(sf);
var sfChannels = Object.keys(sf).map(function (fId) {
var data = sf[fId];
if (!data || !data.owners) { return; }
@@ -47,18 +46,29 @@ define([
if (!isOwner) { return; }
return data.channel;
}).filter(Boolean);
console.log(sfChannels);
Array.prototype.push.apply(channels, sfChannels);
}
return channels;
};
var getRpc = function (ctx, teamId) {
if (!teamId) { return ctx.store.rpc; }
var teams = ctx.store.modules['team'];
if (!teams) { return; }
var team = teams.getTeam(teamId);
if (!team) { return; }
return team.rpc;
};
commands.GET_HISTORY_SIZE = function (ctx, data, cId, cb) {
if (!ctx.store.loggedIn || !ctx.store.rpc) { return void cb({ error: 'INSUFFICIENT_PERMISSIONS' }); }
var channels = data.channels;
if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
var rpc = getRpc(ctx, data.teamid);
if (!rpc) { return void cb({ error: 'ENORPC'}); }
var warning = [];
// If account trim history, get the correct channels here
@@ -78,7 +88,7 @@ define([
channel = chan.channel;
lastKnownHash = chan.lastKnownHash;
}
ctx.store.rpc.getHistorySize({
rpc.getHistorySize({
channel: channel,
lastKnownHash: lastKnownHash
}, waitFor(function (err, value) {
@@ -103,6 +113,9 @@ define([
var channels = data.channels;
if (!Array.isArray(channels)) { return void cb({ error: 'EINVAL' }); }
var rpc = getRpc(ctx, data.teamid);
if (!rpc) { return void cb({ error: 'ENORPC'}); }
var warning = [];
// If account trim history, get the correct channels here
@@ -113,7 +126,7 @@ define([
nThen(function (waitFor) {
channels.forEach(function (chan) {
/*
ctx.store.rpc.trimHistory(chan, waitFor(function (err) {
rpc.trimHistory(chan, waitFor(function (err) {
if (err) {
chanWarning = true;
warning.push(err);