From e92ac6715241eaf94063fb36b3325ffcb56e7f42 Mon Sep 17 00:00:00 2001
From: Simon Merrick <simon.merrick@outlook.co.nz>
Date: Sat, 28 Nov 2020 21:50:51 +1300
Subject: [PATCH] Use room alias in generated permalink for rooms

Signed-off-by: Simon Merrick <s.m3rrick@gmail.com>
---
 src/utils/permalinks/Permalinks.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/utils/permalinks/Permalinks.js b/src/utils/permalinks/Permalinks.js
index 0f54bcce05..2f673e0346 100644
--- a/src/utils/permalinks/Permalinks.js
+++ b/src/utils/permalinks/Permalinks.js
@@ -130,7 +130,13 @@ export class RoomPermalinkCreator {
     }
 
     forRoom() {
-        return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
+        try {
+            // Prefer to use canonical alias for permalink if possible
+            const alias = this._room.getCanonicalAlias();
+            return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
+        } catch (error) {
+            return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
+        }
     }
 
     onRoomState(event) {