From 6458239a7cf6f2767d7a7988ed306558c0b87fa5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 13 Jan 2023 11:14:07 +0900 Subject: remoteDriveCapacityMbをロールに統合 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/DriveService.ts | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'packages/backend/src/core/DriveService.ts') diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts index 747dfd6130..9002c96a65 100644 --- a/packages/backend/src/core/DriveService.ts +++ b/packages/backend/src/core/DriveService.ts @@ -386,7 +386,7 @@ export class DriveService { }, err => { this.registerLogger.error(`Upload Failed: key = ${key}, filename = ${filename}`, err); - } + }, ); } @@ -479,16 +479,10 @@ export class DriveService { if (user && !isLink) { const usage = await this.driveFileEntityService.calcDriveUsageOf(user); - let driveCapacity: number; - if (this.userEntityService.isLocalUser(user)) { - const role = await this.roleService.getUserRoleOptions(user.id); - driveCapacity = 1024 * 1024 * role.driveCapacityMb; - this.registerLogger.debug('drive capacity override applied'); - this.registerLogger.debug(`overrideCap: ${driveCapacity}bytes, usage: ${usage}bytes, u+s: ${usage + info.size}bytes`); - } else { - const instance = await this.metaService.fetch(); - driveCapacity = 1024 * 1024 * instance.remoteDriveCapacityMb; - } + const role = await this.roleService.getUserRoleOptions(user.id); + const driveCapacity = 1024 * 1024 * role.driveCapacityMb; + this.registerLogger.debug('drive capacity override applied'); + this.registerLogger.debug(`overrideCap: ${driveCapacity}bytes, usage: ${usage}bytes, u+s: ${usage + info.size}bytes`); this.registerLogger.debug(`drive usage is ${usage} (max: ${driveCapacity})`); -- cgit v1.2.3-freya