diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-09 01:31:48 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-09 01:31:48 +0900 |
| commit | ee7ef89dfbd9d5e3f1e5a0f3b1a7d50bf92b5f26 (patch) | |
| tree | c955209d16fecad734ef904431d707220454e8f8 /src | |
| parent | Update migrate.ts (diff) | |
| download | sharkey-ee7ef89dfbd9d5e3f1e5a0f3b1a7d50bf92b5f26.tar.gz sharkey-ee7ef89dfbd9d5e3f1e5a0f3b1a7d50bf92b5f26.tar.bz2 sharkey-ee7ef89dfbd9d5e3f1e5a0f3b1a7d50bf92b5f26.zip | |
Fix bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/models/entities/drive-file.ts | 4 | ||||
| -rw-r--r-- | src/services/drive/delete-file.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/models/entities/drive-file.ts b/src/models/entities/drive-file.ts index a8f8c69e56..21db4bd713 100644 --- a/src/models/entities/drive-file.ts +++ b/src/models/entities/drive-file.ts @@ -95,9 +95,9 @@ export class DriveFile { @Index({ unique: true }) @Column('varchar', { - length: 256, + length: 256, nullable: true, }) - public accessKey: string; + public accessKey: string | null; @Index({ unique: true }) @Column('varchar', { diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index adf57416fe..9c23b39bfc 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -16,7 +16,7 @@ export default async function(file: DriveFile, isExpired = false) { if (file.webpublicUrl) { InternalStorage.del(file.webpublicAccessKey); } - } else { + } else if (!file.isRemote) { const minio = new Minio.Client(config.drive.config); await minio.removeObject(config.drive.bucket, file.accessKey); |