Merge pull request #4260 from matrix-org/bwindels/filtercanon-altaliases

Fix: filter room list (again) by canonical and alternative aliases
This commit is contained in:
Bruno Windels 2020-03-23 12:48:03 +00:00 committed by GitHub
commit cef1fd55b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -647,8 +647,13 @@ export default createReactClass({
// case insensitive if room name includes filter,
// or if starts with `#` and one of room's aliases starts with filter
return list.filter((room) => {
if (filter[0] === "#" && room.getAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
return true;
if (filter[0] === "#") {
if (room.getCanonicalAlias() && room.getCanonicalAlias().toLowerCase().startsWith(lcFilter)) {
return true;
}
if (room.getAltAliases().some((alias) => alias.toLowerCase().startsWith(lcFilter))) {
return true;
}
}
return room.name && utils.removeHiddenChars(room.name.toLowerCase()).toLowerCase().includes(fuzzyFilter);
});