From 014440850014ee86d766bb07467c2970b17a1fc6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Nov 2020 21:31:34 +0900 Subject: nanka iroiro (#6853) * wip * Update maps.ts * wip * wip * wip * wip * Update base.vue * wip * wip * wip * wip * Update link.vue * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update privacy.vue * wip * wip * wip * wip * Update range.vue * wip * wip * wip * wip * Update profile.vue * wip * Update a.vue * Update index.vue * wip * Update sidebar.vue * wip * wip * Update account-info.vue * Update a.vue * wip * wip * Update sounds.vue * wip * wip * wip * wip * wip * wip * wip * wip * Update account-info.vue * Update account-info.vue * wip * wip * wip * Update d-persimmon.json5 * wip --- src/services/chart/charts/classes/drive.ts | 4 ++-- src/services/chart/charts/classes/instance.ts | 2 +- src/services/chart/charts/classes/per-user-drive.ts | 2 +- src/services/drive/add-file.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/services') diff --git a/src/services/chart/charts/classes/drive.ts b/src/services/chart/charts/classes/drive.ts index c3bcacb7df..57bb120beb 100644 --- a/src/services/chart/charts/classes/drive.ts +++ b/src/services/chart/charts/classes/drive.ts @@ -32,8 +32,8 @@ export default class DriveChart extends Chart { const [localCount, remoteCount, localSize, remoteSize] = await Promise.all([ DriveFiles.count({ userHost: null }), DriveFiles.count({ userHost: Not(IsNull()) }), - DriveFiles.clacDriveUsageOfLocal(), - DriveFiles.clacDriveUsageOfRemote() + DriveFiles.calcDriveUsageOfLocal(), + DriveFiles.calcDriveUsageOfRemote() ]); return { diff --git a/src/services/chart/charts/classes/instance.ts b/src/services/chart/charts/classes/instance.ts index f3d341f383..7575abfb6f 100644 --- a/src/services/chart/charts/classes/instance.ts +++ b/src/services/chart/charts/classes/instance.ts @@ -51,7 +51,7 @@ export default class InstanceChart extends Chart { Followings.count({ followerHost: group }), Followings.count({ followeeHost: group }), DriveFiles.count({ userHost: group }), - DriveFiles.clacDriveUsageOfHost(group), + DriveFiles.calcDriveUsageOfHost(group), ]); return { diff --git a/src/services/chart/charts/classes/per-user-drive.ts b/src/services/chart/charts/classes/per-user-drive.ts index 822f4eda0f..aed9f6fce7 100644 --- a/src/services/chart/charts/classes/per-user-drive.ts +++ b/src/services/chart/charts/classes/per-user-drive.ts @@ -24,7 +24,7 @@ export default class PerUserDriveChart extends Chart { protected async fetchActual(group: string): Promise> { const [count, size] = await Promise.all([ DriveFiles.count({ userId: group }), - DriveFiles.clacDriveUsageOf(group) + DriveFiles.calcDriveUsageOf(group) ]); return { diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 8d32d06d2e..b5085ec8e3 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -334,7 +334,7 @@ export default async function( //#region Check drive usage if (user && !isLink) { - const usage = await DriveFiles.clacDriveUsageOf(user); + const usage = await DriveFiles.calcDriveUsageOf(user); const instance = await fetchMeta(); const driveCapacity = 1024 * 1024 * (Users.isLocalUser(user) ? instance.localDriveCapacityMb : instance.remoteDriveCapacityMb); -- cgit v1.2.3-freya