sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement announce

Browse Source 
And bug fixes
This commit is contained in:
syuilo
2018-04-08 06:55:26 +09:00
parent 0004944708
commit 6e34e77372
17 changed files with 164 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/activitypub/note.ts
View File

@ -1,40 +1,25 @@
import * as express from 'express';
import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/note';
import parseAcct from '../../acct/parse';
import Note from '../../models/note';
import User from '../../models/user';
const app = express.Router();
app.get('/@:user/:note', async (req, res, next) => {
app.get('/notes/:note', async (req, res, next) => {
const accepted = req.accepts(['html', 'application/activity+json', 'application/ld+json']);
if (!(['application/activity+json', 'application/ld+json'] as 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);
}
const note = await Note.findOne({
_id: req.params.note,
userId: user._id
_id: req.params.note
});
if (note === null) {
return res.sendStatus(404);
}
const rendered = await render(user, note);
const rendered = await render(note);
rendered['@context'] = context;
res.json(rendered);

2
src/server/activitypub/outbox.ts
View File

@ -16,7 +16,7 @@ app.get('/@:user/outbox', withUser(username => {
sort: { _id: -1 }
});
const renderedNotes = await Promise.all(notes.map(note => renderNote(user, note)));
const renderedNotes = await Promise.all(notes.map(note => renderNote(note)));
const rendered = renderOrderedCollection(`${config.url}/@${user.username}/inbox`, user.notesCount, renderedNotes);
rendered['@context'] = context;