From b11e4053db5b73f793029acaf2daecc3ef2ef27b Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Thu, 22 Dec 2022 16:41:06 -0500
Subject: [PATCH] server: use named export for acceptFollowRequest

---
 .../src/remote/activitypub/kernel/accept/follow.ts       | 4 ++--
 .../server/api/endpoints/following/requests/accept.ts    | 2 +-
 .../src/services/following/requests/accept-all.ts        | 4 ++--
 .../backend/src/services/following/requests/accept.ts    | 9 +++++++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/accept/follow.ts b/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
index 58249d2de..037f660c6 100644
--- a/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
@@ -1,5 +1,5 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import accept from '@/services/following/requests/accept.js';
+import { acceptFollowRequest } from '@/services/following/requests/accept.js';
 import { relayAccepted } from '@/services/relay.js';
 import { IFollow } from '@/remote/activitypub/type.js';
 import { DbResolver } from '@/remote/activitypub/db-resolver.js';
@@ -24,6 +24,6 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 		return await relayAccepted(match[1]);
 	}
 
-	await accept(actor, follower);
+	await acceptFollowRequest(actor, follower);
 	return 'ok';
 };
diff --git a/packages/backend/src/server/api/endpoints/following/requests/accept.ts b/packages/backend/src/server/api/endpoints/following/requests/accept.ts
index cd30eab98..f31aab855 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/accept.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/accept.ts
@@ -1,4 +1,4 @@
-import acceptFollowRequest from '@/services/following/requests/accept.js';
+import { acceptFollowRequest } from '@/services/following/requests/accept.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
diff --git a/packages/backend/src/services/following/requests/accept-all.ts b/packages/backend/src/services/following/requests/accept-all.ts
index 2a1344d65..58b15af01 100644
--- a/packages/backend/src/services/following/requests/accept-all.ts
+++ b/packages/backend/src/services/following/requests/accept-all.ts
@@ -1,6 +1,6 @@
 import { User } from '@/models/entities/user.js';
 import { FollowRequests, Users } from '@/models/index.js';
-import accept from './accept.js';
+import { acceptFollowRequest } from './accept.js';
 
 /**
  * 指定したユーザー宛てのフォローリクエストをすべて承認
@@ -13,6 +13,6 @@ export default async function(user: { id: User['id']; host: User['host']; uri: U
 
 	for (const request of requests) {
 		const follower = await Users.findOneByOrFail({ id: request.followerId });
-		accept(user, follower);
+		acceptFollowRequest(user, follower);
 	}
 }
diff --git a/packages/backend/src/services/following/requests/accept.ts b/packages/backend/src/services/following/requests/accept.ts
index 66abb0646..231075100 100644
--- a/packages/backend/src/services/following/requests/accept.ts
+++ b/packages/backend/src/services/following/requests/accept.ts
@@ -3,12 +3,17 @@ import renderFollow from '@/remote/activitypub/renderer/follow.js';
 import renderAccept from '@/remote/activitypub/renderer/accept.js';
 import { deliver } from '@/queue/index.js';
 import { publishMainStream } from '@/services/stream.js';
-import { User, CacheableUser } from '@/models/entities/user.js';
+import { User } from '@/models/entities/user.js';
 import { FollowRequests, Users } from '@/models/index.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { insertFollowingDoc } from '../create.js';
 
-export default async function(followee: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox']; sharedInbox: User['sharedInbox']; }, follower: CacheableUser) {
+/**
+ * Accept a follow request from user `followee` to follow `follower`.
+ * @param followee User who is being followed
+ * @param follower User making the follow request
+ */
+export async function acceptFollowRequest(followee: User, follower: User): Promise<void> {
 	const request = await FollowRequests.findOneBy({
 		followeeId: followee.id,
 		followerId: follower.id,