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

2 files changed, 16 insertions, 0 deletions

diff --git a/src/server/api/index.ts b/src/server/api/index.ts
index c68f109ae1..33e98f650a 100644
--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@@ -46,6 +46,8 @@ router.post('/signin', require('./private/signin').default);
 router.use(require('./service/github').routes());
 router.use(require('./service/twitter').routes());
 
+router.use(require('./mastodon').routes());
+
 // Return 404 for unknown API
 router.all('*', async ctx => {
 	ctx.status = 404;
diff --git a/src/server/api/mastodon.ts b/src/server/api/mastodon.ts
new file mode 100644
index 0000000000..f2ce1c384f
--- /dev/null
+++ b/src/server/api/mastodon.ts
@@ -0,0 +1,14 @@
+import * as Router from 'koa-router';
+import User from '../../models/user';
+import { toASCII } from 'punycode';
+
+// Init router
+const router = new Router();
+
+router.get('/v1/instance/peers', async ctx => {
+	const peers = await User.distinct('host', { host: { $ne: null } }) as any as string[];
+	const punyCodes = peers.map(peer => toASCII(peer));
+	ctx.body = punyCodes;
+});
+
+module.exports = router;