3 files changed, 59 insertions, 24 deletions

diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts
index 6fa7efb558..7e15b2d7ff 100644
--- a/src/server/api/endpoints/blocking/create.ts
+++ b/src/server/api/endpoints/blocking/create.ts
@@ -5,6 +5,7 @@ import User, { pack } from '../../../../models/user';
 import Blocking from '../../../../models/blocking';
 import create from '../../../../services/blocking/create';
 import define from '../../define';
+import { ApiError } from '../../error';
 
 export const meta = {
 	stability: 'stable',
@@ -32,15 +33,35 @@ export const meta = {
 				'en-US': 'Target user ID'
 			}
 		}
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '7cc4f851-e2f1-4621-9633-ec9e1d00c01e'
+		},
+
+		blockeeIsYourself: {
+			message: 'Blockee is yourself.',
+			code: 'BLOCKEE_IS_YOURSELF',
+			id: '88b19138-f28d-42c0-8499-6a31bbd0fdc6'
+		},
+
+		alreadyBlocking: {
+			message: 'You are already blocking that user.',
+			code: 'ALREADY_BLOCKING',
+			id: '787fed64-acb9-464a-82eb-afbd745b9614'
+		},
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+export default define(meta, async (ps, user) => {
 	const blocker = user;
 
 	// 自分自身
 	if (user._id.equals(ps.userId)) {
-		return rej('blockee is yourself');
+		throw new ApiError(meta.errors.blockeeIsYourself);
 	}
 
 	// Get blockee
@@ -54,7 +75,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	});
 
 	if (blockee === null) {
-		return rej('user not found');
+		throw new ApiError(meta.errors.noSuchUser);
 	}
 
 	// Check if already blocking
@@ -64,14 +85,13 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	});
 
 	if (exist !== null) {
-		return rej('already blocking');
+		throw new ApiError(meta.errors.alreadyBlocking);
 	}
 
 	// Create blocking
 	await create(blocker, blockee);
 
-	// Send response
-	res(await pack(blockee._id, user, {
+	return await pack(blockee._id, user, {
 		detail: true
-	}));
-}));
+	});
+});
diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts
index c176da1ea8..475f2c30a1 100644
--- a/src/server/api/endpoints/blocking/delete.ts
+++ b/src/server/api/endpoints/blocking/delete.ts
@@ -5,6 +5,7 @@ import User, { pack } from '../../../../models/user';
 import Blocking from '../../../../models/blocking';
 import deleteBlocking from '../../../../services/blocking/delete';
 import define from '../../define';
+import { ApiError } from '../../error';
 
 export const meta = {
 	stability: 'stable',
@@ -32,15 +33,35 @@ export const meta = {
 				'en-US': 'Target user ID'
 			}
 		}
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: '8621d8bf-c358-4303-a066-5ea78610eb3f'
+		},
+
+		blockeeIsYourself: {
+			message: 'Blockee is yourself.',
+			code: 'BLOCKEE_IS_YOURSELF',
+			id: '06f6fac6-524b-473c-a354-e97a40ae6eac'
+		},
+
+		notBlocking: {
+			message: 'You are not blocking that user.',
+			code: 'NOT_BLOCKING',
+			id: '291b2efa-60c6-45c0-9f6a-045c8f9b02cd'
+		},
 	}
 };
 
-export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+export default define(meta, async (ps, user) => {
 	const blocker = user;
 
 	// Check if the blockee is yourself
 	if (user._id.equals(ps.userId)) {
-		return rej('blockee is yourself');
+		throw new ApiError(meta.errors.blockeeIsYourself);
 	}
 
 	// Get blockee
@@ -54,7 +75,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	});
 
 	if (blockee === null) {
-		return rej('user not found');
+		throw new ApiError(meta.errors.noSuchUser);
 	}
 
 	// Check not blocking
@@ -64,14 +85,13 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	});
 
 	if (exist === null) {
-		return rej('already not blocking');
+		throw new ApiError(meta.errors.notBlocking);
 	}
 
 	// Delete blocking
 	await deleteBlocking(blocker, blockee);
 
-	// Send response
-	res(await pack(blockee._id, user, {
+	return await pack(blockee._id, user, {
 		detail: true
-	}));
-}));
+	});
+});
diff --git a/src/server/api/endpoints/blocking/list.ts b/src/server/api/endpoints/blocking/list.ts
index 79eaaece8a..088b2c488a 100644
--- a/src/server/api/endpoints/blocking/list.ts
+++ b/src/server/api/endpoints/blocking/list.ts
@@ -31,12 +31,7 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps, me) => new Promise(async (res, rej) => {
-	// Check if both of sinceId and untilId is specified
-	if (ps.sinceId && ps.untilId) {
-		return rej('cannot set sinceId and untilId');
-	}
-
+export default define(meta, async (ps, me) => {
 	const query = {
 		blockerId: me._id
 	} as any;
@@ -62,5 +57,5 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			sort: sort
 		});
 
-	res(await packMany(blockings, me));
-}));
+	return await packMany(blockings, me);
+});