diff --git a/src/app/hooks/router/useSelectedSpace.ts b/src/app/hooks/router/useSelectedSpace.ts index d140525f..85e09b21 100644 --- a/src/app/hooks/router/useSelectedSpace.ts +++ b/src/app/hooks/router/useSelectedSpace.ts @@ -13,10 +13,7 @@ export const useSelectedSpace = (): string | undefined => { if (!spaceIdOrAlias) return undefined; const spaceId = isRoomAlias(spaceIdOrAlias) - ? ct.rooms.join.read.find( - (roomId) => - roomToAlias.get(roomId) === spaceIdOrAlias && !ct.roomToReplacement.read.has(roomId) - ) + ? ct.rooms.join.read.find((roomId) => roomToAlias.get(roomId) === spaceIdOrAlias) : spaceIdOrAlias; return spaceId; diff --git a/src/client/context.ts b/src/client/context.ts index 7d043cb6..791d3191 100644 --- a/src/client/context.ts +++ b/src/client/context.ts @@ -618,6 +618,11 @@ export const createRoomToAliasObservable = ( const roomToAlias = new Map(); const addAlias = (obj: RoomStateObject) => { + if (state.join.tombstone.read.some((ev) => ev.roomId === obj.roomId)) { + // skip tombstone rooms to prevent multiple rooms having same alias. + // duplicate aliases cause problem finding correct roomId from alias. + return; + } const { content, state_key: stateKey } = obj.event; if ( stateKey === '' && @@ -640,6 +645,7 @@ export const createRoomToAliasObservable = ( state.invite.canonicalAlias, state.knock.canonicalAlias, state.leave.canonicalAlias, + state.join.tombstone, ]); disposer.collect(roomToAliasObservable);