paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

typeahead: Rework sort_emojis function.

Browse Source 
When `sort_emojis` function was called from emoji_picker
module, the passed arguments did not contain `reaction_type`
field. As a result the first conditional of `is_popular` function
inside `sort_emojis` always failed -- hence the array
`popular_emoji_matches` was always empty`[]`. This compromised
search especially the order of filtered emojis.

Instead of checking for `reaction_type` === "unicode_emoji" -- we
check `is_realm_emoji` field is false. Since `is_realm_emoji`
field in always present and also results in easier types, this
should be prefered over adding `reaction_type` field to the passed
arguments.

Fixes zulip#30439
This commit is contained in:
Varun Singh
2024-06-24 23:54:18 +05:30
committed by Tim Abbott
parent 99a80639f4
commit a7b3dbfdd7
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/shared/src/typeahead.ts
View File

@@ -52,6 +52,11 @@ export type EmojiSuggestion = Emoji & {
type: "emoji";
};
export type BaseEmoji = {emoji_name: string} & (
| {is_realm_emoji: false; emoji_code: string}
| {is_realm_emoji: true; emoji_code?: undefined}
);
export function remove_diacritics(s: string): string {
return s.normalize("NFKD").replace(unicode_marks, "");
}
@@ -314,7 +319,7 @@ export function triage<T>(
};
}
export function sort_emojis<T extends EmojiSuggestion>(objs: T[], query: string): T[] {
export function sort_emojis<T extends BaseEmoji>(objs: T[], query: string): T[] {
// replace spaces with underscores for emoji matching
query = query.replace(/ /g, "_");
query = query.toLowerCase();
@@ -326,11 +331,9 @@ export function sort_emojis<T extends EmojiSuggestion>(objs: T[], query: string)
const popular_set = new Set(popular_emojis);
function is_popular(obj: EmojiSuggestion): boolean {
function is_popular(obj: BaseEmoji): boolean {
return (
obj.reaction_type === "unicode_emoji" &&
popular_set.has(obj.emoji_code) &&
decent_match(obj.emoji_name)
!obj.is_realm_emoji && popular_set.has(obj.emoji_code) && decent_match(obj.emoji_name)
);
}
@@ -364,7 +367,7 @@ export function sort_emojis<T extends EmojiSuggestion>(objs: T[], query: string)
const unicode_emoji_codes = new Set();
const sorted_unique_results: T[] = [];
for (const emoji of sorted_results_with_possible_duplicates) {
if (emoji.reaction_type !== "unicode_emoji") {
if (emoji.is_realm_emoji) {
sorted_unique_results.push(emoji);
} else if (
!unicode_emoji_codes.has(emoji.emoji_code) &&