diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-11-02 08:59:40 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-02 08:59:40 +0900 |
| commit | 80b5fda292efd70cc749910e3672d50c9a70a72e (patch) | |
| tree | a8f287c9c60a532112801d084fcb7d5b8c4e3650 /src/server/api/endpoints | |
| parent | Fix bug (diff) | |
| download | sharkey-80b5fda292efd70cc749910e3672d50c9a70a72e.tar.gz sharkey-80b5fda292efd70cc749910e3672d50c9a70a72e.tar.bz2 sharkey-80b5fda292efd70cc749910e3672d50c9a70a72e.zip | |
Remote custom emojis (#3074)
* Remote custom emojis
* んほおおおおお
Diffstat (limited to 'src/server/api/endpoints')
| -rw-r--r-- | src/server/api/endpoints/meta.ts | 5 |
1 files changed, 4 insertions, 1 deletions
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, |