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

Accept canonical alias for pills
2020-02-20 17:07:54 +00:00 · 2020-02-20 17:07:54 +00:00 · 744826db48
parent d324dfaceb fee9c7d21f
commit 744826db48
1 changed files with 2 additions and 1 deletions
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@ -128,7 +128,8 @@ const Pill = createReactClass({
            case Pill.TYPE_ROOM_MENTION: {
                const localRoom = resourceId[0] === '#' ?
                    MatrixClientPeg.get().getRooms().find((r) => {
-                        return r.getAliases().includes(resourceId);
+                        return r.getCanonicalAlias() === resourceId ||
+                               r.getAliases().includes(resourceId);
                    }) : MatrixClientPeg.get().getRoom(resourceId);
                room = localRoom;
                if (!localRoom) {