graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 18:43:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2381 from mei23/mei-0821-apnote

Browse source 
ActivityPub Note/Outbox の公開範囲の修正
This commit is contained in:
syuilo 2018-08-21 20:07:33 +09:00 committed by GitHub
commit 3476be16ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/server/activitypub.ts
View file

@ -54,7 +54,8 @@ router.get('/notes/:note', async (ctx, next) => {
if (!isActivityPubReq(ctx)) return await next(); if (!isActivityPubReq(ctx)) return await next();
const note = await Note.findOne({ const note = await Note.findOne({
_id: new mongo.ObjectID(ctx.params.note) _id: new mongo.ObjectID(ctx.params.note),
$or: [ { visibility: 'public' }, { visibility: 'home' } ]
}); });
if (note === null) { if (note === null) {
@ -62,7 +63,7 @@ router.get('/notes/:note', async (ctx, next) => {
return; return;
} }
ctx.body = pack(await renderNote(note)); ctx.body = pack(await renderNote(note, false));
}); });
// outbox // outbox

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

@ -83,7 +83,7 @@ export default async (ctx: Koa.Context) => {
if (sinceId) notes.reverse(); if (sinceId) notes.reverse();
const renderedNotes = await Promise.all(notes.map(note => renderNote(note))); const renderedNotes = await Promise.all(notes.map(note => renderNote(note, false)));
const rendered = renderOrderedCollectionPage( const rendered = renderOrderedCollectionPage(
`${partOf}?page=true${sinceId ? `&since_id=${sinceId}` : ''}${untilId ? `&until_id=${untilId}` : ''}`, `${partOf}?page=true${sinceId ? `&since_id=${sinceId}` : ''}${untilId ? `&until_id=${untilId}` : ''}`,
user.notesCount, renderedNotes, partOf, user.notesCount, renderedNotes, partOf,