From 1f1417a0f7505276af8d4b5d81edb44c7648b499 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <nekomanma@pixiv.co.jp>
Date: Sun, 1 Apr 2018 19:18:36 +0900
Subject: Implement outbox

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

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

diff --git a/src/server/activitypub/user.ts b/src/server/activitypub/user.ts
index ef365c2078..d43a9793d4 100644
--- a/src/server/activitypub/user.ts
+++ b/src/server/activitypub/user.ts
@@ -1,9 +1,9 @@
 import * as express from 'express';
 import config from '../../conf';
-import { extractPublic } from '../../crypto_key';
-import context from '../../common/remote/activitypub/context';
+import context from '../../common/remote/activitypub/renderer/context';
+import render from '../../common/remote/activitypub/renderer/person';
 import parseAcct from '../../common/user/parse-acct';
-import User, { ILocalAccount } from '../../models/user';
+import User from '../../models/user';
 
 const app = express();
 app.disable('x-powered-by');
@@ -27,34 +27,14 @@ app.get('/@:user', async (req, res, next) => {
 		return res.sendStatus(404);
 	}
 
-	const id = `${config.url}/@${user.username}`;
-
 	if (username !== user.username) {
-		return res.redirect(id);
+		return res.redirect(`${config.url}/@${user.username}`);
 	}
 
-	res.json({
-		'@context': context,
-		type: 'Person',
-		id,
-		inbox: `${id}/inbox`,
-		preferredUsername: user.username,
-		name: user.name,
-		summary: user.description,
-		icon: user.avatarId && {
-			type: 'Image',
-			url: `${config.drive_url}/${user.avatarId}`
-		},
-		image: user.bannerId && {
-			type: 'Image',
-			url: `${config.drive_url}/${user.bannerId}`
-		},
-		publicKey: {
-			type: 'Key',
-			owner: id,
-			publicKeyPem: extractPublic((user.account as ILocalAccount).keypair)
-		}
-	});
+	const rendered = render(user);
+	rendered['@context'] = context;
+
+	res.json(rendered);
 });
 
 export default app;
-- 
cgit v1.2.3-freya