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/lists/pull.ts | 10 ++++------ src/server/api/endpoints/users/lists/push.ts | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/server/api/endpoints/users/lists') diff --git a/src/server/api/endpoints/users/lists/pull.ts b/src/server/api/endpoints/users/lists/pull.ts index 416c1b4b2d..679b71277c 100644 --- a/src/server/api/endpoints/users/lists/pull.ts +++ b/src/server/api/endpoints/users/lists/pull.ts @@ -5,6 +5,7 @@ import User, { pack as packUser } from '../../../../../models/user'; import { publishUserListStream } from '../../../../../services/stream'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; export const meta = { desc: { @@ -59,14 +60,11 @@ export default define(meta, async (ps, me) => { } // Fetch the user - const user = await User.findOne({ - _id: ps.userId + 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); - } - // Pull the user await UserList.update({ _id: userList._id }, { $pull: { diff --git a/src/server/api/endpoints/users/lists/push.ts b/src/server/api/endpoints/users/lists/push.ts index 90dd2aa045..6fdf55875d 100644 --- a/src/server/api/endpoints/users/lists/push.ts +++ b/src/server/api/endpoints/users/lists/push.ts @@ -8,6 +8,7 @@ import renderFollow from '../../../../../remote/activitypub/renderer/follow'; import { deliver } from '../../../../../queue'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; export const meta = { desc: { @@ -68,14 +69,11 @@ export default define(meta, async (ps, me) => { } // Fetch the user - const user = await User.findOne({ - _id: ps.userId + 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); - } - if (userList.userIds.map(id => id.toHexString()).includes(user._id.toHexString())) { throw new ApiError(meta.errors.alreadyAdded); } -- cgit v1.2.3-freya