Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fetchPersonWithRenewalでエラーが起きたら古いデータを返す

Browse source
This commit is contained in:
tamaina 2024-03-10 16:38:53 +00:00
parent 76487de5ed
commit d7c32cef70
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -249,6 +249,12 @@ export class ApPersonService implements OnModuleInit {
return null; return null;
} }
/**
* uriからUser(Person)をフェッチします。
*
* Misskeyに対象のPersonが登録されていればそれを返し、登録がなければnullを返します。
* また、TTLが0でない場合、TTLを過ぎていた場合はupdatePersonを実行します。
*/
@bindThis @bindThis
async fetchPersonWithRenewal(uri: string, TTL = REMOTE_USER_CACHE_TTL): Promise<MiLocalUser | MiRemoteUser | null> { async fetchPersonWithRenewal(uri: string, TTL = REMOTE_USER_CACHE_TTL): Promise<MiLocalUser | MiRemoteUser | null> {
const exist = await this.fetchPerson(uri); const exist = await this.fetchPerson(uri);
@ -257,8 +263,12 @@ export class ApPersonService implements OnModuleInit {
if (this.userEntityService.isRemoteUser(exist)) { if (this.userEntityService.isRemoteUser(exist)) {
if (TTL === 0 || exist.lastFetchedAt == null || Date.now() - exist.lastFetchedAt.getTime() > TTL) { if (TTL === 0 || exist.lastFetchedAt == null || Date.now() - exist.lastFetchedAt.getTime() > TTL) {
this.logger.debug('fetchPersonWithRenewal: renew', { uri, TTL, lastFetchedAt: exist.lastFetchedAt }); this.logger.debug('fetchPersonWithRenewal: renew', { uri, TTL, lastFetchedAt: exist.lastFetchedAt });
await this.updatePerson(exist.uri); try {
return await this.fetchPerson(uri); await this.updatePerson(exist.uri);
return await this.fetchPerson(uri);
} catch (err) {
this.logger.error('error occurred while renewing user', { err });
}
} }
this.logger.debug('fetchPersonWithRenewal: use cache', { uri, TTL, lastFetchedAt: exist.lastFetchedAt }); this.logger.debug('fetchPersonWithRenewal: use cache', { uri, TTL, lastFetchedAt: exist.lastFetchedAt });
} }