profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactoring

Browse source 
https: //github.com/misskey-dev/misskey/pull/7901
Co-Authored-By: MeiMei <30769358+mei23@users.noreply.github.com>
This commit is contained in:
syuilo 2021-12-03 11:43:05 +09:00
parent 22464c434e
commit e617ced1d3
4 changed files with 110 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/backend/src/remote/activitypub/kernel/reject/follow.ts
View file

@ -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`;
};