diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-08-27 17:33:07 +0900 |
|---|---|---|
| committer | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-08-27 17:33:07 +0900 |
| commit | 13f69e4291d36ed85972ee43f0f61e8f43913f80 (patch) | |
| tree | 7d6cdd276737852f0f7560fb5fd7271a98fa3816 /src/remote | |
| parent | Tune worker/job counts (#5346) (diff) | |
| download | misskey-13f69e4291d36ed85972ee43f0f61e8f43913f80.tar.gz misskey-13f69e4291d36ed85972ee43f0f61e8f43913f80.tar.bz2 misskey-13f69e4291d36ed85972ee43f0f61e8f43913f80.zip | |
excludeNsfwやCWのNSFW扱いなど (#5341)
* NoteにisSensitive
* Revert "NoteにisSensitive"
This reverts commit 3d5bcfbaf078ff91257a508f817dd1ef4ea31d7b.
* query excludeNsfw
* AP deliverでCW付きはsensitiveにするように
* excludeNsfwでCW付きも除くように
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/renderer/note.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts index cbdff7d203..ca823941c0 100644 --- a/src/remote/activitypub/renderer/note.ts +++ b/src/remote/activitypub/renderer/note.ts @@ -158,7 +158,7 @@ export default async function renderNote(note: Note, dive = true): Promise<any> cc, inReplyTo, attachment: files.map(renderDocument), - sensitive: files.some(file => file.isSensitive), + sensitive: note.cw != null || files.some(file => file.isSensitive), tag, ...asPoll }; |