Enhance: Emojiのキャッシュを使用するように

Author: mattyatea

packages/backend/src/server/api/endpoints/emojis.ts

@@ -3,12 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { IsNull } from 'typeorm';
-import { Inject, Injectable } from '@nestjs/common';
-import type { EmojisRepository } from '@/models/_.js';
+import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
+import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { EmojiEntityService } from '@/core/entities/EmojiEntityService.js';
-import { DI } from '@/di-symbols.js';
 
 export const meta = {
 	tags: ['meta'],
@@ -44,21 +42,23 @@ export const paramDef = {
 @Injectable()
 export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
 	constructor(
-		@Inject(DI.emojisRepository)
-		private emojisRepository: EmojisRepository,
-
+		private customEmojiService: CustomEmojiService,
 		private emojiEntityService: EmojiEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const emojis = await this.emojisRepository.find({
-				where: {
-					host: IsNull(),
-				},
-				order: {
-					category: 'ASC',
-					name: 'ASC',
-				},
-			});
+			const emojis = Array.from((await this.customEmojiService.localEmojisCache.fetch()).values())
+				.sort((a, b) => {
+					if (a.category === null && b.category !== null) return 1;
+					if (a.category !== null && b.category === null) return -1;
+					if (a.category !== null && b.category !== null) {
+						if (a.category < b.category) return -1;
+						if (a.category > b.category) return 1;
+					}
+
+					if (a.name < b.name) return -1;
+					if (a.name > b.name) return 1;
+					return 0;
+				});
 
 			return {
 				emojis: await this.emojiEntityService.packSimpleMany(emojis),