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/server/api/endpoints/users | |
| parent | Tune worker/job counts (#5346) (diff) | |
| download | sharkey-13f69e4291d36ed85972ee43f0f61e8f43913f80.tar.gz sharkey-13f69e4291d36ed85972ee43f0f61e8f43913f80.tar.bz2 sharkey-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/server/api/endpoints/users')
| -rw-r--r-- | src/server/api/endpoints/users/notes.ts | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index c8be19ff16..4869bd09fd 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -150,10 +150,8 @@ export default define(meta, async (ps, me) => { })); if (ps.excludeNsfw) { - // v11 TODO - /*query['_files.isSensitive'] = { - $ne: true - };*/ + query.andWhere('note.cw IS NULL'); + query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)'); } } |