fix tombstone replacement room open previous room (#1856)

cinnyapp · Jul 30, 2024 · e54bb2e · e54bb2e
1 parent 5058136
commit e54bb2e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/app/utils/matrix.ts b/src/app/utils/matrix.ts
@@ -33,7 +33,13 @@ export const isRoomId = (id: string): boolean => validMxId(id) && id.startsWith(
 export const isRoomAlias = (id: string): boolean => validMxId(id) && id.startsWith('#');
 
 export const getCanonicalAliasRoomId = (mx: MatrixClient, alias: string): string | undefined =>
-  mx.getRooms()?.find((room) => room.getCanonicalAlias() === alias)?.roomId;
+  mx
+    .getRooms()
+    ?.find(
+      (room) =>
+        room.getCanonicalAlias() === alias &&
+        getStateEvent(room, StateEvent.RoomTombstone) === undefined
+    )?.roomId;
 
 export const getCanonicalAliasOrRoomId = (mx: MatrixClient, roomId: string): string => {
   const room = mx.getRoom(roomId);