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

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

Browse source
This commit is contained in:
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
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/RoomView.tsx
View file

@ -1395,6 +1395,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
return b.length - a.length; return b.length - a.length;
}); });
if (this.context.supportsExperimentalThreads()) {
// Process all thread roots returned in this batch of search results // Process all thread roots returned in this batch of search results
// XXX: This won't work for results coming from Seshat which won't include the bundled relationship // XXX: This won't work for results coming from Seshat which won't include the bundled relationship
for (const result of results.results) { for (const result of results.results) {
@ -1406,6 +1407,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
event.setThread(room.findThreadForEvent(event) ?? room.createThread(event, [], true)); event.setThread(room.findThreadForEvent(event) ?? room.createThread(event, [], true));
} }
} }
}
this.setState({ this.setState({
searchHighlights: highlights, searchHighlights: highlights,

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);