From 13f69e4291d36ed85972ee43f0f61e8f43913f80 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 27 Aug 2019 17:33:07 +0900
Subject: excludeNsfwやCWのNSFW扱いなど (#5341)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* NoteにisSensitive

* Revert "NoteにisSensitive"

This reverts commit 3d5bcfbaf078ff91257a508f817dd1ef4ea31d7b.

* query excludeNsfw

* AP deliverでCW付きはsensitiveにするように

* excludeNsfwでCW付きも除くように
---
 src/server/api/endpoints/users/notes.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/server/api/endpoints/users')

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)');
 		}
 	}
 
-- 
cgit v1.2.3-freya