diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2021-05-30 13:48:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 13:48:23 +0900 |
| commit | 0263539202d16eb6a03484e0ead6d184be90de89 (patch) | |
| tree | a6f4a969d3eb9666ec8d966802d6ee0db42f3846 /src | |
| parent | refactor (diff) | |
| download | sharkey-0263539202d16eb6a03484e0ead6d184be90de89.tar.gz sharkey-0263539202d16eb6a03484e0ead6d184be90de89.tar.bz2 sharkey-0263539202d16eb6a03484e0ead6d184be90de89.zip | |
Fix remote drive expire (#7543)
Diffstat (limited to 'src')
| -rw-r--r-- | src/models/repositories/drive-file.ts | 4 | ||||
| -rw-r--r-- | src/services/drive/add-file.ts | 3 | ||||
| -rw-r--r-- | src/services/drive/delete-file.ts | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts index 590079fe4a..92bf12a4e0 100644 --- a/src/models/repositories/drive-file.ts +++ b/src/models/repositories/drive-file.ts @@ -59,6 +59,7 @@ export class DriveFileRepository extends Repository<DriveFile> { const { sum } = await this .createQueryBuilder('file') .where('file.userId = :id', { id: id }) + .andWhere('file.isLink = FALSE') .select('SUM(file.size)', 'sum') .getRawOne(); @@ -69,6 +70,7 @@ export class DriveFileRepository extends Repository<DriveFile> { const { sum } = await this .createQueryBuilder('file') .where('file.userHost = :host', { host: toPuny(host) }) + .andWhere('file.isLink = FALSE') .select('SUM(file.size)', 'sum') .getRawOne(); @@ -79,6 +81,7 @@ export class DriveFileRepository extends Repository<DriveFile> { const { sum } = await this .createQueryBuilder('file') .where('file.userHost IS NULL') + .andWhere('file.isLink = FALSE') .select('SUM(file.size)', 'sum') .getRawOne(); @@ -89,6 +92,7 @@ export class DriveFileRepository extends Repository<DriveFile> { const { sum } = await this .createQueryBuilder('file') .where('file.userHost IS NOT NULL') + .andWhere('file.isLink = FALSE') .select('SUM(file.size)', 'sum') .getRawOne(); diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index ad9f753e79..2356a23cbe 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -267,7 +267,8 @@ async function upload(key: string, stream: fs.ReadStream | Buffer, type: string, async function deleteOldFile(user: IRemoteUser) { const q = DriveFiles.createQueryBuilder('file') - .where('file.userId = :userId', { userId: user.id }); + .where('file.userId = :userId', { userId: user.id }) + .andWhere('file.isLink = FALSE'); if (user.avatarId) { q.andWhere('file.id != :avatarId', { avatarId: user.avatarId }); diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index bb9c0ae2c3..2dd2445321 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -79,7 +79,7 @@ async function postProcess(file: DriveFile, isExpired = false) { url: file.uri, thumbnailUrl: null, webpublicUrl: null, - size: 0, + storedInternal: false, // ローカルプロキシ用 accessKey: uuid(), thumbnailAccessKey: 'thumbnail-' + uuid(), |