From a1493113b94fce451a25216d4c3aedd55f10183e Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Wed, 24 Jul 2024 12:55:30 -0700 Subject: [PATCH 1/2] check for via servers before trying to join room --- src/models/PolicyList.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/models/PolicyList.ts b/src/models/PolicyList.ts index ff24a752..4e56978a 100644 --- a/src/models/PolicyList.ts +++ b/src/models/PolicyList.ts @@ -658,9 +658,20 @@ 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)) { From dfcc6a392c8fad0f3751715a9141fe4f9b8d9b09 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Wed, 24 Jul 2024 13:11:42 -0700 Subject: [PATCH 2/2] fix lint --- src/models/PolicyList.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/models/PolicyList.ts b/src/models/PolicyList.ts index 4e56978a..00095042 100644 --- a/src/models/PolicyList.ts +++ b/src/models/PolicyList.ts @@ -663,8 +663,7 @@ export class PolicyListManager { if (permalink.roomIdOrAlias.startsWith("!")) { roomId = permalink.roomIdOrAlias viaServers = permalink.viaServers - } - else { + } else { const roomInfo = await this.mjolnir.client.lookupRoomAlias(permalink.roomIdOrAlias) roomId = roomInfo.roomId viaServers = roomInfo.residentServers