refactoring

Resolve #7779

2 files changed, 0 insertions, 53 deletions

diff --git a/src/remote/activitypub/kernel/accept/follow.ts b/src/remote/activitypub/kernel/accept/follow.ts
deleted file mode 100644
index 1afb733ab5..0000000000
--- a/src/remote/activitypub/kernel/accept/follow.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { IRemoteUser } from '@/models/entities/user';
-import accept from '@/services/following/requests/accept';
-import { IFollow } from '../../type';
-import DbResolver from '../../db-resolver';
-import { relayAccepted } from '@/services/relay';
-
-export default async (actor: IRemoteUser, activity: IFollow): Promise<string> => {
-	// ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある
-
-	const dbResolver = new DbResolver();
-	const follower = await dbResolver.getUserFromApId(activity.actor);
-
-	if (follower == null) {
-		return `skip: follower not found`;
-	}
-
-	if (follower.host != null) {
-		return `skip: follower is not a local user`;
-	}
-
-	// relay
-	const match = activity.id?.match(/follow-relay\/(\w+)/);
-	if (match) {
-		return await relayAccepted(match[1]);
-	}
-
-	await accept(actor, follower);
-	return `ok`;
-};
diff --git a/src/remote/activitypub/kernel/accept/index.ts b/src/remote/activitypub/kernel/accept/index.ts
deleted file mode 100644
index 5c6f81b2e3..0000000000
--- a/src/remote/activitypub/kernel/accept/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import Resolver from '../../resolver';
-import { IRemoteUser } from '@/models/entities/user';
-import acceptFollow from './follow';
-import { IAccept, isFollow, getApType } from '../../type';
-import { apLogger } from '../../logger';
-
-const logger = apLogger;
-
-export default async (actor: IRemoteUser, activity: IAccept): Promise<string> => {
-	const uri = activity.id || activity;
-
-	logger.info(`Accept: ${uri}`);
-
-	const resolver = new Resolver();
-
-	const object = await resolver.resolve(activity.object).catch(e => {
-		logger.error(`Resolution failed: ${e}`);
-		throw e;
-	});
-
-	if (isFollow(object)) return await acceptFollow(actor, object);
-
-	return `skip: Unknown Accept type: ${getApType(object)}`;
-};