From 875d7935126b0d3d706f9944948e93a0de73549c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 20 Jan 2019 18:20:25 +0900
Subject: 
 常にメディアを閲覧注意として投稿するオプションが機能してなかった問題を修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/drive/add-file.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 38b150a639..7d83e214aa 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -476,12 +476,9 @@ export default async function(
 		properties: properties,
 		withoutChunks: isLink,
 		isRemote: isLink,
-		isSensitive: (sensitive !== null && sensitive !== undefined)
-			? sensitive
-			: isLocalUser(user)
-				? user.settings.alwaysMarkNsfw
-					? true
-					: false
+		isSensitive: isLocalUser(user) && user.settings.alwaysMarkNsfw ? true :
+			(sensitive !== null && sensitive !== undefined)
+				? sensitive
 				: false
 	} as IMetadata;
 
-- 
cgit v1.2.3-freya