diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-05 10:48:51 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-05 10:48:51 +0900 |
| commit | fe46c53ea6defa41e2b750f7d4d9febd14830d32 (patch) | |
| tree | e911b61232cbf133ce5195dcc0b75cfa728a75b0 /src | |
| parent | [doc] specify node version (diff) | |
| parent | Implement /api/v1/custom_emojis (#3116) (diff) | |
| download | sharkey-fe46c53ea6defa41e2b750f7d4d9febd14830d32.tar.gz sharkey-fe46c53ea6defa41e2b750f7d4d9febd14830d32.tar.bz2 sharkey-fe46c53ea6defa41e2b750f7d4d9febd14830d32.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/api/mastodon.ts | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/server/api/mastodon.ts b/src/server/api/mastodon.ts index a5b59e2e0f..33a0b4b5f1 100644 --- a/src/server/api/mastodon.ts +++ b/src/server/api/mastodon.ts @@ -4,12 +4,18 @@ import { toASCII } from 'punycode'; import config from '../../config'; import Meta from '../../models/meta'; import { ObjectID } from 'bson'; +import Emoji from '../../models/emoji'; const pkg = require('../../../package.json'); // Init router const router = new Router(); -router.get('/v1/custom_emojis', async ctx => ctx.body = {}); +router.get('/v1/custom_emojis', async ctx => ctx.body = + await Emoji.find({ host: null }, { + fields: { + _id: false + } + })); router.get('/v1/instance', async ctx => { // TODO: This is a temporary implementation. Consider creating helper methods! const meta = await Meta.findOne() || {}; |