summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/models
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/models
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/models')
-rw-r--r--src/remote/activitypub/models/note.ts2
1 files changed, 2 insertions, 0 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)))
: [];