mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "Ignore missing events"

Browse source 
This reverts commit 8dc3c13a93.
This commit is contained in:
Eric Eastwood 2022-07-20 02:27:35 -05:00
parent 8dc3c13a93
commit 871cf1ad80
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ import {NonPersistedEventEntry} from "./entries/NonPersistedEventEntry.js";
import {EVENT_TYPE as MEMBER_EVENT_TYPE} from "../members/RoomMember.js"; import {EVENT_TYPE as MEMBER_EVENT_TYPE} from "../members/RoomMember.js";
export class Timeline { export class Timeline {
constructor({roomId, storage, closeCallback, fragmentIdComparer, pendingEvents, clock, powerLevelsObservable, hsApi, ignoreMissingEvents}) { constructor({roomId, storage, closeCallback, fragmentIdComparer, pendingEvents, clock, powerLevelsObservable, hsApi}) {
this._roomId = roomId; this._roomId = roomId;
this._storage = storage; this._storage = storage;
this._closeCallback = closeCallback; this._closeCallback = closeCallback;
@ -50,7 +50,6 @@ export class Timeline {
/** Only used to decrypt non-persisted context entries fetched from the homeserver */ /** Only used to decrypt non-persisted context entries fetched from the homeserver */
this._decryptEntries = null; this._decryptEntries = null;
this._hsApi = hsApi; this._hsApi = hsApi;
this._ignoreMissingEvents = ignoreMissingEvents || false;
this.initializePowerLevels(powerLevelsObservable); this.initializePowerLevels(powerLevelsObservable);
} }
@ -322,18 +321,18 @@ export class Timeline {
if (!entry.contextEventId) { if (!entry.contextEventId) {
continue; continue;
} }
const contextEventId = entry.contextEventId; const id = entry.contextEventId;
// before looking into remoteEntries, check the entries // before looking into remoteEntries, check the entries
// that about to be added first // that about to be added first
let contextEvent = entries.find(e => e.id === contextEventId); let contextEvent = entries.find(e => e.id === id);
if (!contextEvent) { if (!contextEvent) {
contextEvent = this._findLoadedEventById(contextEventId); contextEvent = this._findLoadedEventById(id);
} }
if (contextEvent) { if (contextEvent) {
entry.setContextEntry(contextEvent); entry.setContextEntry(contextEvent);
// we don't emit an update here, as the add or update // we don't emit an update here, as the add or update
// that the callee will emit hasn't been emitted yet. // that the callee will emit hasn't been emitted yet.
} else if(!this._ignoreMissingEvents) { } else {
// we don't await here, which is not ideal, // we don't await here, which is not ideal,
// but one of our callers, addEntries, is not async // but one of our callers, addEntries, is not async
// so there is not much point. // so there is not much point.