forked from mirrors/misskey
fix
This commit is contained in:
parent
563f200864
commit
985feea326
2 changed files with 6 additions and 2 deletions
|
|
@ -673,7 +673,11 @@ export class ApPersonService implements OnModuleInit {
|
|||
public async resolvePerson(uri: string, resolver?: Resolver): Promise<MiLocalUser | MiRemoteUser> {
|
||||
//#region このサーバーに既に登録されていたらそれを返す
|
||||
const exist = await this.fetchPerson(uri);
|
||||
if (exist) return exist;
|
||||
if (exist && !exist.isDeleted) return exist;
|
||||
if (exist?.isDeleted && exist.host != null) {
|
||||
this.cacheService.uriPersonCache.delete(uri);
|
||||
await this.usersRepository.delete({ id: exist.id, isDeleted: true });
|
||||
}
|
||||
//#endregion
|
||||
|
||||
// リモートサーバーからフェッチしてきて登録
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ export class InboxProcessorService implements OnApplicationShutdown {
|
|||
|
||||
// 存在しないActorに対するDeleteアクティビティは無視
|
||||
if (isDelete(activity)) {
|
||||
const existingActor = await this.apDbResolverService.getUserFromApId(activity.actor);
|
||||
const existingActor = await this.apPersonService.fetchPerson(getApId(activity.actor));
|
||||
if (existingActor == null) {
|
||||
return `skip: Delete activity for unknown actor ${getApId(activity.actor)}`;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue