Merge branch 'develop' into ed25519

This commit is contained in:
tamaina
2024-03-05 22:03:15 +09:00
committed by GitHub
8 changed files with 142 additions and 17 deletions

View File

@@ -248,7 +248,7 @@ export class DriveFileEntityService {
folder: opts.detail && file.folderId ? this.driveFolderEntityService.pack(file.folderId, {
detail: true,
}) : null,
userId: opts.withUser ? file.userId : null,
userId: file.userId,
user: (opts.withUser && file.userId) ? this.userEntityService.pack(file.userId) : null,
});
}