Revert "Fix"

This reverts commit 8afdb5aef9.
This commit is contained in:
syuilo 2018-04-03 01:36:55 +09:00
parent 8afdb5aef9
commit f8ebbfac0f

View file

@ -1,32 +1,40 @@
import * as express from 'express'; import * as express from 'express';
import context from '../../remote/activitypub/renderer/context'; import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/note'; import render from '../../remote/activitypub/renderer/note';
import parseAcct from '../../acct/parse';
import Post from '../../models/post'; import Post from '../../models/post';
import User from '../../models/user'; import User from '../../models/user';
const app = express(); const app = express();
app.disable('x-powered-by'); app.disable('x-powered-by');
app.get('/posts/:post', async (req, res, next) => { app.get('/@:user/:post', async (req, res, next) => {
const accepted = req.accepts(['html', 'application/activity+json', 'application/ld+json']); const accepted = req.accepts(['html', 'application/activity+json', 'application/ld+json']);
if (!(['application/activity+json', 'application/ld+json'] as any[]).includes(accepted)) { if (!(['application/activity+json', 'application/ld+json'] as any[]).includes(accepted)) {
return next(); return next();
} }
const post = await Post.findOne({ const { username, host } = parseAcct(req.params.user);
_id: req.params.post if (host !== null) {
}); return res.sendStatus(422);
if (post === null) {
return res.sendStatus(404);
} }
const user = await User.findOne({ const user = await User.findOne({
_id: post.userId usernameLower: username.toLowerCase(),
host: null
}); });
if (user === null) { if (user === null) {
return res.sendStatus(404); return res.sendStatus(404);
} }
const post = await Post.findOne({
_id: req.params.post,
userId: user._id
});
if (post === null) {
return res.sendStatus(404);
}
const rendered = await render(user, post); const rendered = await render(user, post);
rendered['@context'] = context; rendered['@context'] = context;