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

Track fetched entries for redactions

Browse source
This commit is contained in:
RMidhunSuresh 2021-12-09 13:48:55 +05:30
parent ea89c272b9
commit 4a81e06e96
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/matrix/room/timeline/Timeline.js
View file

@ -45,6 +45,8 @@ export class Timeline {
}); });
this._readerRequest = null; this._readerRequest = null;
this._allEntries = null; this._allEntries = null;
// Stores event entries that we fetch for reply previews
this._fetchedEventEntries = [];
this.initializePowerLevels(powerLevelsObservable); this.initializePowerLevels(powerLevelsObservable);
} }
@ -218,6 +220,7 @@ export class Timeline {
/** @package */ /** @package */
replaceEntries(entries) { replaceEntries(entries) {
this._addLocalRelationsToNewRemoteEntries(entries); this._addLocalRelationsToNewRemoteEntries(entries);
this._updateFetchedEntries(entries);
this._loadRelatedEvents(entries); this._loadRelatedEvents(entries);
for (const entry of entries) { for (const entry of entries) {
try { try {
@ -244,20 +247,31 @@ export class Timeline {
/** @package */ /** @package */
addEntries(newEntries) { addEntries(newEntries) {
this._addLocalRelationsToNewRemoteEntries(newEntries); this._addLocalRelationsToNewRemoteEntries(newEntries);
this._updateFetchedEntries(newEntries);
this._loadRelatedEvents(newEntries); this._loadRelatedEvents(newEntries);
this._remoteEntries.setManySorted(newEntries); this._remoteEntries.setManySorted(newEntries);
} }
_updateFetchedEntries(entries) {
for (const entry of entries) {
const relatedEntry = this._fetchedEventEntries.find(e => e.id === entry.relatedEventId);
if (relatedEntry?.addLocalRelation(entry)) {
relatedEntry.dependents.forEach(e => this._findAndUpdateRelatedEntry(null, e.id, () => true));
}
}
}
async _loadRelatedEvents(entries) { async _loadRelatedEvents(entries) {
const filteredEntries = entries.filter(e => !!e.contextEventId); const filteredEntries = entries.filter(e => !!e.contextEventId);
for (const entry of filteredEntries) { for (const entry of filteredEntries) {
const id = entry.contextEventId; const id = entry.contextEventId;
let needToTrack = false;
let contextEvent; let contextEvent;
// find in remote events // find in remote events
contextEvent = this.getByEventId(id); contextEvent = this.getByEventId(id);
contextEvent?.addDependent(entry);
// find in storage // find in storage
if (!contextEvent) { if (!contextEvent) {
needToTrack = true;
contextEvent = await this._fetchEventFromStorage(id); contextEvent = await this._fetchEventFromStorage(id);
} }
// fetch from hs // fetch from hs
@ -265,6 +279,12 @@ export class Timeline {
contextEvent = await this._fetchEventFromHomeserver(id); contextEvent = await this._fetchEventFromHomeserver(id);
} }
if (contextEvent) { if (contextEvent) {
if (needToTrack) {
// this entry was created from storage/hs, so it's not tracked by remoteEntries
// we track them here for redactions
this._fetchedEventEntries.push(contextEvent);
}
contextEvent.addDependent(entry);
entry.setContextEntry(contextEvent); entry.setContextEntry(contextEvent);
// emit this change // emit this change
this._remoteEntries.update(entry); this._remoteEntries.update(entry);