summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-06 07:52:13 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-06 07:52:13 +0900
commit2a5c19cd0133451b8279843024e2316053ca55c7 (patch)
treeed565caa2d17ad8a8072ec3396b99a00895343c0 /src/services
parent:art: (diff)
downloadsharkey-2a5c19cd0133451b8279843024e2316053ca55c7.tar.gz
sharkey-2a5c19cd0133451b8279843024e2316053ca55c7.tar.bz2
sharkey-2a5c19cd0133451b8279843024e2316053ca55c7.zip
リモートのファイルをキャッシュするかどうかの設定をDBに保存するように
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/upload-from-url.ts5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/services/drive/upload-from-url.ts b/src/services/drive/upload-from-url.ts
index 2184edf005..7d4785be03 100644
--- a/src/services/drive/upload-from-url.ts
+++ b/src/services/drive/upload-from-url.ts
@@ -10,6 +10,7 @@ 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');
@@ -51,11 +52,13 @@ export default async (url: string, user: IUser, folderId: mongodb.ObjectID = nul
.on('error', rej);
});
+ const instance = await fetchMeta();
+
let driveFile: IDriveFile;
let error;
try {
- driveFile = await create(user, path, name, null, folderId, false, config.preventCacheRemoteFiles, url, uri, sensitive);
+ driveFile = await create(user, path, name, null, folderId, false, !instance.cacheRemoteFiles, url, uri, sensitive);
log(`got: ${driveFile._id}`);
} catch (e) {
error = e;