diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-19 18:46:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 18:46:47 +0900 |
| commit | 9bc3fcf74fcb8d77fffb21e6eb8c2d6b4fc64233 (patch) | |
| tree | 9c9ea9ffeeb81dfb9b845d1f2cfca9b2e909d4d3 /src/remote | |
| parent | Merge branch 'master' of https://github.com/syuilo/misskey (diff) | |
| parent | Fix リモートにNSFWが効かない (diff) | |
| download | sharkey-9bc3fcf74fcb8d77fffb21e6eb8c2d6b4fc64233.tar.gz sharkey-9bc3fcf74fcb8d77fffb21e6eb8c2d6b4fc64233.tar.bz2 sharkey-9bc3fcf74fcb8d77fffb21e6eb8c2d6b4fc64233.zip | |
Merge pull request #2348 from mei23/mei-0819-nsfw3
リモートにNSFWが効かないのを修正
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/models/note.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/renderer/note.ts | 5 | ||||
| -rw-r--r-- | src/remote/activitypub/type.ts | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index dbad63ea42..02bce6fec7 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -81,7 +81,9 @@ export async function createNote(value: any, resolver?: Resolver, silent = false // 添付メディア // TODO: attachmentは必ずしもImageではない // TODO: attachmentは必ずしも配列ではない + // Noteがsensitiveなら添付もsensitiveにする const media = note.attachment + .map(attach => attach.sensitive = note.sensitive) ? await Promise.all(note.attachment.map(x => resolveImage(actor, x))) : []; diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts index 209e743927..1d169d3088 100644 --- a/src/remote/activitypub/renderer/note.ts +++ b/src/remote/activitypub/renderer/note.ts @@ -79,6 +79,8 @@ export default async function renderNote(note: INote, dive = true): Promise<any> ...mentionTags, ]; + const files = await promisedFiles; + return { id: `${config.url}/notes/${note._id}`, type: 'Note', @@ -89,7 +91,8 @@ export default async function renderNote(note: INote, dive = true): Promise<any> to, cc, inReplyTo, - attachment: (await promisedFiles).map(renderDocument), + attachment: files.map(renderDocument), + sensitive: files.some(file => file.metadata.isSensitive), tag }; } diff --git a/src/remote/activitypub/type.ts b/src/remote/activitypub/type.ts index 9761b66dc3..3d40ad48cb 100644 --- a/src/remote/activitypub/type.ts +++ b/src/remote/activitypub/type.ts @@ -16,6 +16,7 @@ export interface IObject { image?: any; url?: string; tag?: any[]; + sensitive?: boolean; } export interface IActivity extends IObject { |