Improve error handling of API (#4345)

* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* Fix

src/server/api/endpoints/following/requests/accept.ts

@@ -3,6 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
 import acceptFollowRequest from '../../../../../services/following/requests/accept';
 import User from '../../../../../models/user';
 import define from '../../../define';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	desc: {
@@ -23,20 +24,28 @@ export const meta = {
 				'en-US': 'Target user ID'
 			}
 		}
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '66ce1645-d66c-46bb-8b79-96739af885bd'
+		},
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+export default define(meta, async (ps, user) => {
 	// Fetch follower
 	const follower = await User.findOne({
 		_id: ps.userId
 	});
 
 	if (follower === null) {
-		return rej('follower not found');
+		throw new ApiError(meta.errors.noSuchUser);
 	}
 
 	await acceptFollowRequest(user, follower);
 
-	res();
-}));
+	return;
+});

src/server/api/endpoints/following/requests/cancel.ts

@@ -3,6 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
 import cancelFollowRequest from '../../../../../services/following/requests/cancel';
 import User, { pack } from '../../../../../models/user';
 import define from '../../../define';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	desc: {
@@ -23,24 +24,39 @@ export const meta = {
 				'en-US': 'Target user ID'
 			}
 		}
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '4e68c551-fc4c-4e46-bb41-7d4a37bf9dab'
+		},
+
+		followRequestNotFound: {
+			message: 'Follow request not found.',
+			code: 'FOLLOW_REQUEST_NOT_FOUND',
+			id: '089b125b-d338-482a-9a09-e2622ac9f8d4'
+		},
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+export default define(meta, async (ps, user) => {
 	// Fetch followee
 	const followee = await User.findOne({
 		_id: ps.userId
 	});
 
 	if (followee === null) {
-		return rej('followee not found');
+		throw new ApiError(meta.errors.noSuchUser);
 	}
 
 	try {
 		await cancelFollowRequest(followee, user);
 	} catch (e) {
-		return rej(e);
+		if (e.id === '17447091-ce07-46dd-b331-c1fd4f15b1e7') throw new ApiError(meta.errors.followRequestNotFound);
+		throw e;
 	}
 
-	res(await pack(followee._id, user));
-}));
+	return await pack(followee._id, user);
+});

src/server/api/endpoints/following/requests/list.ts

@@ -1,5 +1,3 @@
-// import $ from 'cafy';
-// import ID, { transform } from '../../../../../cafy-id';
 import FollowRequest, { pack } from '../../../../../models/follow-request';
 import define from '../../../define';
 
@@ -14,11 +12,10 @@ export const meta = {
 	kind: 'following-read'
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+export default define(meta, async (ps, user) => {
 	const reqs = await FollowRequest.find({
 		followeeId: user._id
 	});
 
-	// Send response
-	res(await Promise.all(reqs.map(req => pack(req))));
-}));
+	return await Promise.all(reqs.map(req => pack(req)));
+});

src/server/api/endpoints/following/requests/reject.ts

@@ -3,6 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
 import rejectFollowRequest from '../../../../../services/following/requests/reject';
 import User from '../../../../../models/user';
 import define from '../../../define';
+import { ApiError } from '../../../error';
 
 export const meta = {
 	desc: {
@@ -23,20 +24,28 @@ export const meta = {
 				'en-US': 'Target user ID'
 			}
 		}
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: 'abc2ffa6-25b2-4380-ba99-321ff3a94555'
+		},
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+export default define(meta, async (ps, user) => {
 	// Fetch follower
 	const follower = await User.findOne({
 		_id: ps.userId
 	});
 
 	if (follower === null) {
-		return rej('follower not found');
+		throw new ApiError(meta.errors.noSuchUser);
 	}
 
 	await rejectFollowRequest(user, follower);
 
-	res();
-}));
+	return;
+});