OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4768 from matrix-org/travis/room-list/better-filter 

Match new room list's text search to old room list
pull/21833/head
Travis Ralston 2020-06-15 20:28:31 -06:00 committed by GitHub
parent b499bd021a f8828014f1
commit 4a74baf99d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/stores/room-list/filters/NameFilterCondition.ts
View File

@ -17,6 +17,7 @@ limitations under the License.
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition"; import { FILTER_CHANGED, FilterPriority, IFilterCondition } from "./IFilterCondition";
import { EventEmitter } from "events"; import { EventEmitter } from "events";
import { removeHiddenChars } from "matrix-js-sdk/src/utils";
/** /**
* A filter condition for the room list which reveals rooms of a particular * A filter condition for the room list which reveals rooms of a particular
@ -45,7 +46,16 @@ export class NameFilterCondition extends EventEmitter implements IFilterConditio
} }
public isVisible(room: Room): boolean { public isVisible(room: Room): boolean {
// TODO: Improve this filter to include aliases and such const lcFilter = this.search.toLowerCase();
return room.name.toLowerCase().indexOf(this.search.toLowerCase()) >= 0; if (this.search[0] === '#') {
// Try and find rooms by alias
if (room.getCanonicalAlias() && room.getCanonicalAlias().toLowerCase().startsWith(lcFilter)) {
return true;
}
if (room.getAltAliases().some(a => a.toLowerCase().startsWith(lcFilter))) {
return true;
}
}
return room.name && removeHiddenChars(room.name).toLowerCase().includes(lcFilter);
} }
} }