mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-06-17 11:44:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Pad: Don't create no-op revisions

Browse source
This commit is contained in:
Richard Hansen 2021-12-11 20:03:35 -05:00
parent 56b7671422
commit a370cfa5c6
6 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,9 @@ Pad.prototype.appendRevision = async function (aChangeset, author) {
}
const newAText = Changeset.applyToAText(aChangeset, this.atext, this.pool);
if (newAText.text === this.atext.text && newAText.attribs === this.atext.attribs) {
return this.head;
}
Changeset.copyAText(newAText, this.atext);
const newRev = ++this.head;
@ -268,8 +271,7 @@ Pad.prototype.setText = async function (newText) {
changeset = Changeset.makeSplice(oldText, 0, oldText.length - 1, newText);
}
// append the changeset
if (newText !== oldText) await this.appendRevision(changeset);
await this.appendRevision(changeset);
};
Pad.prototype.appendText = async function (newText) {

6
src/node/handler/PadMessageHandler.js
View file

@ -640,7 +640,9 @@ const handleUserChanges = async (socket, message) => {
}
const newRev = await pad.appendRevision(rebasedChangeset, thisSession.author);
assert.equal(newRev, r + 1);
// The head revision will either stay the same or increase by 1 depending on whether the
// changeset has a net effect.
assert([r, r + 1].includes(newRev));
const correctionChangeset = _correctMarkersInPad(pad.atext, pad.pool);
if (correctionChangeset) {
@ -658,7 +660,7 @@ const handleUserChanges = async (socket, message) => {
assert.equal(thisSession.rev, r);
socket.json.send({type: 'COLLABROOM', data: {type: 'ACCEPT_COMMIT', newRev}});
thisSession.rev = newRev;
thisSession.time = await pad.getRevisionDate(newRev);
if (newRev !== r) thisSession.time = await pad.getRevisionDate(newRev);
await exports.updatePadClients(pad);
} catch (err) {
socket.json.send({disconnect: 'badChangeset'});

2
src/node/utils/ImportHtml.js
View file

@ -85,5 +85,5 @@ exports.setPadHTML = async (pad, html) => {
apiLogger.debug(`The changeset: ${theChangeset}`);
await pad.setText('\n');
if (!Changeset.isIdentity(theChangeset)) await pad.appendRevision(theChangeset);
await pad.appendRevision(theChangeset);
};