fix tombstone replacement room open previous room (#1856)

diff --git a/src/app/utils/matrix.ts b/src/app/utils/matrix.ts
index f837ed459c71ef304248d20806573251b5ded581..8613f36abe33856c5772743d5f9f86b15883fd1e 100644 (file)
--- 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);