3 files changed, 32 insertions, 54 deletions

diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts
index e723cb0386..0d6626b2d5 100644
--- a/src/server/api/endpoints/blocking/create.ts
+++ b/src/server/api/endpoints/blocking/create.ts
@@ -1,12 +1,11 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
+import { ID } from '../../../../misc/cafy-id';
 import * as ms from 'ms';
-import { pack } from '../../../../models/user';
-import Blocking from '../../../../models/blocking';
 import create from '../../../../services/blocking/create';
 import define from '../../define';
 import { ApiError } from '../../error';
 import { getUser } from '../../common/getters';
+import { Blockings, NoteWatchings } from '../../../../models';
 
 export const meta = {
 	stability: 'stable',
@@ -25,12 +24,11 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'following-write',
+	kind: 'write:blocks',
 
 	params: {
 		userId: {
 			validator: $.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
@@ -63,7 +61,7 @@ export default define(meta, async (ps, user) => {
 	const blocker = user;
 
 	// 自分自身
-	if (user._id.equals(ps.userId)) {
+	if (user.id === ps.userId) {
 		throw new ApiError(meta.errors.blockeeIsYourself);
 	}
 
@@ -74,19 +72,22 @@ export default define(meta, async (ps, user) => {
 	});
 
 	// Check if already blocking
-	const exist = await Blocking.findOne({
-		blockerId: blocker._id,
-		blockeeId: blockee._id
+	const exist = await Blockings.findOne({
+		blockerId: blocker.id,
+		blockeeId: blockee.id
 	});
 
-	if (exist !== null) {
+	if (exist != null) {
 		throw new ApiError(meta.errors.alreadyBlocking);
 	}
 
 	// Create blocking
 	await create(blocker, blockee);
 
-	return await pack(blockee._id, user, {
-		detail: true
+	NoteWatchings.delete({
+		userId: blocker.id,
+		noteUserId: blockee.id
 	});
+
+	return await Blockings.pack(blockee.id, user);
 });
diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts
index 2a9fdc5e24..e304dca811 100644
--- a/src/server/api/endpoints/blocking/delete.ts
+++ b/src/server/api/endpoints/blocking/delete.ts
@@ -1,12 +1,11 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
+import { ID } from '../../../../misc/cafy-id';
 import * as ms from 'ms';
-import { pack } from '../../../../models/user';
-import Blocking from '../../../../models/blocking';
 import deleteBlocking from '../../../../services/blocking/delete';
 import define from '../../define';
 import { ApiError } from '../../error';
 import { getUser } from '../../common/getters';
+import { Blockings } from '../../../../models';
 
 export const meta = {
 	stability: 'stable',
@@ -25,12 +24,11 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'following-write',
+	kind: 'write:blocks',
 
 	params: {
 		userId: {
 			validator: $.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
@@ -63,7 +61,7 @@ export default define(meta, async (ps, user) => {
 	const blocker = user;
 
 	// Check if the blockee is yourself
-	if (user._id.equals(ps.userId)) {
+	if (user.id === ps.userId) {
 		throw new ApiError(meta.errors.blockeeIsYourself);
 	}
 
@@ -74,19 +72,17 @@ export default define(meta, async (ps, user) => {
 	});
 
 	// Check not blocking
-	const exist = await Blocking.findOne({
-		blockerId: blocker._id,
-		blockeeId: blockee._id
+	const exist = await Blockings.findOne({
+		blockerId: blocker.id,
+		blockeeId: blockee.id
 	});
 
-	if (exist === null) {
+	if (exist == null) {
 		throw new ApiError(meta.errors.notBlocking);
 	}
 
 	// Delete blocking
 	await deleteBlocking(blocker, blockee);
 
-	return await pack(blockee._id, user, {
-		detail: true
-	});
+	return await Blockings.pack(blockee.id, user);
 });
diff --git a/src/server/api/endpoints/blocking/list.ts b/src/server/api/endpoints/blocking/list.ts
index b9ad6e8a3f..a078891ab0 100644
--- a/src/server/api/endpoints/blocking/list.ts
+++ b/src/server/api/endpoints/blocking/list.ts
@@ -1,7 +1,8 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import Blocking, { packMany } from '../../../../models/blocking';
+import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
+import { Blockings } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
 
 export const meta = {
 	desc: {
@@ -13,7 +14,7 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'following-read',
+	kind: 'read:blocks',
 
 	params: {
 		limit: {
@@ -23,12 +24,10 @@ export const meta = {
 
 		sinceId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 
 		untilId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 	},
 
@@ -41,30 +40,12 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
-	const query = {
-		blockerId: me._id
-	} as any;
+	const query = makePaginationQuery(Blockings.createQueryBuilder('blocking'), ps.sinceId, ps.untilId)
+		.andWhere(`blocking.blockerId = :meId`, { meId: me.id });
 
-	const sort = {
-		_id: -1
-	};
+	const blockings = await query
+		.take(ps.limit)
+		.getMany();
 
-	if (ps.sinceId) {
-		sort._id = 1;
-		query._id = {
-			$gt: ps.sinceId
-		};
-	} else if (ps.untilId) {
-		query._id = {
-			$lt: ps.untilId
-		};
-	}
-
-	const blockings = await Blocking
-		.find(query, {
-			limit: ps.limit,
-			sort: sort
-		});
-
-	return await packMany(blockings, me);
+	return await Blockings.packMany(blockings, me);
 });