OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Stop tracking threads if threads support is disabled (#8308)

pull/21833/head
Michael Telatynski 2022-04-13 16:41:40 +01:00 committed by GitHub
parent a59f889f79
commit d151365fd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/structures/RoomView.tsx
View File

@ -1395,15 +1395,17 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
return b.length - a.length; return b.length - a.length;
}); });
// Process all thread roots returned in this batch of search results if (this.context.supportsExperimentalThreads()) {
// XXX: This won't work for results coming from Seshat which won't include the bundled relationship // Process all thread roots returned in this batch of search results
for (const result of results.results) { // XXX: This won't work for results coming from Seshat which won't include the bundled relationship
for (const event of result.context.getTimeline()) { for (const result of results.results) {
const bundledRelationship = event for (const event of result.context.getTimeline()) {
.getServerAggregatedRelation<IThreadBundledRelationship>(THREAD_RELATION_TYPE.name); const bundledRelationship = event
if (!bundledRelationship || event.getThread()) continue; .getServerAggregatedRelation<IThreadBundledRelationship>(THREAD_RELATION_TYPE.name);
const room = this.context.getRoom(event.getRoomId()); if (!bundledRelationship || event.getThread()) continue;
event.setThread(room.findThreadForEvent(event) ?? room.createThread(event, [], true)); const room = this.context.getRoom(event.getRoomId());
event.setThread(room.findThreadForEvent(event) ?? room.createThread(event, [], true));
}
} }
} }

2
src/utils/EventUtils.ts
View File

@ -217,7 +217,7 @@ export async function fetchInitialEvent(
initialEvent = null; initialEvent = null;
} }
if (initialEvent?.isThreadRelation) { if (initialEvent?.isThreadRelation && client.supportsExperimentalThreads()) {
try { try {
const rootEventData = await client.fetchRoomEvent(roomId, initialEvent.threadRootId); const rootEventData = await client.fetchRoomEvent(roomId, initialEvent.threadRootId);
const rootEvent = new MatrixEvent(rootEventData); const rootEvent = new MatrixEvent(rootEventData);