Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix initial sync fail when event fetching unsuccessful #2150

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Fix initial sync fail when event fetching unsuccessful #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 34 additions & 19 deletions src/models/room.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,13 +1372,24 @@ export class Room extends EventEmitter {
let rootEvent = this.findEventById(event.threadRootId);
// If the rootEvent does not exist in the current sync, then look for
// it over the network
const eventData = await this.client.fetchRoomEvent(this.roomId, event.threadRootId);
if (!rootEvent) {
rootEvent = new MatrixEvent(eventData);
} else {
rootEvent.setUnsigned(eventData.unsigned);
try {
let eventData;
if (event.threadRootId) {
eventData = await this.client.fetchRoomEvent(this.roomId, event.threadRootId);
}

if (!rootEvent) {
rootEvent = new MatrixEvent(eventData);
} else {
rootEvent.setUnsigned(eventData.unsigned);
}
} finally {
// The root event might be not be visible to the person requesting
// it. If it wasn't fetched successfully the thread will work
// in "limited" mode and won't benefit from all the APIs a homeserver
// can provide to enhance the thread experience
thread = this.createThread(rootEvent, events);
}
thread = this.createThread(rootEvent, events);
}

if (event.getUnsigned().transaction_id) {
Expand All @@ -1393,26 +1404,30 @@ export class Room extends EventEmitter {
this.emit(ThreadEvent.Update, thread);
}

public createThread(rootEvent: MatrixEvent, events?: MatrixEvent[]): Thread {
public createThread(rootEvent: MatrixEvent, events?: MatrixEvent[]): Thread | undefined {
const thread = new Thread(rootEvent, {
initialEvents: events,
room: this,
client: this.client,
});
this.threads.set(thread.id, thread);
this.reEmitter.reEmit(thread, [
ThreadEvent.Update,
ThreadEvent.Ready,
"Room.timeline",
"Room.timelineReset",
]);
// If we managed to create a thread and figure out its `id`
// then we can use it
if (thread.id) {
this.threads.set(thread.id, thread);
this.reEmitter.reEmit(thread, [
ThreadEvent.Update,
ThreadEvent.Ready,
"Room.timeline",
"Room.timelineReset",
]);

if (!this.lastThread || this.lastThread.rootEvent.localTimestamp < rootEvent.localTimestamp) {
this.lastThread = thread;
}

if (!this.lastThread || this.lastThread.rootEvent.localTimestamp < rootEvent.localTimestamp) {
this.lastThread = thread;
this.emit(ThreadEvent.New, thread);
return thread;
}

this.emit(ThreadEvent.New, thread);
return thread;
}

/**
Expand Down
28 changes: 16 additions & 12 deletions src/models/thread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {

public initialEventsFetched = false;

public readonly id: string;

constructor(
public readonly rootEvent: MatrixEvent,
public readonly rootEvent: MatrixEvent | undefined,
opts: IThreadOpts,
) {
super();
Expand All @@ -82,6 +84,15 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {
"Room.timelineReset",
]);

// If we weren't able to find the root event, it's probably missing
// and we define the thread ID from one of the thread relation
if (!rootEvent) {
this.id = opts?.initialEvents
?.find(event => event.isThreadRelation)?.relationEventId;
} else {
this.id = rootEvent.getId();
}

opts?.initialEvents?.forEach(event => this.addEvent(event));

this.room.on("Room.localEchoUpdated", this.onEcho);
Expand Down Expand Up @@ -177,9 +188,9 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {
this.emit(ThreadEvent.Update, this);
}

private initialiseThread(rootEvent: MatrixEvent): void {
private initialiseThread(rootEvent: MatrixEvent | undefined): void {
const bundledRelationship = rootEvent
.getServerAggregatedRelation<IThreadBundledRelationship>(RelationType.Thread);
?.getServerAggregatedRelation<IThreadBundledRelationship>(RelationType.Thread);

if (this.hasServerSideSupport && bundledRelationship) {
this.replyCount = bundledRelationship.count;
Expand All @@ -190,7 +201,7 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {
this.lastEvent = event;
}

if (!bundledRelationship) {
if (!bundledRelationship && rootEvent) {
this.addEvent(rootEvent);
}
}
Expand Down Expand Up @@ -229,15 +240,8 @@ export class Thread extends TypedEventEmitter<ThreadEvent> {
}
}

/**
* The thread ID, which is the same as the root event ID
*/
public get id(): string {
return this.rootEvent.getId();
}

public get roomId(): string {
return this.rootEvent.getRoomId();
return this.room.roomId;
}

/**
Expand Down