Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

filter: Make filter comparison more robust and faster. 

Convert operand to lowercase for case-insensitive operators.
This commit is contained in:
Aman Agrawal 2024-08-07 13:33:51 +00:00 committed by Tim Abbott
parent 1ce9fcdada
commit e956ec0483
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/src/filter.ts
View File

@ -878,12 +878,12 @@ export class Filter {
equals(filter: Filter, excluded_operators?: string[]): boolean {
return _.isEqual(
filter.sorted_terms(excluded_operators),
this.sorted_terms(excluded_operators),
filter.sorted_terms_for_comparison(excluded_operators),
this.sorted_terms_for_comparison(excluded_operators),
);
}
sorted_terms(excluded_operators?: string[]): NarrowTerm[] {
sorted_terms_for_comparison(excluded_operators?: string[]): string[] {
let filter_terms = this._terms;
if (excluded_operators) {
filter_terms = this._terms.filter(
@ -891,11 +891,18 @@ export class Filter {
);
}
return filter_terms.sort((a, b) => {
const a_joined = `${a.negated ? "0" : "1"}-${a.operator}-${a.operand}`;
const b_joined = `${b.negated ? "0" : "1"}-${b.operator}-${b.operand}`;
return util.strcmp(a_joined, b_joined);
});
const sorted_simplified_terms = filter_terms
.map((term) => {
let operand = term.operand;
if (term.operator === "channel" || term.operator === "topic") {
operand = operand.toLowerCase();
}
return `${term.negated ? "0" : "1"}-${term.operator}-${operand}`;
})
.sort(util.strcmp);
return sorted_simplified_terms;
}
predicate(): (message: Message) => boolean {