usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

とりあえずtryで囲っておく

This commit is contained in:
tamaina 2024-03-10 16:17:09 +00:00
parent e2b574a97c
commit 76487de5ed
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/core/activitypub/models/ApPersonService.ts
View File

@ -551,6 +551,9 @@ export class ApPersonService implements OnModuleInit {
// Update user // Update user
await this.usersRepository.update(exist.id, updates); await this.usersRepository.update(exist.id, updates);
try {
// Deleteアクティビティ受信時にもここが走ってsaveがuserforeign key制約エラーを吐くことがある
// とりあえずtry-catchで囲っておく
const publicKeys = new Map<string, IKey>(); const publicKeys = new Map<string, IKey>();
if (person.publicKey) { if (person.publicKey) {
(person.additionalPublicKeys ?? []).forEach(key => publicKeys.set(key.id, key)); (person.additionalPublicKeys ?? []).forEach(key => publicKeys.set(key.id, key));
@ -567,6 +570,9 @@ export class ApPersonService implements OnModuleInit {
keyId: Not(In(Array.from(publicKeys.keys()))), keyId: Not(In(Array.from(publicKeys.keys()))),
userId: exist.id, userId: exist.id,
}); });
} catch (err) {
this.logger.error('something happened while updating remote user public keys:', { err });
}
let _description: string | null = null; let _description: string | null = null;