summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-07 19:43:21 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-07 19:43:21 +0900
commita8d05cba5a2ae5da44c47e37167f279ff0fe5f50 (patch)
treee025f30c68302b83d3b7d7833499735e876951c6 /src/services
parent10.44.0 (diff)
downloadsharkey-a8d05cba5a2ae5da44c47e37167f279ff0fe5f50.tar.gz
sharkey-a8d05cba5a2ae5da44c47e37167f279ff0fe5f50.tar.bz2
sharkey-a8d05cba5a2ae5da44c47e37167f279ff0fe5f50.zip
Fix #3149
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/upload-from-url.ts8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts
index fa37615a94..ac1b04f5b5 100644
--- a/src/services/drive/upload-from-url.ts
+++ b/src/services/drive/upload-from-url.ts
@@ -10,7 +10,6 @@ import create from './add-file';
import config from '../../config';
import { IUser } from '../../models/user';
import * as mongodb from 'mongodb';
-import fetchMeta from '../../misc/fetch-meta';
const log = debug('misskey:drive:upload-from-url');
@@ -20,7 +19,8 @@ export default async (
folderId: mongodb.ObjectID = null,
uri: string = null,
sensitive = false,
- force = false
+ force = false,
+ link = false
): Promise<IDriveFile> => {
log(`REQUESTED: ${url}`);
@@ -77,13 +77,11 @@ export default async (
});
});
- const instance = await fetchMeta();
-
let driveFile: IDriveFile;
let error;
try {
- driveFile = await create(user, path, name, null, folderId, force, !instance.cacheRemoteFiles, url, uri, sensitive);
+ driveFile = await create(user, path, name, null, folderId, force, link, url, uri, sensitive);
log(`got: ${driveFile._id}`);
} catch (e) {
error = e;