PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4096 from matrix-org/bwindels/canonicalpill

Browse source 
Accept canonical alias for pills
This commit is contained in:
Bruno Windels 2020-02-20 17:07:54 +00:00 committed by GitHub
commit 744826db48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/elements/Pill.js
View file

@ -128,7 +128,8 @@ const Pill = createReactClass({
case Pill.TYPE_ROOM_MENTION: { case Pill.TYPE_ROOM_MENTION: {
const localRoom = resourceId[0] === '#' ? const localRoom = resourceId[0] === '#' ?
MatrixClientPeg.get().getRooms().find((r) => { MatrixClientPeg.get().getRooms().find((r) => {
return r.getAliases().includes(resourceId); return r.getCanonicalAlias() === resourceId ||
r.getAliases().includes(resourceId);
}) : MatrixClientPeg.get().getRoom(resourceId); }) : MatrixClientPeg.get().getRoom(resourceId);
room = localRoom; room = localRoom;
if (!localRoom) { if (!localRoom) {