Skip to content

Fix joinRoom failing when the roomviewstore state changes. #34180

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

Open
Half-Shot wants to merge 2 commits into
base: develop
Choose a base branch
from
+28 −14
Open

Fix joinRoom failing when the roomviewstore state changes. #34180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
013bda5
Fix joinRoom failing when the roomviewstore state changes.
Half-Shot Jul 8, 2026
ecfa5c8
drive by type fix
Half-Shot Jul 8, 2026
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
42 changes: 28 additions & 14 deletions apps/web/src/stores/RoomViewStore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ export class RoomViewStore extends EventEmitter {
// another RVS via INITIAL_STATE as they share the same underlying object. Mostly relevant for tests.
private state = utils.deepCopy(INITIAL_STATE);

private dis?: MatrixDispatcher;
// this is defacto always assigned as `resetDispatcher` is called in the constructor.
private dis!: MatrixDispatcher;
private dispatchToken?: string;

public constructor(
Expand Down Expand Up @@ -195,7 +196,7 @@ export class RoomViewStore extends EventEmitter {

// Fired so we can reduce dependency on event emitters to this store, which is relatively
// central to the application and can easily cause import cycles.
this.dis?.dispatch<ActiveRoomChangedPayload>({
this.dis.dispatch<ActiveRoomChangedPayload>({
action: Action.ActiveRoomChanged,
oldRoomId: lastRoomId,
newRoomId: this.state.roomId,
Expand Down Expand Up @@ -302,7 +303,7 @@ export class RoomViewStore extends EventEmitter {
// if the room is displayed in a module, we don't want to change the room view
if (roomId && this.isRoomDisplayedInModule(roomId)) return;

this.dis?.dispatch<ViewRoomPayload>({
this.dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
room_id: payload.event.getRoomId(),
replyingToEvent: payload.event,
Expand Down Expand Up @@ -415,7 +416,7 @@ export class RoomViewStore extends EventEmitter {
await this.stores.slidingSyncManager.setRoomVisible(payload.room_id);

// Re-fire the payload: we won't re-process it because the prev room ID == payload room ID now
this.dis?.dispatch({
this.dis.dispatch({
...payload,
});
return;
Expand Down Expand Up @@ -466,7 +467,7 @@ export class RoomViewStore extends EventEmitter {
viaServers: payload.via_servers,
};
}
this.dis?.dispatch<JoinRoomPayload>(joinPayload);
this.dis.dispatch<JoinRoomPayload>(joinPayload);
}

if (room) {
Expand Down Expand Up @@ -505,7 +506,7 @@ export class RoomViewStore extends EventEmitter {
viaServers = result.servers;
} catch (err) {
logger.error("RVS failed to get room id for alias: ", err);
this.dis?.dispatch<ViewRoomErrorPayload>({
this.dis.dispatch<ViewRoomErrorPayload>({
action: Action.ViewRoomError,
room_id: null,
room_alias: payload.room_alias,
Expand All @@ -516,7 +517,7 @@ export class RoomViewStore extends EventEmitter {
}

// Re-fire the payload with the newly found room_id
this.dis?.dispatch({
this.dis.dispatch({
...payload,
room_id: roomId,
via_servers: viaServers,
Expand Down Expand Up @@ -545,9 +546,22 @@ export class RoomViewStore extends EventEmitter {
});

// take a copy of roomAlias, roomId & viaServers as they may change by the time the join is complete
const { roomAlias, roomId = payload.roomId, viaServers = [] } = this.state;
const { roomAlias, viaServers = [] } = this.state;
// fall back to the payload's roomId explicitly since it is always the room we were asked to join
const roomId = this.state.roomId ?? payload.roomId;
// prefer the room alias if we have one as it allows joining over federation even with no viaServers
const address = roomAlias || roomId!;
const address = roomAlias || roomId;

if (!address) {
logger.error("Cannot join room: no room ID or alias to join", payload);
this.dis.dispatch<JoinRoomErrorPayload>({
action: Action.JoinRoomError,
roomId,
err: new UserFriendlyError("room|error_join_unknown", { cause: undefined }),
canAskToJoin: payload.canAskToJoin,
});
return;
}

const joinOpts: IJoinRoomOpts = {
viaServers,
Expand All @@ -568,22 +582,22 @@ export class RoomViewStore extends EventEmitter {
// We do *not* clear the 'joining' flag because the Room object and/or our 'joined' member event may not
// have come down the sync stream yet, and that's the point at which we'd consider the user joined to the
// room.
this.dis?.dispatch<JoinRoomReadyPayload>({
this.dis.dispatch<JoinRoomReadyPayload>({
action: Action.JoinRoomReady,
roomId: roomId!,
roomId,
metricsTrigger: payload.metricsTrigger,
});
} catch (err) {
logger.error("Error thrown while handling joinRoom", err);
this.dis?.dispatch<JoinRoomErrorPayload>({
this.dis.dispatch<JoinRoomErrorPayload>({
action: Action.JoinRoomError,
roomId,
err: err instanceof Error ? err : new UserFriendlyError("room|error_join_unknown", { cause: err }),
canAskToJoin: payload.canAskToJoin,
});

if (payload.canAskToJoin && err instanceof MatrixError && err.httpStatus === 403) {
this.dis?.dispatch({ action: Action.PromptAskToJoin });
this.dis.dispatch({ action: Action.PromptAskToJoin });
}
}
}
Expand Down Expand Up @@ -665,7 +679,7 @@ export class RoomViewStore extends EventEmitter {
*/
public resetDispatcher(dis: MatrixDispatcher): void {
if (this.dispatchToken) {
this.dis?.unregister(this.dispatchToken);
this.dis.unregister(this.dispatchToken);
}
this.dis = dis;
if (dis) {
Expand Down
Loading