summaryrefslogtreecommitdiff
path: root/src/services/drive
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-06 07:14:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-06 07:14:43 +0900
commit8f714b5b126226346af850337566f0f70bd02d4f (patch)
treef647ad5b28e5a4e74a7f7501c09597a1f8f11a81 /src/services/drive
parentClean up (diff)
downloadmisskey-8f714b5b126226346af850337566f0f70bd02d4f.tar.gz
misskey-8f714b5b126226346af850337566f0f70bd02d4f.tar.bz2
misskey-8f714b5b126226346af850337566f0f70bd02d4f.zip
ドライブ容量の設定をDBに保存するようにしたりリファクタリングしたり
Diffstat (limited to 'src/services/drive')
-rw-r--r--src/services/drive/add-file.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 4a06b62ae2..0fb365c91f 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -19,6 +19,7 @@ import config from '../../config';
import { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
import driveChart from '../../chart/drive';
import perUserDriveChart from '../../chart/per-user-drive';
+import fetchMeta from '../../misc/fetch-meta';
const log = debug('misskey:drive:add-file');
@@ -255,7 +256,8 @@ export default async function(
log(`drive usage is ${usage}`);
- const driveCapacity = 1024 * 1024 * (isLocalUser(user) ? config.localDriveCapacityMb : config.remoteDriveCapacityMb);
+ const instance = await fetchMeta();
+ const driveCapacity = 1024 * 1024 * (isLocalUser(user) ? instance.localDriveCapacityMb : instance.remoteDriveCapacityMb);
// If usage limit exceeded
if (usage + size > driveCapacity) {