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/messaging/messages/create.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/server/api/endpoints/messaging/messages') diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts index 3885d2583c..7ff6526295 100644 --- a/src/server/api/endpoints/messaging/messages/create.ts +++ b/src/server/api/endpoints/messaging/messages/create.ts @@ -11,6 +11,7 @@ import { publishMessagingStream, publishMessagingIndexStream } from '../../../.. import pushSw from '../../../../../services/push-notification'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; export const meta = { desc: { @@ -76,18 +77,11 @@ export default define(meta, async (ps, user) => { } // Fetch recipient - const recipient = await User.findOne({ - _id: ps.userId - }, { - fields: { - _id: true - } + const recipient = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; }); - if (recipient === null) { - throw new ApiError(meta.errors.noSuchUser); - } - let file = null; if (ps.fileId != null) { file = await DriveFile.findOne({ -- cgit v1.2.3-freya