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/following/requests/accept.ts | 10 ++++------ src/server/api/endpoints/following/requests/cancel.ts | 10 ++++------ src/server/api/endpoints/following/requests/reject.ts | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) (limited to 'src/server/api/endpoints/following/requests') diff --git a/src/server/api/endpoints/following/requests/accept.ts b/src/server/api/endpoints/following/requests/accept.ts index 2aa0434279..82cd4e0ca3 100644 --- a/src/server/api/endpoints/following/requests/accept.ts +++ b/src/server/api/endpoints/following/requests/accept.ts @@ -4,6 +4,7 @@ import acceptFollowRequest from '../../../../../services/following/requests/acce import User from '../../../../../models/user'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; export const meta = { desc: { @@ -37,14 +38,11 @@ export const meta = { export default define(meta, async (ps, user) => { // Fetch follower - const follower = await User.findOne({ - _id: ps.userId + const follower = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; }); - if (follower === null) { - throw new ApiError(meta.errors.noSuchUser); - } - await acceptFollowRequest(user, follower); return; diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index bca9feaba9..82c1e792b0 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -4,6 +4,7 @@ import cancelFollowRequest from '../../../../../services/following/requests/canc import User, { pack } from '../../../../../models/user'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; export const meta = { desc: { @@ -43,14 +44,11 @@ export const meta = { export default define(meta, async (ps, user) => { // Fetch followee - const followee = await User.findOne({ - _id: ps.userId + const followee = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; }); - if (followee === null) { - throw new ApiError(meta.errors.noSuchUser); - } - try { await cancelFollowRequest(followee, user); } catch (e) { diff --git a/src/server/api/endpoints/following/requests/reject.ts b/src/server/api/endpoints/following/requests/reject.ts index 760661b55f..9a134c7dff 100644 --- a/src/server/api/endpoints/following/requests/reject.ts +++ b/src/server/api/endpoints/following/requests/reject.ts @@ -4,6 +4,7 @@ import rejectFollowRequest from '../../../../../services/following/requests/reje import User from '../../../../../models/user'; import define from '../../../define'; import { ApiError } from '../../../error'; +import { getUser } from '../../../common/getters'; export const meta = { desc: { @@ -37,14 +38,11 @@ export const meta = { export default define(meta, async (ps, user) => { // Fetch follower - const follower = await User.findOne({ - _id: ps.userId + const follower = await getUser(ps.userId).catch(e => { + if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser); + throw e; }); - if (follower === null) { - throw new ApiError(meta.errors.noSuchUser); - } - await rejectFollowRequest(user, follower); return; -- cgit v1.2.3-freya