diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-12-12 11:46:35 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-12-12 11:46:35 +0900 |
| commit | 9ee9cf8d811f7ef9079980c02270b5a16623d9ef (patch) | |
| tree | 53d31c6a265718d5cf83b30a3e5e461c4448a721 /src | |
| parent | Update settings.2fa.vue (#3593) (diff) | |
| download | sharkey-9ee9cf8d811f7ef9079980c02270b5a16623d9ef.tar.gz sharkey-9ee9cf8d811f7ef9079980c02270b5a16623d9ef.tar.bz2 sharkey-9ee9cf8d811f7ef9079980c02270b5a16623d9ef.zip | |
Fix URL after deleting remote file (#3597)
* Fix URL after deleting remote file
* expired only
* delete space
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/drive/delete-file.ts | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts index 92d0010bcf..609c3a86ea 100644 --- a/src/services/drive/delete-file.ts +++ b/src/services/drive/delete-file.ts @@ -33,11 +33,24 @@ export default async function(file: IDriveFile, isExpired = false) { files_id: file._id }); - await DriveFile.update({ _id: file._id }, { - $set: { - 'metadata.deletedAt': new Date(), - 'metadata.isExpired': isExpired + const set = { + metadata: { + deletedAt: new Date(), + isExpired: isExpired } + } as any; + + // リモートファイル期限切れ削除後は直リンクにする + if (isExpired && file.metadata && file.metadata._user && file.metadata._user.host != null) { + set.metadata.withoutChunks = true; + set.metadata.isRemote = true; + set.metadata.url = file.metadata.uri; + set.metadata.thumbnailUrl = undefined; + set.metadata.webpublicUrl = undefined; + } + + await DriveFile.update({ _id: file._id }, { + $set: set }); //#region サムネイルもあれば削除 |