summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/admin
diff options
context:
space:
mode:
authornenohi <kimutipartylove@gmail.com>2023-04-14 14:49:41 +0900
committerGitHub <noreply@github.com>2023-04-14 14:49:41 +0900
commit9469b26eb25caf89cd9b1919e8ba380c0d33708a (patch)
tree791dbf39f6f572c4c97ac0c492a293983ee45826 /packages/backend/src/server/api/endpoints/admin
parentfix(server): Force the extention of exported file (#10630) (diff)
downloadsharkey-9469b26eb25caf89cd9b1919e8ba380c0d33708a.tar.gz
sharkey-9469b26eb25caf89cd9b1919e8ba380c0d33708a.tar.bz2
sharkey-9469b26eb25caf89cd9b1919e8ba380c0d33708a.zip
カスタム絵文字の検索を絵文字ピッカー使用できるように (#10335)
* fix( #10013) * add changelog * also in about.emojis.vue * fix changelog --------- Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Diffstat (limited to 'packages/backend/src/server/api/endpoints/admin')
-rw-r--r--packages/backend/src/server/api/endpoints/admin/emoji/list.ts16
1 files changed, 11 insertions, 5 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
index 814668294f..4aa4ad82b4 100644
--- 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();