From be3298639da3d5bebff000fb39a64174d43ba06c Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 22 Feb 2019 14:02:56 +0900 Subject: Refactor --- src/server/api/endpoints/users/notes.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/server/api/endpoints/users/notes.ts') diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts index 98d67e865a..efa39da001 100644 --- a/src/server/api/endpoints/users/notes.ts +++ b/src/server/api/endpoints/users/notes.ts @@ -5,6 +5,7 @@ import User from '../../../../models/user'; import define from '../../define'; import Following from '../../../../models/following'; import { ApiError } from '../../error'; +import { getUser } from '../../common/getters'; export const meta = { desc: { @@ -135,16 +136,11 @@ export const meta = { export default define(meta, async (ps, me) => { // Lookup user - const user = await User.findOne({ _id: ps.userId }, { - fields: { - _id: true - } + const user = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; }); - if (user === null) { - throw new ApiError(meta.errors.noSuchUser); - } - const isFollowing = me == null ? false : ((await Following.findOne({ followerId: me._id, followeeId: user._id -- cgit v1.2.3-freya