From 56fa24e40166f59482d25ebc04a8335a60b072ff Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 2 Jun 2018 12:58:56 +0900 Subject: wip --- .../api/endpoints/following/requests/accept.ts | 6 +++--- .../api/endpoints/following/requests/cancel.ts | 22 +++++++++++----------- .../api/endpoints/following/requests/reject.ts | 6 +++--- 3 files changed, 17 insertions(+), 17 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 f8df3b7850..705d3b161a 100644 --- a/src/server/api/endpoints/following/requests/accept.ts +++ b/src/server/api/endpoints/following/requests/accept.ts @@ -6,9 +6,9 @@ import User from '../../../../../models/user'; * Accept a follow request */ module.exports = (params, user) => new Promise(async (res, rej) => { - // Get 'followerId' parameter - const [followerId, followerIdErr] = $.type(ID).get(params.followerId); - if (followerIdErr) return rej('invalid followerId param'); + // Get 'userId' parameter + const [followerId, followerIdErr] = $.type(ID).get(params.userId); + if (followerIdErr) return rej('invalid userId param'); // Fetch follower const follower = await User.findOne({ diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index 417422e06b..388a54890b 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -1,26 +1,26 @@ import $ from 'cafy'; import ID from '../../../../../cafy-id'; import cancelFollowRequest from '../../../../../services/following/requests/cancel'; -import User from '../../../../../models/user'; +import User, { pack } from '../../../../../models/user'; /** * Cancel a follow request */ module.exports = (params, user) => new Promise(async (res, rej) => { - // Get 'followerId' parameter - const [followerId, followerIdErr] = $.type(ID).get(params.followerId); - if (followerIdErr) return rej('invalid followerId param'); + // Get 'userId' parameter + const [followeeId, followeeIdErr] = $.type(ID).get(params.userId); + if (followeeIdErr) return rej('invalid userId param'); - // Fetch follower - const follower = await User.findOne({ - _id: followerId + // Fetch followee + const followee = await User.findOne({ + _id: followeeId }); - if (follower === null) { - return rej('follower not found'); + if (followee === null) { + return rej('followee not found'); } - await cancelFollowRequest(user, follower); + await cancelFollowRequest(followee, user); // Send response - res(); + res(await pack(followee._id, user)); }); diff --git a/src/server/api/endpoints/following/requests/reject.ts b/src/server/api/endpoints/following/requests/reject.ts index 4900127a57..1cfb562b55 100644 --- a/src/server/api/endpoints/following/requests/reject.ts +++ b/src/server/api/endpoints/following/requests/reject.ts @@ -6,9 +6,9 @@ import User from '../../../../../models/user'; * Reject a follow request */ module.exports = (params, user) => new Promise(async (res, rej) => { - // Get 'followerId' parameter - const [followerId, followerIdErr] = $.type(ID).get(params.followerId); - if (followerIdErr) return rej('invalid followerId param'); + // Get 'userId' parameter + const [followerId, followerIdErr] = $.type(ID).get(params.userId); + if (followerIdErr) return rej('invalid userId param'); // Fetch follower const follower = await User.findOne({ -- cgit v1.2.3-freya