From e63f884bc6ba89902e2efd20f1c6d8939f7c4270 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 8 Apr 2018 15:15:22 +0900
Subject: Use id in uri instead of username

---
 src/server/activitypub/user.ts | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/server/activitypub/user.ts')

diff --git a/src/server/activitypub/user.ts b/src/server/activitypub/user.ts
index f054974510..9e98e92b6a 100644
--- a/src/server/activitypub/user.ts
+++ b/src/server/activitypub/user.ts
@@ -1,26 +1,19 @@
 import * as express from 'express';
-import config from '../../config';
 import context from '../../remote/activitypub/renderer/context';
 import render from '../../remote/activitypub/renderer/person';
-import withUser from './with-user';
+import User from '../../models/user';
 
-const respond = withUser(username => `${config.url}/@${username}`, (user, req, res) => {
-	const rendered = render(user);
-	rendered['@context'] = context;
+const app = express.Router();
 
-	res.json(rendered);
-});
+app.get('/users/:user', async (req, res) => {
+	const userId = req.params.user;
 
-const app = express.Router();
+	const user = await User.findOne({ _id: userId });
 
-app.get('/@:user', (req, res, next) => {
-	const accepted = req.accepts(['html', 'application/activity+json', 'application/ld+json']);
+	const rendered = render(user);
+	rendered['@context'] = context;
 
-	if ((['application/activity+json', 'application/ld+json'] as any[]).includes(accepted)) {
-		respond(req, res, next);
-	} else {
-		next();
-	}
+	res.json(rendered);
 });
 
 export default app;
-- 
cgit v1.2.3-freya