diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-12-03 11:43:05 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-12-03 11:43:05 +0900 |
| commit | e617ced1d35bbc68d685ebdb3be09894621237ec (patch) | |
| tree | 05f36a80e3ca1aa3afe57020e2b23f8c84fd0d1d /packages/backend/src/remote/activitypub | |
| parent | fix: 画像ファイルの縦横サイズの取得で Exif Orientation を考... (diff) | |
| download | misskey-e617ced1d35bbc68d685ebdb3be09894621237ec.tar.gz misskey-e617ced1d35bbc68d685ebdb3be09894621237ec.tar.bz2 misskey-e617ced1d35bbc68d685ebdb3be09894621237ec.zip | |
refactoring
https: //github.com/misskey-dev/misskey/pull/7901
Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/remote/activitypub')
| -rw-r--r-- | packages/backend/src/remote/activitypub/kernel/reject/follow.ts | 7 |
1 files changed, 4 insertions, 3 deletions
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<string> => { // ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある @@ -14,7 +15,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<string> => 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<string> => return await relayRejected(match[1]); } - await reject(actor, follower); + await remoteReject(actor, follower); return `ok`; }; |