imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix race conditions around threads (#8448)

Browse source
This commit is contained in:
Michael Telatynski 2022-05-03 14:25:08 +01:00 • committed by GitHub
parent 1aaaad2f32
commit f29ef04751
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/utils/EventUtils.ts
View file

@ -217,7 +217,8 @@ export function isVoiceMessage(mxEvent: MatrixEvent): boolean {
export async function fetchInitialEvent(
client: MatrixClient,
roomId: string,
eventId: string): Promise<MatrixEvent | null> {
eventId: string,
): Promise<MatrixEvent | null> {
let initialEvent: MatrixEvent;
try {
@ -228,14 +229,13 @@ export async function fetchInitialEvent(
initialEvent = null;
}
if (initialEvent?.isThreadRelation && client.supportsExperimentalThreads()) {
if (initialEvent?.isThreadRelation && client.supportsExperimentalThreads() && !initialEvent.getThread()) {
const threadId = initialEvent.threadRootId;
const room = client.getRoom(roomId);
try {
const rootEventData = await client.fetchRoomEvent(roomId, initialEvent.threadRootId);
const rootEvent = new MatrixEvent(rootEventData);
const room = client.getRoom(roomId);
room.createThread(rootEvent, [rootEvent], true);
room.createThread(threadId, room.findEventById(threadId), [initialEvent], true);
} catch (e) {
logger.warn("Could not find root event: " + initialEvent.threadRootId);
logger.warn("Could not find root event: " + threadId);
}
}