Port matrix-org#2283 to release (matrix-org#2284)

Germain · web-flow · commit 872033a5522d · 2022-04-08T10:34:09.000+01:00
diff --git a/src/client.ts b/src/client.ts
@@ -5447,9 +5447,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
                 }
 
                 const timelineSet = eventTimeline.getTimelineSet();
-                const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(timelineSet.room, matrixEvents);
-                timelineSet.addEventsToTimeline(timelineEvents, backwards, eventTimeline, token);
-                await this.processThreadEvents(timelineSet.room, threadedEvents, backwards);
+                timelineSet.addEventsToTimeline(matrixEvents, backwards, eventTimeline, token);
 
                 // if we've hit the end of the timeline, we need to stop trying to
                 // paginate. We need to keep the 'forwards' token though, to make sure

Original file line number	Diff line number	Diff line change
`@@ -5447,9 +5447,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa`
`5447`	`5447`	`}`
`5448`	`5448`
`5449`	`5449`	`const timelineSet = eventTimeline.getTimelineSet();`
`5450`		`- const [timelineEvents, threadedEvents] = this.partitionThreadedEvents(timelineSet.room, matrixEvents);`
`5451`		`- timelineSet.addEventsToTimeline(timelineEvents, backwards, eventTimeline, token);`
`5452`		`- await this.processThreadEvents(timelineSet.room, threadedEvents, backwards);`
	`5450`	`+ timelineSet.addEventsToTimeline(matrixEvents, backwards, eventTimeline, token);`
`5453`	`5451`
`5454`	`5452`	`// if we've hit the end of the timeline, we need to stop trying to`
`5455`	`5453`	`// paginate. We need to keep the 'forwards' token though, to make sure`