From d0a074ac899d4bf2f4613ebf34d3650fc80ab2fc Mon Sep 17 00:00:00 2001 From: dakkar Date: Sat, 15 Mar 2025 19:05:28 +0000 Subject: fetch linked notes manually, unless we have them in DB - fixes 1006 --- packages/backend/src/server/web/UrlPreviewService.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'packages/backend/src') diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts index 19dac1dfb8..cf130a21ec 100644 --- a/packages/backend/src/server/web/UrlPreviewService.ts +++ b/packages/backend/src/server/web/UrlPreviewService.ts @@ -19,6 +19,7 @@ import { MiMeta } from '@/models/Meta.js'; import { RedisKVCache } from '@/misc/cache.js'; import { UtilityService } from '@/core/UtilityService.js'; import type { FastifyRequest, FastifyReply } from 'fastify'; +import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js'; @Injectable() export class UrlPreviewService { @@ -38,6 +39,7 @@ export class UrlPreviewService { private httpRequestService: HttpRequestService, private loggerService: LoggerService, private utilityService: UtilityService, + private apDbResolverService: ApDbResolverService, ) { this.logger = this.loggerService.getLogger('url-preview'); this.previewCache = new RedisKVCache(this.redisClient, 'summaly', { @@ -102,12 +104,16 @@ export class UrlPreviewService { } const key = `${url}@${lang}`; - const cached = await this.previewCache.get(key); + const cached = await this.previewCache.get(key) as SummalyResult & { haveNoteLocally?: boolean }; if (cached !== undefined) { this.logger.info(`Returning cache preview of ${key}`); // Cache 7days reply.header('Cache-Control', 'max-age=604800, immutable'); + if (cached.activityPub) { + cached.haveNoteLocally = !! await this.apDbResolverService.getNoteFromApId(cached.activityPub); + } + return cached; } @@ -116,7 +122,7 @@ export class UrlPreviewService { : `Getting preview of ${key} ...`); try { - const summary = this.meta.urlPreviewSummaryProxyUrl + const summary: SummalyResult & { haveNoteLocally?: boolean } = this.meta.urlPreviewSummaryProxyUrl ? await this.fetchSummaryFromProxy(url, this.meta, lang) : await this.fetchSummary(url, this.meta, lang); @@ -135,6 +141,10 @@ export class UrlPreviewService { this.previewCache.set(key, summary); + if (summary.activityPub) { + summary.haveNoteLocally = !! await this.apDbResolverService.getNoteFromApId(summary.activityPub); + } + // Cache 7days reply.header('Cache-Control', 'max-age=604800, immutable'); -- cgit v1.2.3-freya