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

* :v:

* Fix

1 files changed, 21 insertions, 5 deletions

diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts
index dff255eff5..bca9feaba9 100644
--- a/src/server/api/endpoints/following/requests/cancel.ts
+++ b/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);
+});