1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-23 17:02:25 +03:00

Merge remote-tracking branch 'origin/develop' into dbkr/gcmerge_26oct22

This commit is contained in:
David Baker
2022-10-26 11:56:41 +01:00
78 changed files with 879 additions and 730 deletions

View File

@@ -475,7 +475,7 @@ export class SlidingSyncSdk {
// this room, then timeline_limit: 50).
const knownEvents = new Set<string>();
room.getLiveTimeline().getEvents().forEach((e) => {
knownEvents.add(e.getId());
knownEvents.add(e.getId()!);
});
// all unknown events BEFORE a known event must be scrollback e.g:
// D E <-- what we know
@@ -490,7 +490,7 @@ export class SlidingSyncSdk {
let seenKnownEvent = false;
for (let i = timelineEvents.length-1; i >= 0; i--) {
const recvEvent = timelineEvents[i];
if (knownEvents.has(recvEvent.getId())) {
if (knownEvents.has(recvEvent.getId()!)) {
seenKnownEvent = true;
continue; // don't include this event, it's a dupe
}