summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2018-11-05 10:45:57 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-11-05 10:45:57 +0900
commita1a3ee44b5c9a3254a33a1948aa79df6dd4dbb0d (patch)
tree22c8fcff74d292d2a13d8a3bbe840a43587f3a8f /src/server
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadsharkey-a1a3ee44b5c9a3254a33a1948aa79df6dd4dbb0d.tar.gz
sharkey-a1a3ee44b5c9a3254a33a1948aa79df6dd4dbb0d.tar.bz2
sharkey-a1a3ee44b5c9a3254a33a1948aa79df6dd4dbb0d.zip
Implement /api/v1/custom_emojis (#3116)
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/mastodon.ts8
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() || {};