summaryrefslogtreecommitdiff
path: root/src/services/drive
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-20 18:20:25 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-20 18:20:25 +0900
commit875d7935126b0d3d706f9944948e93a0de73549c (patch)
tree0b2193e5dc9354dcac7a50cfb8a165f56c44b485 /src/services/drive
parent[MFM] __ 構文はアルファベットのみに (diff)
downloadmisskey-875d7935126b0d3d706f9944948e93a0de73549c.tar.gz
misskey-875d7935126b0d3d706f9944948e93a0de73549c.tar.bz2
misskey-875d7935126b0d3d706f9944948e93a0de73549c.zip
常にメディアを閲覧注意として投稿するオプションが機能してなかった問題を修正
Diffstat (limited to 'src/services/drive')
-rw-r--r--src/services/drive/add-file.ts9
1 files changed, 3 insertions, 6 deletions
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;