Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

write and remove archived summary when leaving/rejoining

Browse source
This commit is contained in:
Bruno Windels 2021-05-05 17:03:22 +02:00
parent 644698aed7
commit f6957278c3
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/matrix/room/Room.js
View file

@ -250,6 +250,9 @@ export class Room extends EventEmitter {
async writeSync(roomResponse, isInitialSync, {summaryChanges, decryptChanges, roomEncryption, retryEntries}, txn, log) { async writeSync(roomResponse, isInitialSync, {summaryChanges, decryptChanges, roomEncryption, retryEntries}, txn, log) {
log.set("id", this.id); log.set("id", this.id);
const isRejoin = summaryChanges.membership === "join" && this._summary.data.membership === "leave"; const isRejoin = summaryChanges.membership === "join" && this._summary.data.membership === "leave";
if (isRejoin) {
this._summary.tryRemoveArchive(txn);
}
const {entries: newEntries, newLiveKey, memberChanges} = const {entries: newEntries, newLiveKey, memberChanges} =
await log.wrap("syncWriter", log => this._syncWriter.writeSync(roomResponse, isRejoin, txn, log), log.level.Detail); await log.wrap("syncWriter", log => this._syncWriter.writeSync(roomResponse, isRejoin, txn, log), log.level.Detail);
let allEntries = newEntries; let allEntries = newEntries;
@ -276,8 +279,13 @@ export class Room extends EventEmitter {
// also apply (decrypted) timeline entries to the summary changes // also apply (decrypted) timeline entries to the summary changes
summaryChanges = summaryChanges.applyTimelineEntries( summaryChanges = summaryChanges.applyTimelineEntries(
allEntries, isInitialSync, !this._isTimelineOpen, this._user.id); allEntries, isInitialSync, !this._isTimelineOpen, this._user.id);
// write summary changes, and unset if nothing was actually changed // only archive a room if we had previously joined it
summaryChanges = this._summary.writeData(summaryChanges, txn); if (summaryChanges.membership === "leave" && this.membership === "join") {
summaryChanges = this._summary.removeAndWriteArchive(summaryChanges, txn);
} else {
// write summary changes, and unset if nothing was actually changed
summaryChanges = this._summary.writeData(summaryChanges, txn);
}
if (summaryChanges) { if (summaryChanges) {
log.set("summaryChanges", summaryChanges.diff(this._summary.data)); log.set("summaryChanges", summaryChanges.diff(this._summary.data));
} }

14
src/matrix/room/RoomSummary.js
View file

@ -302,6 +302,20 @@ export class RoomSummary {
} }
} }
/** move summary to archived store when leaving the room */
removeAndWriteArchive(data, txn) {
txn.roomSummary.remove(data.roomId);
if (data !== this._data) {
txn.archivedRoomSummary.set(data.serialize());
return data;
}
}
/** delete archived summary when rejoining the room */
tryRemoveArchive(txn) {
txn.archivedRoomSummary.remove(this._data.roomId);
}
async writeAndApplyData(data, storage) { async writeAndApplyData(data, storage) {
if (data === this._data) { if (data === this._data) {
return false; return false;