sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve error handling of packaging functions

Browse Source
This commit is contained in:
syuilo
2018-10-05 01:43:47 +09:00
parent 401d0b1298
commit baf9b65801
6 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/api/endpoints/drive/files.ts
View File

@ -1,5 +1,5 @@
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import DriveFile, { pack } from '../../../../models/drive-file';
import DriveFile, { packMany } from '../../../../models/drive-file';
import { ILocalUser } from '../../../../models/user';
export const meta = {
@ -73,6 +73,5 @@ export default async (params: any, user: ILocalUser) => {
});
// Serialize
const _files = await Promise.all(files.map(file => pack(file)));
return _files;
return await packMany(files);
};

4
src/server/api/endpoints/drive/stream.ts
View File

@ -1,5 +1,5 @@
import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import DriveFile, { pack } from '../../../../models/drive-file';
import DriveFile, { packMany } from '../../../../models/drive-file';
import { ILocalUser } from '../../../../models/user';
export const meta = {
@ -63,5 +63,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
});
// Serialize
res(await Promise.all(files.map(file => pack(file))));
res(await packMany(files));
});