sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make /api/v1/instance and /api/v1/custom_emojis better (#3118)

Browse Source 
* Separate commits

From commit dca110ebaa.

* Re-separate commits

From commit 9719387bee.
This commit is contained in:
Acid Chicken (硫酸鶏)
2018-11-05 11:57:17 +09:00
committed by syuilo
parent 712802e682
commit 0d23ce3d45
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/api/mastodon.ts
View File

@ -5,17 +5,18 @@ import config from '../../config';
import Meta from '../../models/meta';
import { ObjectID } from 'bson';
import Emoji from '../../models/emoji';
import { toMastodonEmojis } from '../../models/mastodon/emoji';
const pkg = require('../../../package.json');
// Init router
const router = new Router();
router.get('/v1/custom_emojis', async ctx => ctx.body =
await Emoji.find({ host: null }, {
(await Emoji.find({ host: null }, {
fields: {
_id: false
}
}));
})).map(toMastodonEmojis));
router.get('/v1/instance', async ctx => { // TODO: This is a temporary implementation. Consider creating helper methods!
const meta = await Meta.findOne() || {};
@ -40,6 +41,11 @@ router.get('/v1/instance', async ctx => { // TODO: This is a temporary implement
notesCount: 0
};
const acct = maintainer.host ? `${maintainer.username}@${maintainer.host}` : maintainer.username;
const emojis = (await Emoji.find({ host: null }, {
fields: {
_id: false
}
})).map(toMastodonEmojis);
ctx.body = {
uri: config.hostname,
@ -79,7 +85,7 @@ router.get('/v1/instance', async ctx => { // TODO: This is a temporary implement
followers_count: maintainer.followersCount,
following_count: maintainer.followingCount,
statuses_count: maintainer.notesCount,
emojis: [],
emojis: emojis,
moved: null,
fields: null
}