diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-07-20 02:40:37 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-07-20 02:40:37 +0900 |
| commit | ec2b1ec3f0035466585d9cc2a7842e519e14e31a (patch) | |
| tree | 9a8e7c40e7b068d24b362a72552e456b1adddba7 /src/services | |
| parent | 4.24.1 (diff) | |
| download | misskey-ec2b1ec3f0035466585d9cc2a7842e519e14e31a.tar.gz misskey-ec2b1ec3f0035466585d9cc2a7842e519e14e31a.tar.bz2 misskey-ec2b1ec3f0035466585d9cc2a7842e519e14e31a.zip | |
#1334
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/drive/add-file.ts | 6 | ||||
| -rw-r--r-- | src/services/drive/upload-from-url.ts | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 57c6589176..73d5b4962c 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -83,7 +83,8 @@ export default async function( force: boolean = false, metaOnly: boolean = false, url: string = null, - uri: string = null + uri: string = null, + sensitive = false ): Promise<IDriveFile> { // Calc md5 hash const calcHash = new Promise<string>((res, rej) => { @@ -258,7 +259,8 @@ export default async function( folderId: folder !== null ? folder._id : null, comment: comment, properties: properties, - isMetaOnly: metaOnly + isMetaOnly: metaOnly, + isSensitive: sensitive } as IMetadata; if (url !== null) { diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts index 711889ea41..4e297d3bb1 100644 --- a/src/services/drive/upload-from-url.ts +++ b/src/services/drive/upload-from-url.ts @@ -13,7 +13,7 @@ import * as mongodb from 'mongodb'; const log = debug('misskey:drive:upload-from-url'); -export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null): Promise<IDriveFile> => { +export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null, sensitive = false): Promise<IDriveFile> => { log(`REQUESTED: ${url}`); let name = URL.parse(url).pathname.split('/').pop(); @@ -48,7 +48,7 @@ export default async (url: string, user: IUser, folderId: mongodb.ObjectID = nul let error; try { - driveFile = await create(user, path, name, null, folderId, false, config.preventCacheRemoteFiles, url, uri); + driveFile = await create(user, path, name, null, folderId, false, config.preventCacheRemoteFiles, url, uri, sensitive); log(`got: ${driveFile._id}`); } catch (e) { error = e; |