From 60e95ac2acc61967e7e43e4fcafe6008856f8be9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 2 Nov 2018 14:53:55 +0900
Subject: [PATCH] Clean up

---
 src/models/meta.ts                            | 20 -------------------
 src/server/api/endpoints/admin/update-meta.ts | 11 ----------
 src/server/api/endpoints/meta.ts              |  4 ----
 3 files changed, 35 deletions(-)

diff --git a/src/models/meta.ts b/src/models/meta.ts
index 7ecb4990d4..3c0347485c 100644
--- a/src/models/meta.ts
+++ b/src/models/meta.ts
@@ -15,24 +15,4 @@ export type IMeta = {
 	disableLocalTimeline?: boolean;
 	hidedTags?: string[];
 	bannerUrl?: string;
-
-	/**
-	 * カスタム絵文字定義
-	 */
-	emojis?: {
-		/**
-		 * 絵文字名 (例: thinking_ai)
-		 */
-		name: string;
-
-		/**
-		 * エイリアス
-		 */
-		aliases?: string[];
-
-		/**
-		 * 絵文字画像のURL
-		 */
-		url: string;
-	}[];
 };
diff --git a/src/server/api/endpoints/admin/update-meta.ts b/src/server/api/endpoints/admin/update-meta.ts
index c2bb107f87..fdf03573a1 100644
--- a/src/server/api/endpoints/admin/update-meta.ts
+++ b/src/server/api/endpoints/admin/update-meta.ts
@@ -18,13 +18,6 @@ export const meta = {
 			}
 		},
 
-		emojis: {
-			validator: $.arr($.obj()).optional,
-			desc: {
-				'ja-JP': 'カスタム絵文字定義'
-			}
-		},
-
 		disableRegistration: {
 			validator: $.bool.optional.nullable,
 			desc: {
@@ -62,10 +55,6 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
 		set.broadcasts = ps.broadcasts;
 	}
 
-	if (ps.emojis) {
-		set.emojis = ps.emojis;
-	}
-
 	if (typeof ps.disableRegistration === 'boolean') {
 		set.disableRegistration = ps.disableRegistration;
 	}
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index be42c070ec..a858bc056b 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -2,7 +2,6 @@ import $ from 'cafy';
 import * as os from 'os';
 import config from '../../../config';
 import Meta from '../../../models/meta';
-import Emoji from '../../../models/emoji';
 import define from '../define';
 
 const pkg = require('../../../../package.json');
@@ -29,8 +28,6 @@ export const meta = {
 export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 	const met: any = (await Meta.findOne()) || {};
 
-	const emojis = await Emoji.find({ host: null });
-
 	res({
 		maintainer: config.maintainer,
 
@@ -59,7 +56,6 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		hidedTags: (me && me.isAdmin) ? met.hidedTags : undefined,
 		bannerUrl: met.bannerUrl,
 		maxNoteTextLength: config.maxNoteTextLength,
-		emojis: emojis,
 
 		features: ps.detail ? {
 			registration: !met.disableRegistration,