usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update DriveService.ts

This commit is contained in:
syuilo 2023-09-23 18:25:38 +09:00
parent e7d4e02415
commit 98064eadeb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/backend/src/core/DriveService.ts
View File

@ -650,7 +650,7 @@ export class DriveService {
} }
@bindThis @bindThis
public async deleteFile(file: MiDriveFile, isExpired = false, deleter: MiUser) { public async deleteFile(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
if (file.storedInternal) { if (file.storedInternal) {
this.internalStorageService.del(file.accessKey!); this.internalStorageService.del(file.accessKey!);
@ -677,7 +677,7 @@ export class DriveService {
} }
@bindThis @bindThis
public async deleteFileSync(file: MiDriveFile, isExpired = false, deleter: MiUser) { public async deleteFileSync(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
if (file.storedInternal) { if (file.storedInternal) {
this.internalStorageService.del(file.accessKey!); this.internalStorageService.del(file.accessKey!);
@ -708,7 +708,7 @@ export class DriveService {
} }
@bindThis @bindThis
private async deletePostProcess(file: MiDriveFile, isExpired = false, deleter: MiUser) { private async deletePostProcess(file: MiDriveFile, isExpired = false, deleter?: MiUser) {
// リモートファイル期限切れ削除後は直リンクにする // リモートファイル期限切れ削除後は直リンクにする
if (isExpired && file.userHost !== null && file.uri != null) { if (isExpired && file.userHost !== null && file.uri != null) {
this.driveFilesRepository.update(file.id, { this.driveFilesRepository.update(file.id, {
@ -740,7 +740,7 @@ export class DriveService {
this.globalEventService.publishDriveStream(file.userId, 'fileDeleted', file.id); this.globalEventService.publishDriveStream(file.userId, 'fileDeleted', file.id);
} }
if (await this.roleService.isModerator(deleter) && (file.userId !== deleter.id)) { if (deleter && await this.roleService.isModerator(deleter) && (file.userId !== deleter.id)) {
this.moderationLogService.log(deleter, 'deleteDriveFile', { this.moderationLogService.log(deleter, 'deleteDriveFile', {
fileId: file.id, fileId: file.id,
fileUserId: file.userId, fileUserId: file.userId,