From e617ced1d35bbc68d685ebdb3be09894621237ec Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 3 Dec 2021 11:43:05 +0900 Subject: refactoring https: //github.com/misskey-dev/misskey/pull/7901 Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com> --- packages/backend/src/remote/activitypub/kernel/reject/follow.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'packages/backend/src/remote') diff --git a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts index 356547440f..049437b18f 100644 --- a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts +++ b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts @@ -1,8 +1,9 @@ import { IRemoteUser } from '@/models/entities/user'; -import reject from '@/services/following/requests/reject'; +import { remoteReject } from '@/services/following/reject'; import { IFollow } from '../../type'; import DbResolver from '../../db-resolver'; import { relayRejected } from '@/services/relay'; +import { Users } from '@/models'; export default async (actor: IRemoteUser, activity: IFollow): Promise => { // ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある @@ -14,7 +15,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise => return `skip: follower not found`; } - if (follower.host != null) { + if (!Users.isLocalUser(follower)) { return `skip: follower is not a local user`; } @@ -24,6 +25,6 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise => return await relayRejected(match[1]); } - await reject(actor, follower); + await remoteReject(actor, follower); return `ok`; }; -- cgit v1.2.3-freya