diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-21 20:07:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 20:07:33 +0900 |
| commit | 3476be16ab9d78d33adfb9b7e8a8c5c6af2f1606 (patch) | |
| tree | fd3bdf443d4c7f5de4e4a4ffbcdeaec42343a89c /src/server | |
| parent | Clean up (diff) | |
| parent | Respect visibility in ActivityPub Note/Outbox (diff) | |
| download | sharkey-3476be16ab9d78d33adfb9b7e8a8c5c6af2f1606.tar.gz sharkey-3476be16ab9d78d33adfb9b7e8a8c5c6af2f1606.tar.bz2 sharkey-3476be16ab9d78d33adfb9b7e8a8c5c6af2f1606.zip | |
Merge pull request #2381 from mei23/mei-0821-apnote
ActivityPub Note/Outbox の公開範囲の修正
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/activitypub.ts | 5 | ||||
| -rw-r--r-- | src/server/activitypub/outbox.ts | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts index c2dec2b997..26eaa68fe8 100644 --- a/src/server/activitypub.ts +++ b/src/server/activitypub.ts @@ -54,7 +54,8 @@ router.get('/notes/:note', async (ctx, next) => { if (!isActivityPubReq(ctx)) return await next(); 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) { @@ -62,7 +63,7 @@ router.get('/notes/:note', async (ctx, next) => { return; } - ctx.body = pack(await renderNote(note)); + ctx.body = pack(await renderNote(note, false)); }); // outbox diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts index 91473b77e3..71d879e215 100644 --- a/src/server/activitypub/outbox.ts +++ b/src/server/activitypub/outbox.ts @@ -83,7 +83,7 @@ export default async (ctx: Koa.Context) => { 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( `${partOf}?page=true${sinceId ? `&since_id=${sinceId}` : ''}${untilId ? `&until_id=${untilId}` : ''}`, user.notesCount, renderedNotes, partOf, |