summaryrefslogtreecommitdiff
path: root/src/services/drive
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-07 12:12:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-07 12:12:43 +0900
commit665fa7f2aa80a726f36f834d14ecac8eaff3f944 (patch)
tree522755781963d6959214eb966c329960815fa0e7 /src/services/drive
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadsharkey-665fa7f2aa80a726f36f834d14ecac8eaff3f944.tar.gz
sharkey-665fa7f2aa80a726f36f834d14ecac8eaff3f944.tar.bz2
sharkey-665fa7f2aa80a726f36f834d14ecac8eaff3f944.zip
[API] Improve drive/files/upload_from_url
Diffstat (limited to 'src/services/drive')
-rw-r--r--src/services/drive/upload-from-url.ts11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts
index 96e258c98b..fa37615a94 100644
--- a/src/services/drive/upload-from-url.ts
+++ b/src/services/drive/upload-from-url.ts
@@ -14,7 +14,14 @@ import fetchMeta from '../../misc/fetch-meta';
const log = debug('misskey:drive:upload-from-url');
-export default async (url: string, user: IUser, folderId: mongodb.ObjectID = null, uri: string = null, sensitive = false): Promise<IDriveFile> => {
+export default async (
+ url: string,
+ user: IUser,
+ folderId: mongodb.ObjectID = null,
+ uri: string = null,
+ sensitive = false,
+ force = false
+): Promise<IDriveFile> => {
log(`REQUESTED: ${url}`);
let name = URL.parse(url).pathname.split('/').pop();
@@ -76,7 +83,7 @@ export default async (url: string, user: IUser, folderId: mongodb.ObjectID = nul
let error;
try {
- driveFile = await create(user, path, name, null, folderId, false, !instance.cacheRemoteFiles, url, uri, sensitive);
+ driveFile = await create(user, path, name, null, folderId, force, !instance.cacheRemoteFiles, url, uri, sensitive);
log(`got: ${driveFile._id}`);
} catch (e) {
error = e;