Do not fail to bridge if a canonical alias doesn't exist

matrix-org · Oct 1, 2020 · f98ae42 · f98ae42
1 parent 643967f
commit f98ae42
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/BaseSlackHandler.ts b/src/BaseSlackHandler.ts
@@ -171,11 +171,14 @@ export abstract class BaseSlackHandler {
             // If we bridge the room, attempt to look up its canonical alias.
             if (room !== undefined) {
                 const client = this.main.botIntent.getClient();
-                const canonical = await client.getStateEvent(room.MatrixRoomId, "m.room.canonical_alias");
-                if (canonical !== undefined && canonical.alias !== undefined) {
-                    text = text.slice(0, match.index) + canonical.alias + text.slice(match.index + match[0].length);
-                } else {
+                try {
+                    const canonical = await client.getStateEvent(room.MatrixRoomId, "m.room.canonical_alias");
+                    if (canonical !== undefined && canonical.alias !== undefined) {
+                        text = text.slice(0, match.index) + canonical.alias + text.slice(match.index + match[0].length);
+                    }
+                } catch (ex) {
                     // If we can't find a canonical alias fall back to just the Slack channel name.
+                    log.debug(`Room ${room.MatrixRoomId} does not have a canonical alias set.`);
                     room = undefined;
                 }
             }