chore: do not use fuzzy match for emojiComplete (misskey-dev#13384)

cheery-picked from anatawa12/misskey@47c4a6e * fix code quality issues Co-authored-by: anatawa12 <anatawa12@icloud.com>
MisskeyIO · Mar 30, 2024 · 11f3d5d · 11f3d5d
1 parent 70538fd
commit 11f3d5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
@@ -281,13 +281,7 @@ function exec() {
 
 		emojis.value = searchEmoji(props.q, emojiDb.value);
 	} else if (props.type === 'emojiComplete') {
-		if (!props.q || props.q === '') {
-			// 最近使った絵文字をサジェスト
-			emojis.value = defaultStore.state.recentlyUsedEmojis.map(emoji => unicodeEmojiDB.value.find(dbEmoji => dbEmoji.emoji === emoji)).filter(x => x) as EmojiDef[];
-			return;
-		}
-
-		emojis.value = searchEmoji(props.q, unicodeEmojiDB.value);
+		emojis.value = searchEmoji(props.q, unicodeEmojiDB.value, true);
 	} else if (props.type === 'mfmTag') {
 		if (!props.q || props.q === '') {
 			mfmTags.value = MFM_TAGS;

diff --git a/packages/frontend/src/scripts/search-emoji.ts b/packages/frontend/src/scripts/search-emoji.ts
@@ -16,7 +16,7 @@ export type EmojiDef = {
 };
 type EmojiScore = { emoji: EmojiDef, score: number };
 
-export function searchEmoji(query: string | null, emojiDb: EmojiDef[], max = 30): EmojiDef[] {
+export function searchEmoji(query: string | null, emojiDb: EmojiDef[], exact = false, max = 30): EmojiDef[] {
 	if (!query) {
 		return [];
 	}
@@ -40,6 +40,13 @@ export function searchEmoji(query: string | null, emojiDb: EmojiDef[], max = 30)
 		});
 	}
 
+	if (exact) {
+		return [...matched.values()]
+			.sort((x, y) => y.score - x.score)
+			.slice(0, max)
+			.map(it => it.emoji);
+	}
+
 	// 前方一致（エイリアスなし）
 	if (matched.size < max) {
 		emojiDb.some(x => {