mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

chat: Move message deletion to padRemove hook

Browse source
This commit is contained in:
Richard Hansen 2022-04-08 04:37:15 -04:00
parent bd621043ff
commit b6bcc092ed
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ep.json
View file

@ -28,6 +28,7 @@
"padCheck": "ep_etherpad-lite/node/chat", "padCheck": "ep_etherpad-lite/node/chat",
"padCopy": "ep_etherpad-lite/node/chat", "padCopy": "ep_etherpad-lite/node/chat",
"padLoad": "ep_etherpad-lite/node/chat", "padLoad": "ep_etherpad-lite/node/chat",
"padRemove": "ep_etherpad-lite/node/chat",
"socketio": "ep_etherpad-lite/node/chat" "socketio": "ep_etherpad-lite/node/chat"
} }
}, },

8
src/node/chat.js
View file

@ -173,6 +173,14 @@ exports.padLoad = async (hookName, {pad}) => {
if (!('chatHead' in pad)) pad.chatHead = -1; if (!('chatHead' in pad)) pad.chatHead = -1;
}; };
exports.padRemove = async (hookName, {pad}) => {
const ops = (function* () {
const {chatHead = -1} = pad;
for (let i = 0; i <= chatHead; ++i) yield pad.db.remove(`pad:${pad.id}:chat:${i}`);
})();
for (const op of new Stream(ops).batch(100).buffer(99)) await op;
};
exports.socketio = (hookName, {io}) => { exports.socketio = (hookName, {io}) => {
socketio = io; socketio = io;
}; };

5
src/node/db/Pad.js
View file

@ -530,11 +530,6 @@ class Pad {
})); }));
p.push(db.remove(`pad2readonly:${padID}`)); p.push(db.remove(`pad2readonly:${padID}`));
// delete all chat messages
p.push(promises.timesLimit(this.chatHead + 1, 500, async (i) => {
await this.db.remove(`pad:${this.id}:chat:${i}`, null);
}));
// delete all revisions // delete all revisions
p.push(promises.timesLimit(this.head + 1, 500, async (i) => { p.push(promises.timesLimit(this.head + 1, 500, async (i) => {
await this.db.remove(`pad:${this.id}:revs:${i}`, null); await this.db.remove(`pad:${this.id}:revs:${i}`, null);