diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2024-11-21 14:36:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-21 14:36:24 +0900 |
| commit | c1f19fad1e7e1717898b37bbb4e863e0f26b306b (patch) | |
| tree | 9375bb60afe22a7fb61391a34ae4fa78c0361419 | |
| parent | fix(backend): fix type error(s) in security fixes (#15009) (diff) | |
| download | misskey-c1f19fad1e7e1717898b37bbb4e863e0f26b306b.tar.gz misskey-c1f19fad1e7e1717898b37bbb4e863e0f26b306b.tar.bz2 misskey-c1f19fad1e7e1717898b37bbb4e863e0f26b306b.zip | |
fix(backend): fix apResolver (#15010)
* fix(backend): fix apResolver
* fix
* add comments
* tweak comment
| -rw-r--r-- | packages/backend/src/core/activitypub/ApInboxService.ts | 3 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/ap/show.ts | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts index 9838e3bd30..ee3f691c51 100644 --- a/packages/backend/src/core/activitypub/ApInboxService.ts +++ b/packages/backend/src/core/activitypub/ApInboxService.ts @@ -130,7 +130,8 @@ export class ApInboxService { if (actor.uri) { if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) { setImmediate(() => { - this.apPersonService.updatePerson(actor.uri, resolver); + // 同一ユーザーの情報を再度処理するので、使用済みのresolverを再利用してはいけない + this.apPersonService.updatePerson(actor.uri); }); } } diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts index bf99834c17..24d5a7b0f1 100644 --- a/packages/backend/src/server/api/endpoints/ap/show.ts +++ b/packages/backend/src/server/api/endpoints/ap/show.ts @@ -137,10 +137,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- if (local != null) return local; } + // 同一ユーザーの情報を再度処理するので、使用済みのresolverを再利用してはいけない return await this.mergePack( me, - isActor(object) ? await this.apPersonService.createPerson(getApId(object), resolver) : null, - isPost(object) ? await this.apNoteService.createNote(getApId(object), undefined, resolver, true) : null, + isActor(object) ? await this.apPersonService.createPerson(getApId(object)) : null, + isPost(object) ? await this.apNoteService.createNote(getApId(object), undefined, undefined, true) : null, ); } |