Merge branch 'master' into greenkeeper/html-minifier-3.5.13

1 files changed, 40 insertions, 0 deletions

diff --git a/src/server/activitypub/user.ts b/src/server/activitypub/user.ts
new file mode 100644
index 0000000000..d43a9793d4
--- /dev/null
+++ b/src/server/activitypub/user.ts
@@ -0,0 +1,40 @@
+import * as express from 'express';
+import config from '../../conf';
+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 from '../../models/user';
+
+const app = express();
+app.disable('x-powered-by');
+
+app.get('/@:user', async (req, res, next) => {
+	const accepted = req.accepts(['html', 'application/activity+json', 'application/ld+json']);
+	if (!(['application/activity+json', 'application/ld+json'] as Array<any>).includes(accepted)) {
+		return next();
+	}
+
+	const { username, host } = parseAcct(req.params.user);
+	if (host !== null) {
+		return res.sendStatus(422);
+	}
+
+	const user = await User.findOne({
+		usernameLower: username.toLowerCase(),
+		host: null
+	});
+	if (user === null) {
+		return res.sendStatus(404);
+	}
+
+	if (username !== user.username) {
+		return res.redirect(`${config.url}/@${user.username}`);
+	}
+
+	const rendered = render(user);
+	rendered['@context'] = context;
+
+	res.json(rendered);
+});
+
+export default app;