mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-02 16:58:43 +09:00
Code

Improve pack function of favorite

Browse Source
This commit is contained in:
syuilo 2018-10-04 13:33:59 +09:00
parent c1ef1bf605
commit e8afa2c940
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/models/favorite.ts
View File

@ -41,6 +41,13 @@ export async function deleteFavorite(favorite: string | mongo.ObjectID | IFavori
}); });
} }
export const packMany = async (
favorites: any[],
me: any
) => {
return (await Promise.all(favorites.map(f => pack(f, me)))).filter(x => x != null);
};
/** /**
* Pack a favorite for API response * Pack a favorite for API response
*/ */
@ -70,5 +77,11 @@ export const pack = (
// Populate note // Populate note
_favorite.note = await packNote(_favorite.noteId, me); _favorite.note = await packNote(_favorite.noteId, me);
// (データベースの不具合などで)投稿が見つからなかったら
if (_favorite.note == null) {
console.warn(`favorite: note not found on database: ${_favorite.noteId}`);
return resolve(null);
}
resolve(_favorite); resolve(_favorite);
}); });

4
src/server/api/endpoints/i/favorites.ts
View File

@ -1,5 +1,5 @@
import $ from 'cafy'; import ID from '../../../../misc/cafy-id'; import $ from 'cafy'; import ID from '../../../../misc/cafy-id';
import Favorite, { pack } from '../../../../models/favorite'; import Favorite, { packMany } from '../../../../models/favorite';
import { ILocalUser } from '../../../../models/user'; import { ILocalUser } from '../../../../models/user';
export const meta = { export const meta = {
@ -55,5 +55,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
.find(query, { limit, sort }); .find(query, { limit, sort });
// Serialize // Serialize
res(await Promise.all(favorites.map(favorite => pack(favorite, user)))); res(await packMany(favorites, user));
}); });