matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Skip processing thread roots and fetching threads list when support is disabled (#3642)

Browse Source 
* Skip processing thread roots and fetching threads list when support is disabled

* Enable threads support in tests
This commit is contained in:
Michael Telatynski
2023-07-31 19:16:42 +01:00
committed by GitHub
parent 21b3471453
commit 88ba4fad71
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/integ/matrix-client-event-timeline.spec.ts
View File

@@ -207,7 +207,7 @@ function startClient(httpBackend: HttpBackend, client: MatrixClient) {
httpBackend.when("POST", "/filter").respond(200, { filter_id: "fid" }); httpBackend.when("POST", "/filter").respond(200, { filter_id: "fid" });
httpBackend.when("GET", "/sync").respond(200, INITIAL_SYNC_DATA); httpBackend.when("GET", "/sync").respond(200, INITIAL_SYNC_DATA);
client.startClient(); client.startClient({ threadSupport: true });
// set up a promise which will resolve once the client is initialised // set up a promise which will resolve once the client is initialised
const prom = new Promise<void>((resolve) => { const prom = new Promise<void>((resolve) => {

1
src/client.ts
View File

@@ -9771,6 +9771,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
* @param toStartOfTimeline - the direction * @param toStartOfTimeline - the direction
*/ */
public processThreadRoots(room: Room, threadedEvents: MatrixEvent[], toStartOfTimeline: boolean): void { public processThreadRoots(room: Room, threadedEvents: MatrixEvent[], toStartOfTimeline: boolean): void {
if (!this.supportsThreads()) return;
room.processThreadRoots(threadedEvents, toStartOfTimeline); room.processThreadRoots(threadedEvents, toStartOfTimeline);
} }

2
src/models/room.ts
View File

@@ -1877,6 +1877,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
* Takes the given thread root events and creates threads for them. * Takes the given thread root events and creates threads for them.
*/ */
public processThreadRoots(events: MatrixEvent[], toStartOfTimeline: boolean): void { public processThreadRoots(events: MatrixEvent[], toStartOfTimeline: boolean): void {
if (!this.client.supportsThreads()) return;
for (const rootEvent of events) { for (const rootEvent of events) {
EventTimeline.setEventMetadata(rootEvent, this.currentState, toStartOfTimeline); EventTimeline.setEventMetadata(rootEvent, this.currentState, toStartOfTimeline);
if (!this.getThread(rootEvent.getId()!)) { if (!this.getThread(rootEvent.getId()!)) {
@@ -2031,6 +2032,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
* @internal * @internal
*/ */
private async fetchRoomThreadList(filter?: ThreadFilterType): Promise<void> { private async fetchRoomThreadList(filter?: ThreadFilterType): Promise<void> {
if (!this.client.supportsThreads()) return;
if (this.threadsTimelineSets.length === 0) return; if (this.threadsTimelineSets.length === 0) return;
const timelineSet = filter === ThreadFilterType.My ? this.threadsTimelineSets[1] : this.threadsTimelineSets[0]; const timelineSet = filter === ThreadFilterType.My ? this.threadsTimelineSets[1] : this.threadsTimelineSets[0];