matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Fix RoomView ignoring alias lookup errors due to them not knowing the roomId (#11099)

Browse Source
This commit is contained in:
Michael Telatynski
2023-06-19 17:08:16 +01:00
committed by GitHub
parent 889318d3a2
commit a491795aa7
3 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,7 +519,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
/**
* Removes the Jitsi widget from the current user if
* - Multiple Jitsi widgets have been added within {@link PREVENT_MULTIPLE_JITSI_WITHIN}
* - The last (server timestamp) of these widgets is from the currrent user
* - The last (server timestamp) of these widgets is from the current user
* This solves the issue if some people decide to start a conference and click the call button at the same time.
*/
private doMaybeRemoveOwnJitsiWidget(): void {
@@ -592,7 +592,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
return;
}
if (!initial && this.state.roomId !== this.context.roomViewStore.getRoomId()) {
const roomLoadError = this.context.roomViewStore.getRoomLoadError() ?? undefined;
if (!initial && !roomLoadError && this.state.roomId !== this.context.roomViewStore.getRoomId()) {
// RoomView explicitly does not support changing what room
// is being viewed: instead it should just be re-mounted when
// switching rooms. Therefore, if the room ID changes, we
@@ -614,7 +615,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
roomId: roomId ?? undefined,
roomAlias: this.context.roomViewStore.getRoomAlias() ?? undefined,
roomLoading: this.context.roomViewStore.isRoomLoading(),
roomLoadError: this.context.roomViewStore.getRoomLoadError() ?? undefined,
roomLoadError,
joining: this.context.roomViewStore.isJoining(),
replyToEvent: this.context.roomViewStore.getQuotingEvent() ?? undefined,
// we should only peek once we have a ready client