From 5c44c75c237be7ebfad07dc7d43566e0ec62a010 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Wed, 16 Oct 2019 04:03:18 +0900
Subject: Fix #5504 など (#5507)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* カスタム絵文字を重複登録できないように

* fix

* fix
---
 src/server/api/endpoints/admin/emoji/remove.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/server/api/endpoints/admin/emoji/remove.ts')

diff --git a/src/server/api/endpoints/admin/emoji/remove.ts b/src/server/api/endpoints/admin/emoji/remove.ts
index 92c5f5f8c6..a591d4c3dd 100644
--- a/src/server/api/endpoints/admin/emoji/remove.ts
+++ b/src/server/api/endpoints/admin/emoji/remove.ts
@@ -4,6 +4,7 @@ import { ID } from '../../../../../misc/cafy-id';
 import { Emojis } from '../../../../../models';
 import { getConnection } from 'typeorm';
 import { insertModerationLog } from '../../../../../services/insert-moderation-log';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	desc: {
@@ -19,13 +20,21 @@ export const meta = {
 		id: {
 			validator: $.type(ID)
 		}
+	},
+
+	errors: {
+		noSuchEmoji: {
+			message: 'No such emoji.',
+			code: 'NO_SUCH_EMOJI',
+			id: 'be83669b-773a-44b7-b1f8-e5e5170ac3c2'
+		}
 	}
 };
 
 export default define(meta, async (ps, me) => {
 	const emoji = await Emojis.findOne(ps.id);
 
-	if (emoji == null) throw new Error('emoji not found');
+	if (emoji == null) throw new ApiError(meta.errors.noSuchEmoji);
 
 	await Emojis.delete(emoji.id);
 
-- 
cgit v1.2.3-freya