Resolve #2560
This commit is contained in:
parent
d86d5feae3
commit
fd06fd4dc1
1 changed files with 4 additions and 15 deletions
|
@ -132,25 +132,14 @@ export default (params: any, user: ILocalUser, app: IApp) => new Promise(async (
|
||||||
let files: IDriveFile[] = [];
|
let files: IDriveFile[] = [];
|
||||||
const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null;
|
const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null;
|
||||||
if (fileIds != null) {
|
if (fileIds != null) {
|
||||||
// Fetch files
|
files = await Promise.all(fileIds.map(fileId => {
|
||||||
// forEach だと途中でエラーなどがあっても return できないので
|
return DriveFile.findOne({
|
||||||
// 敢えて for を使っています。
|
|
||||||
for (const fileId of fileIds) {
|
|
||||||
// Fetch file
|
|
||||||
// SELECT _id
|
|
||||||
const entity = await DriveFile.findOne({
|
|
||||||
_id: fileId,
|
_id: fileId,
|
||||||
'metadata.userId': user._id
|
'metadata.userId': user._id
|
||||||
});
|
});
|
||||||
|
}));
|
||||||
|
|
||||||
if (entity === null) {
|
files = files.filter(file => file != null);
|
||||||
return rej('file not found');
|
|
||||||
} else {
|
|
||||||
files.push(entity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
files = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let renote: INote = null;
|
let renote: INote = null;
|
||||||
|
|
Loading…
Reference in a new issue