sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strictNullChecks (#4666)

Browse Source 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
This commit is contained in:
syuilo
2019-04-13 01:43:22 +09:00
committed by GitHub
parent 4ee40c3345
commit 987168b863
214 changed files with 939 additions and 785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/services/drive/delete-file.ts
View File

@@ -7,31 +7,31 @@ import { driveChart, perUserDriveChart, instanceChart } from '../chart';
export default async function(file: DriveFile, isExpired = false) {
if (file.storedInternal) {
InternalStorage.del(file.accessKey);
InternalStorage.del(file.accessKey!);
if (file.thumbnailUrl) {
InternalStorage.del(file.thumbnailAccessKey);
InternalStorage.del(file.thumbnailAccessKey!);
}
if (file.webpublicUrl) {
InternalStorage.del(file.webpublicAccessKey);
InternalStorage.del(file.webpublicAccessKey!);
}
} else if (!file.isLink) {
const minio = new Minio.Client(config.drive.config);
const minio = new Minio.Client(config.drive!.config);
await minio.removeObject(config.drive.bucket, file.accessKey);
await minio.removeObject(config.drive!.bucket!, file.accessKey!);
if (file.thumbnailUrl) {
await minio.removeObject(config.drive.bucket, file.thumbnailAccessKey);
await minio.removeObject(config.drive!.bucket!, file.thumbnailAccessKey!);
}
if (file.webpublicUrl) {
await minio.removeObject(config.drive.bucket, file.webpublicAccessKey);
await minio.removeObject(config.drive!.bucket!, file.webpublicAccessKey!);
}
}
// リモートファイル期限切れ削除後は直リンクにする
if (isExpired && file.userHost !== null) {
if (isExpired && file.userHost !== null && file.uri != null) {
DriveFiles.update(file.id, {
isLink: true,
url: file.uri,