nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #5451 from iokiwi/new/room-alias-in-permalink

Browse Source 
Use room alias in generated permalink for rooms
This commit is contained in:
Travis Ralston
2020-12-09 12:07:44 -07:00
committed by GitHub
parent 560a8412d0 b365d3b27e
commit af69ba9c79
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/permalinks/Permalinks.js
View File

@@ -129,6 +129,17 @@ export class RoomPermalinkCreator {
return getPermalinkConstructor().forEvent(this._roomId, eventId, this._serverCandidates);
}
forShareableRoom() {
if (this._room) {
// Prefer to use canonical alias for permalink if possible
const alias = this._room.getCanonicalAlias();
if (alias) {
return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
}
}
return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
}
forRoom() {
return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
}