From 54075c5b983b583939a6358b58abe8cb784704ea Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Tue, 20 Aug 2019 22:54:22 +0900
Subject: [PATCH] =?UTF-8?q?TL=20API=E3=81=AEexcludeNsfw=E3=81=A7CW?=
 =?UTF-8?q?=E4=BB=98=E3=81=8D=E3=82=82=E9=99=A4=E3=81=8F=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/api/endpoints/notes/global-timeline.ts    | 1 +
 src/server/api/endpoints/notes/hybrid-timeline.ts    | 1 +
 src/server/api/endpoints/notes/local-timeline.ts     | 1 +
 src/server/api/endpoints/notes/timeline.ts           | 1 +
 src/server/api/endpoints/notes/user-list-timeline.ts | 1 +
 src/server/api/endpoints/users/notes.ts              | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts
index 875949bf67cf..4cdafcefefdf 100644
--- a/src/server/api/endpoints/notes/global-timeline.ts
+++ b/src/server/api/endpoints/notes/global-timeline.ts
@@ -149,6 +149,7 @@ export default define(meta, async (ps, user) => {
 			query['_files.metadata.isSensitive'] = {
 				$ne: true
 			};
+			query['cw'] = null;
 		}
 
 		if (ps.excludeSfw) {
diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts
index 34aa10646ed0..e9399672409a 100644
--- a/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -292,6 +292,7 @@ export default define(meta, async (ps, user) => {
 			query['_files.metadata.isSensitive'] = {
 				$ne: true
 			};
+			query['cw'] = null;
 		}
 
 		if (ps.excludeSfw) {
diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts
index 670c821ae692..f8b8704e3fe1 100644
--- a/src/server/api/endpoints/notes/local-timeline.ts
+++ b/src/server/api/endpoints/notes/local-timeline.ts
@@ -227,6 +227,7 @@ export default define(meta, async (ps, user) => {
 			query['_files.metadata.isSensitive'] = {
 				$ne: true
 			};
+			query['cw'] = null;
 		}
 
 		if (ps.excludeSfw) {
diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
index f8a6c8654118..649b562e8f82 100644
--- a/src/server/api/endpoints/notes/timeline.ts
+++ b/src/server/api/endpoints/notes/timeline.ts
@@ -281,6 +281,7 @@ export default define(meta, async (ps, user) => {
 			query['_files.metadata.isSensitive'] = {
 				$ne: true
 			};
+			query['cw'] = null;
 		}
 
 		if (ps.excludeSfw) {
diff --git a/src/server/api/endpoints/notes/user-list-timeline.ts b/src/server/api/endpoints/notes/user-list-timeline.ts
index 2553812adacc..a0096ce9d033 100644
--- a/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -304,6 +304,7 @@ export default define(meta, async (ps, user) => {
 			query['_files.metadata.isSensitive'] = {
 				$ne: true
 			};
+			query['cw'] = null;
 		}
 
 		if (ps.excludeSfw) {
diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
index 10d2f37fc2ea..9c9a5adefd40 100644
--- a/src/server/api/endpoints/users/notes.ts
+++ b/src/server/api/endpoints/users/notes.ts
@@ -243,6 +243,7 @@ export default define(meta, async (ps, me) => {
 			query['_files.metadata.isSensitive'] = {
 				$ne: true
 			};
+			query['cw'] = null;
 		}
 	}
 	//#endregion