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

refreshAndfindKey → refreshAndFindKey

This commit is contained in:
tamaina 2024-07-18 00:12:21 +09:00
parent cd19ad694c
commit 99113d59f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/backend/src/core/activitypub/ApDbResolverService.ts
View File

@ -128,16 +128,16 @@ export class ApDbResolverService implements OnApplicationShutdown {
} }
@bindThis @bindThis
private async refreshAndfindKey(userId: MiUser['id'], keyId: string): Promise<MiUserPublickey | null> { private async refreshAndFindKey(userId: MiUser['id'], keyId: string): Promise<MiUserPublickey | null> {
this.refreshCacheByUserId(userId); this.refreshCacheByUserId(userId);
const keys = await this.getPublicKeyByUserId(userId); const keys = await this.getPublicKeyByUserId(userId);
if (keys == null || !Array.isArray(keys) || keys.length === 0) { if (keys == null || !Array.isArray(keys) || keys.length === 0) {
this.logger.warn(`No key found (refreshAndfindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`); this.logger.warn(`No key found (refreshAndFindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`);
return null; return null;
} }
const exactKey = keys.find(x => x.keyId === keyId); const exactKey = keys.find(x => x.keyId === keyId);
if (exactKey) return exactKey; if (exactKey) return exactKey;
this.logger.warn(`No exact key found (refreshAndfindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`); this.logger.warn(`No exact key found (refreshAndFindKey) userId=${userId} keyId=${keyId} keys=${JSON.stringify(keys)}`);
return null; return null;
} }
@ -213,7 +213,7 @@ export class ApDbResolverService implements OnApplicationShutdown {
// まずはキャッシュを更新して再取得 // まずはキャッシュを更新して再取得
const cacheRaw = this.publicKeyByUserIdCache.cache.get(user.id); const cacheRaw = this.publicKeyByUserIdCache.cache.get(user.id);
if (cacheRaw && cacheRaw.date > Date.now() - 1000 * 60 * 12) { if (cacheRaw && cacheRaw.date > Date.now() - 1000 * 60 * 12) {
const exactKey = await this.refreshAndfindKey(user.id, keyId); const exactKey = await this.refreshAndFindKey(user.id, keyId);
if (exactKey) return { user, key: exactKey }; if (exactKey) return { user, key: exactKey };
} }
@ -223,7 +223,7 @@ export class ApDbResolverService implements OnApplicationShutdown {
const renewed = await this.apPersonService.fetchPersonWithRenewal(uri, 0); const renewed = await this.apPersonService.fetchPersonWithRenewal(uri, 0);
if (renewed == null || renewed.isDeleted) return null; if (renewed == null || renewed.isDeleted) return null;
return { user, key: await this.refreshAndfindKey(user.id, keyId) }; return { user, key: await this.refreshAndFindKey(user.id, keyId) };
} }
this.logger.warn(`No key found uri=${uri} userId=${user.id} keyId=${keyId}`); this.logger.warn(`No key found uri=${uri} userId=${user.id} keyId=${keyId}`);