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: [PATCH] =?UTF-8?q?=E5=B8=B8=E3=81=AB=E3=83=A1=E3=83=87=E3=82=A3?=
 =?UTF-8?q?=E3=82=A2=E3=82=92=E9=96=B2=E8=A6=A7=E6=B3=A8=E6=84=8F=E3=81=A8?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E6=8A=95=E7=A8=BF=E3=81=99=E3=82=8B=E3=82=AA?=
 =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                   | 1 +
 src/services/drive/add-file.ts | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1450a9775e..1f16c9a9e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ unreleased
 * ハッシュタグ判定の強化
 * ストーク機能の廃止
 * 関係のない返信がタイムラインに流れる問題を修正
+* 常にメディアを閲覧注意として投稿するオプションが機能してなかった問題を修正
 * クライアントのAPIリクエストをストリーム経由で行うオプションを廃止
 * 一部箇所でカスタム絵文字が適用されていないのを修正
 
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;