mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-27 14:28:08 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

[backend] Fix html cache dbFallback for user profiles

Browse Source
This commit is contained in:
Laura Hausmann 2023-11-27 14:36:40 +01:00
parent 683e01d286
commit 2d475cb632
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/server/api/mastodon/converters/user.ts
View File

@ -54,7 +54,7 @@ export class UserConverter {
: UserProfiles.findOneBy({ userId: u.id }); : UserProfiles.findOneBy({ userId: u.id });
const bio = this.userBioHtmlCache.fetch(identifier, async () => { const bio = this.userBioHtmlCache.fetch(identifier, async () => {
return htmlCacheEntryLock.acquire(u.id, async () => { return htmlCacheEntryLock.acquire(u.id, async () => {
if (htmlCacheEntry === undefined) await this.fetchFromCacheWithFallback(u, await profile, ctx); if (htmlCacheEntry === undefined) htmlCacheEntry = await this.fetchFromCacheWithFallback(u, await profile, ctx);
if (htmlCacheEntry === null) { if (htmlCacheEntry === null) {
return Promise.resolve(profile).then(async profile => { return Promise.resolve(profile).then(async profile => {
return MfmHelpers.toHtml(mfm.parse(profile?.description ?? ""), profile?.mentions, u.host) return MfmHelpers.toHtml(mfm.parse(profile?.description ?? ""), profile?.mentions, u.host)
@ -117,7 +117,7 @@ export class UserConverter {
const fields = const fields =
this.userFieldsHtmlCache.fetch(identifier, async () => { this.userFieldsHtmlCache.fetch(identifier, async () => {
return htmlCacheEntryLock.acquire(u.id, async () => { return htmlCacheEntryLock.acquire(u.id, async () => {
if (htmlCacheEntry === undefined) await this.fetchFromCacheWithFallback(u, await profile, ctx); if (htmlCacheEntry === undefined) htmlCacheEntry = await this.fetchFromCacheWithFallback(u, await profile, ctx);
if (htmlCacheEntry === null) { if (htmlCacheEntry === null) {
return Promise.resolve(profile).then(profile => Promise.all(profile?.fields.map(async p => this.encodeField(p, u.host, profile?.mentions)) ?? [])); return Promise.resolve(profile).then(profile => Promise.all(profile?.fields.map(async p => this.encodeField(p, u.host, profile?.mentions)) ?? []));
} }