Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2018-11-05 10:48:51 +09:00
commit fe46c53ea6
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69

View file

@ -4,12 +4,18 @@ import { toASCII } from 'punycode';
import config from '../../config'; import config from '../../config';
import Meta from '../../models/meta'; import Meta from '../../models/meta';
import { ObjectID } from 'bson'; import { ObjectID } from 'bson';
import Emoji from '../../models/emoji';
const pkg = require('../../../package.json'); const pkg = require('../../../package.json');
// Init router // Init router
const router = new 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! router.get('/v1/instance', async ctx => { // TODO: This is a temporary implementation. Consider creating helper methods!
const meta = await Meta.findOne() || {}; const meta = await Meta.findOne() || {};