From 80b5fda292efd70cc749910e3672d50c9a70a72e Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 2 Nov 2018 08:59:40 +0900
Subject:  Remote custom emojis  (#3074)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remote custom emojis

* んほおおおおお
---
 src/server/api/endpoints/meta.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/server')

diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index 8bc0293832..87b6774b23 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -2,6 +2,7 @@ import * as os from 'os';
 import config from '../../../config';
 import Meta from '../../../models/meta';
 import { ILocalUser } from '../../../models/user';
+import Emoji from '../../../models/emoji';
 
 const pkg = require('../../../../package.json');
 const client = require('../../../../built/client/meta.json');
@@ -22,6 +23,8 @@ export const meta = {
 export default (params: any, me: ILocalUser) => new Promise(async (res, rej) => {
 	const meta: any = (await Meta.findOne()) || {};
 
+	const emojis = await Emoji.find({ host: null });
+
 	res({
 		maintainer: config.maintainer,
 
@@ -50,7 +53,7 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
 		hidedTags: (me && me.isAdmin) ? meta.hidedTags : undefined,
 		bannerUrl: meta.bannerUrl,
 		maxNoteTextLength: config.maxNoteTextLength,
-		emojis: meta.emojis,
+		emojis: emojis,
 
 		features: {
 			registration: !meta.disableRegistration,
-- 
cgit v1.2.3-freya