fix: restore rooms and DMs after React Router 7 upgrade
Stop double-encoding Matrix IDs in pathUtils, decode route params on read, fix millify CJS import, and read space children from currentState so channels and joins work again.
This commit is contained in:
@@ -1,15 +1,17 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useMatrixClient } from './useMatrixClient';
|
||||
|
||||
import { decodeRouteParam } from '../pages/pathUtils';
|
||||
import { getCanonicalAliasRoomId, isRoomAlias } from '../utils/matrix';
|
||||
|
||||
export const useJoinedRoomId = (allRooms: string[], roomIdOrAlias: string): string | undefined => {
|
||||
const mx = useMatrixClient();
|
||||
|
||||
const joinedRoomId = useMemo(() => {
|
||||
const roomId = isRoomAlias(roomIdOrAlias)
|
||||
? getCanonicalAliasRoomId(mx, roomIdOrAlias)
|
||||
: roomIdOrAlias;
|
||||
const decoded = decodeRouteParam(roomIdOrAlias) ?? roomIdOrAlias;
|
||||
const roomId = isRoomAlias(decoded)
|
||||
? getCanonicalAliasRoomId(mx, decoded)
|
||||
: decoded;
|
||||
|
||||
if (roomId && allRooms.includes(roomId)) return roomId;
|
||||
return undefined;
|
||||
|
||||
Reference in New Issue
Block a user