カスタム絵文字の検索を絵文字ピッカー使用できるように (#10335)

* fix( #10013) * add changelog * also in about.emojis.vue * fix changelog --------- Co-authored-by: tamaina <tamaina@hotmail.co.jp>
misskey-dev · Apr 14, 2023 · 9469b26 · 9469b26
1 parent 168fe0e
commit 9469b26
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -87,12 +87,18 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				//const emojis = await q.take(ps.limit).getMany();
 
 				emojis = await q.getMany();
+				const queryarry = ps.query.match(/\:([a-z0-9_]*)\:/g);
 
-				emojis = emojis.filter(emoji =>
-					emoji.name.includes(ps.query!) ||
-					emoji.aliases.some(a => a.includes(ps.query!)) ||
-					emoji.category?.includes(ps.query!));
-
+				if (queryarry) {
+					emojis = emojis.filter(emoji => 
+						queryarry.includes(`:${emoji.name}:`)
+					);
+				} else {
+					emojis = emojis.filter(emoji =>
+						emoji.name.includes(ps.query!) ||
+						emoji.aliases.some(a => a.includes(ps.query!)) ||
+						emoji.category?.includes(ps.query!));
+				}
 				emojis.splice(ps.limit + 1);
 			} else {
 				emojis = await q.take(ps.limit).getMany();

diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
@@ -53,7 +53,15 @@ function search() {
 	}
 
 	if (selectedTags.size === 0) {
-		searchEmojis = customEmojis.value.filter(emoji => emoji.name.includes(q) || emoji.aliases.includes(q));
+		const queryarry = q.match(/\:([a-z0-9_]*)\:/g);
+
+		if (queryarry) {
+			searchEmojis = customEmojis.value.filter(emoji => 
+				queryarry.includes(`:${emoji.name}:`)
+			);
+		} else {
+			searchEmojis = customEmojis.value.filter(emoji => emoji.name.includes(q) || emoji.aliases.includes(q));
+		}
 	} else {
 		searchEmojis = customEmojis.value.filter(emoji => (emoji.name.includes(q) || emoji.aliases.includes(q)) && [...selectedTags].every(t => emoji.aliases.includes(t)));
 	}