Merge branch 'develop'

1 files changed, 9 insertions, 11 deletions

diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts
index 81b2399551..5b43815a5e 100644
--- a/src/server/api/endpoints/following/create.ts
+++ b/src/server/api/endpoints/following/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 Following from '../../../../models/following';
 import create from '../../../../services/following/create';
 import define from '../../define';
 import { ApiError } from '../../error';
 import { getUser } from '../../common/getters';
+import { Followings, Users } from '../../../../models';
 
 export const meta = {
 	stability: 'stable',
@@ -25,12 +24,11 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'following-write',
+	kind: 'write:following',
 
 	params: {
 		userId: {
 			validator: $.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
@@ -75,7 +73,7 @@ export default define(meta, async (ps, user) => {
 	const follower = user;
 
 	// 自分自身
-	if (user._id.equals(ps.userId)) {
+	if (user.id === ps.userId) {
 		throw new ApiError(meta.errors.followeeIsYourself);
 	}
 
@@ -86,12 +84,12 @@ export default define(meta, async (ps, user) => {
 	});
 
 	// Check if already following
-	const exist = await Following.findOne({
-		followerId: follower._id,
-		followeeId: followee._id
+	const exist = await Followings.findOne({
+		followerId: follower.id,
+		followeeId: followee.id
 	});
 
-	if (exist !== null) {
+	if (exist != null) {
 		throw new ApiError(meta.errors.alreadyFollowing);
 	}
 
@@ -103,5 +101,5 @@ export default define(meta, async (ps, user) => {
 		throw e;
 	}
 
-	return await pack(followee._id, user);
+	return await Users.pack(followee.id, user);
 });