The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-12 19:49:59 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge 331922afcd into 04df22a4f8

Browse Source
This commit is contained in:
Fabrice Mouhartem 2026-09-11 15:18:08 +00:00 committed by GitHub
commit 30470ad0ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/worker/modules/history.js
View File

@ -161,9 +161,18 @@ const factory = (Util, Hash, UserObject, nThen) => {
hash = obj[0].hash;
var messages = obj.map(function(data) {
return data.msg;
try {
// Remove txid from received messages
let parsed = JSON.parse(data.msg);
parsed[0] = 0;
return JSON.stringify(parsed);
} catch (e) {
// Invalid message in history: should not happen
return data.msg;
}
});
dataSize = messages.join('\n').length;
// +1 is there for the last new line
dataSize = messages.join('\n').length + 1;
}), true);
}
// Metadata
@ -172,7 +181,8 @@ const factory = (Util, Hash, UserObject, nThen) => {
}, waitFor(function (obj) {
if (obj && obj.error) { return; }
if (!obj || typeof(obj) !== "object") { return; }
metadata = JSON.stringify(obj).length;
// +1 is there for the last new line
metadata = JSON.stringify(obj).length + 1;
if (!obj || !Array.isArray(obj.owners) ||
obj.owners.indexOf(edPublic) === -1) {
waitFor.abort();

6
www/teams/inner.js
View File

@ -429,10 +429,16 @@ define([
]);
UI.openCustomModal(UI.dialog.customModal(div, {buttons: []}));
console.log('Trimming team history', APP.team, size);
const removeModalsTimeout = setTimeout(() => {
UI.removeModals();
Feedback.send(`TRIM_HISTORY_TIMEOUT=${channels.map(obj => obj?.channel).join('|')}`, true);
UI.warn(Messages.trimHistory_error);
}, 15000);
APP.history.execCommand('TRIM_HISTORY', {
channels: channels
}, function(obj) {
if (obj && obj.error) { console.error(obj.error); }
clearTimeout(removeModalsTimeout);
UI.removeModals();
});
});