Skip to content

Commit

Permalink
リモートユーザーごとのドライブファイルチャートは処理しないように
Browse files Browse the repository at this point in the history
  • Loading branch information
mei23 committed Feb 23, 2022
1 parent 4a3ff3e commit a90974b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/services/drive/add-file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,10 @@ export async function addFile({
// 統計を更新
driveChart.update(driveFile, true);

perUserDriveChart.update(driveFile, true);
if (isLocalUser(driveFile.metadata?._user)) {
perUserDriveChart.update(driveFile, true);
}

if (isRemoteUser(driveFile.metadata?._user)) {
instanceChart.updateDrive(driveFile, true);
Instance.update({ host: driveFile.metadata!._user.host }, {
Expand Down
8 changes: 6 additions & 2 deletions src/services/drive/delete-file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import perUserDriveChart from '../../services/chart/per-user-drive';
import instanceChart from '../../services/chart/instance';
import DriveFileWebpublic, { DriveFileWebpublicChunk } from '../../models/drive-file-webpublic';
import Instance from '../../models/instance';
import { isRemoteUser } from '../../models/user';
import { isLocalUser, isRemoteUser } from '../../models/user';
import { getDriveConfig } from '../../misc/get-drive-config';
import { getS3 } from './s3';
import { InternalStorage } from './internal-storage';
Expand Down Expand Up @@ -111,7 +111,11 @@ export default async function(file: IDriveFile, isExpired = false) {

// 統計を更新
driveChart.update(file, false);
perUserDriveChart.update(file, false);

if (isLocalUser(file.metadata?._user)) {
perUserDriveChart.update(file, false);
}

if (file.metadata && isRemoteUser(file.metadata._user)) {
instanceChart.updateDrive(file, false);
Instance.update({ host: file.metadata._user.host }, {
Expand Down

0 comments on commit a90974b

Please sign in to comment.