フォローリクエストがなくてもフォロー承認が出来てしまうのを修正 (#7013)

* フォローリクエストがなくてもフォロー承認が出来てしまうのを修正

* プロキシアカウントがDB処理をせずにフォローを飛ばしているのを修正

1 files changed, 2 insertions, 5 deletions

diff --git a/src/services/user-list/push.ts b/src/services/user-list/push.ts
index 0fbeae79f0..e67be4b027 100644
--- a/src/services/user-list/push.ts
+++ b/src/services/user-list/push.ts
@@ -1,6 +1,3 @@
-import { renderActivity } from '../../remote/activitypub/renderer';
-import { deliver } from '../../queue';
-import renderFollow from '../../remote/activitypub/renderer/follow';
 import { publishUserListStream } from '../stream';
 import { User } from '../../models/entities/user';
 import { UserList } from '../../models/entities/user-list';
@@ -8,6 +5,7 @@ import { UserListJoinings, Users } from '../../models';
 import { UserListJoining } from '../../models/entities/user-list-joining';
 import { genId } from '../../misc/gen-id';
 import { fetchProxyAccount } from '../../misc/fetch-proxy-account';
+import createFollowing from '../following/create';
 
 export async function pushUserToUserList(target: User, list: UserList) {
 	await UserListJoinings.save({
@@ -23,8 +21,7 @@ export async function pushUserToUserList(target: User, list: UserList) {
 	if (Users.isRemoteUser(target)) {
 		const proxy = await fetchProxyAccount();
 		if (proxy) {
-			const content = renderActivity(renderFollow(proxy, target));
-			deliver(proxy, content, target.inbox);
+			createFollowing(proxy, target);
 		}
 	}
 }