Separate commits

Flash Back 90's
This commit is contained in:
Acid Chicken (硫酸鶏) 2018-11-05 11:39:13 +09:00
parent 136f23c7ad
commit dca110ebaa

View file

@ -5,18 +5,17 @@ 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'; import Emoji from '../../models/emoji';
import { toMastodonEmojis } from '../../models/mastodon/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 }, { await Emoji.find({ host: null }, {
fields: { fields: {
_id: false _id: false
} }
})).map(toMastodonEmojis)); }));
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() || {};
@ -41,11 +40,6 @@ router.get('/v1/instance', async ctx => { // TODO: This is a temporary implement
notesCount: 0 notesCount: 0
}; };
const acct = maintainer.host ? `${maintainer.username}@${maintainer.host}` : maintainer.username; const acct = maintainer.host ? `${maintainer.username}@${maintainer.host}` : maintainer.username;
const emojis = (await Emoji.find({ host: null }, {
fields: {
_id: false
}
})).map(toMastodonEmojis);
ctx.body = { ctx.body = {
uri: config.hostname, uri: config.hostname,
@ -85,7 +79,7 @@ router.get('/v1/instance', async ctx => { // TODO: This is a temporary implement
followers_count: maintainer.followersCount, followers_count: maintainer.followersCount,
following_count: maintainer.followingCount, following_count: maintainer.followingCount,
statuses_count: maintainer.notesCount, statuses_count: maintainer.notesCount,
emojis: emojis, emojis: [],
moved: null, moved: null,
fields: null fields: null
} }