From 79354f4fafcf2794d4f9aef2fc523d420c088f8c Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 31 Mar 2020 09:15:04 +0900 Subject: Refactoring --- src/server/api/endpoints/admin/emoji/list-remote.ts | 9 +-------- src/server/api/endpoints/admin/emoji/list.ts | 9 +-------- src/server/api/endpoints/meta.ts | 8 +------- 3 files changed, 3 insertions(+), 23 deletions(-) (limited to 'src/server/api/endpoints') diff --git a/src/server/api/endpoints/admin/emoji/list-remote.ts b/src/server/api/endpoints/admin/emoji/list-remote.ts index fd215ed6fe..7ced4623bb 100644 --- a/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -51,12 +51,5 @@ export default define(meta, async (ps) => { .take(ps.limit!) .getMany(); - return emojis.map(e => ({ - id: e.id, - name: e.name, - category: e.category, - aliases: e.aliases, - host: e.host, - url: e.url - })); + return Emojis.packMany(emojis); }); diff --git a/src/server/api/endpoints/admin/emoji/list.ts b/src/server/api/endpoints/admin/emoji/list.ts index 2b6516a1aa..e3aab4cf7c 100644 --- a/src/server/api/endpoints/admin/emoji/list.ts +++ b/src/server/api/endpoints/admin/emoji/list.ts @@ -36,12 +36,5 @@ export default define(meta, async (ps) => { .take(ps.limit!) .getMany(); - return emojis.map(e => ({ - id: e.id, - name: e.name, - category: e.category, - aliases: e.aliases, - host: e.host, - url: e.url - })); + return Emojis.packMany(emojis); }); diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 0cb6f75f11..280a6fbae6 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -130,13 +130,7 @@ export default define(meta, async (ps, me) => { errorImageUrl: instance.errorImageUrl, iconUrl: instance.iconUrl, maxNoteTextLength: Math.min(instance.maxNoteTextLength, DB_MAX_NOTE_TEXT_LENGTH), - emojis: emojis.map(e => ({ - id: e.id, - aliases: e.aliases, - name: e.name, - category: e.category, - url: e.url, - })), + emojis: await Emojis.packMany(emojis), requireSetup: (await Users.count({ host: null, })) === 0, -- cgit v1.2.3-freya