summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/renderer/note.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-19 18:46:47 +0900
committerGitHub <noreply@github.com>2018-08-19 18:46:47 +0900
commit9bc3fcf74fcb8d77fffb21e6eb8c2d6b4fc64233 (patch)
tree9c9ea9ffeeb81dfb9b845d1f2cfca9b2e909d4d3 /src/remote/activitypub/renderer/note.ts
parentMerge branch 'master' of https://github.com/syuilo/misskey (diff)
parentFix リモートにNSFWが効かない (diff)
downloadsharkey-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/activitypub/renderer/note.ts')
-rw-r--r--src/remote/activitypub/renderer/note.ts5
1 files changed, 4 insertions, 1 deletions
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
};
}