Check for via servers before trying to join room in policy list manag…

…er (#514)
matrix-org · Jul 24, 2024 · 6a227c8 · 6a227c8
1 parent 2f6120e
commit 6a227c8
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/models/PolicyList.ts b/src/models/PolicyList.ts
@@ -658,9 +658,19 @@ export class PolicyListManager {
         const permalink = Permalinks.parseUrl(roomRef);
         if (!permalink.roomIdOrAlias) return null;
 
-        const roomId = await this.mjolnir.client.resolveRoom(permalink.roomIdOrAlias);
+        let roomId: string;
+        let viaServers;
+        if (permalink.roomIdOrAlias.startsWith("!")) {
+            roomId = permalink.roomIdOrAlias
+            viaServers = permalink.viaServers
+        } else {
+            const roomInfo = await this.mjolnir.client.lookupRoomAlias(permalink.roomIdOrAlias)
+            roomId = roomInfo.roomId
+            viaServers = roomInfo.residentServers
+        }
+
         if (!joinedRooms.includes(roomId)) {
-            await this.mjolnir.client.joinRoom(roomId, permalink.viaServers);
+            await this.mjolnir.client.joinRoom(roomId, viaServers);
         }
 
         if (this.policyLists.find(b => b.roomId === roomId)) {