mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-08-22 02:53:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid fetching notes twice in UrlPreviewService

Browse source
This commit is contained in:
Hazelnoot 2025-05-05 10:32:06 -04:00
parent 70d75f1d57
commit 633718ffe9
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
packages/backend/src/server/web/UrlPreviewService.ts
View file

@ -160,10 +160,13 @@ export class UrlPreviewService {
summary.thumbnail = this.wrap(summary.thumbnail); summary.thumbnail = this.wrap(summary.thumbnail);
// Summaly cannot always detect links to a fedi post, so do some additional tests to try and find missed cases. // Summaly cannot always detect links to a fedi post, so do some additional tests to try and find missed cases.
summary.activityPub ??= await this.inferActivityPubLink(summary); if (!summary.activityPub) {
await this.inferActivityPubLink(summary);
}
if (summary.activityPub) { if (summary.activityPub) {
summary.haveNoteLocally = !!await this.apDbResolverService.getNoteFromApId(summary.activityPub); // Avoid duplicate checks in case inferActivityPubLink already set this.
summary.haveNoteLocally ||= !!await this.apDbResolverService.getNoteFromApId(summary.activityPub);
} }
// Await this to avoid hammering redis when a bunch of URLs are fetched at once // Await this to avoid hammering redis when a bunch of URLs are fetched at once
@ -261,12 +264,14 @@ export class UrlPreviewService {
} }
} }
private async inferActivityPubLink(summary: LocalSummalyResult): Promise<string | null> { private async inferActivityPubLink(summary: LocalSummalyResult) {
// Match canonical URI first. // Match canonical URI first.
// This covers local and remote links. // This covers local and remote links.
const isCanonicalUri = !!await this.apDbResolverService.getNoteFromApId(summary.url); const isCanonicalUri = !!await this.apDbResolverService.getNoteFromApId(summary.url);
if (isCanonicalUri) { if (isCanonicalUri) {
return summary.url; summary.activityPub = summary.url;
summary.haveNoteLocally = true;
return;
} }
// Try public URL next. // Try public URL next.
@ -284,17 +289,17 @@ export class UrlPreviewService {
// Older versions did not validate URL, so do it now to avoid impersonation. // Older versions did not validate URL, so do it now to avoid impersonation.
const matchByUrl = urlMatches.find(({ uri }) => this.apUtilityService.haveSameAuthority(uri, summary.url)); const matchByUrl = urlMatches.find(({ uri }) => this.apUtilityService.haveSameAuthority(uri, summary.url));
if (matchByUrl) { if (matchByUrl) {
return matchByUrl.uri; summary.activityPub = matchByUrl.uri;
summary.haveNoteLocally = true;
return;
} }
// Finally, attempt a signed GET in case it's a direct link to an instance with authorized fetch. // Finally, attempt a signed GET in case it's a direct link to an instance with authorized fetch.
const instanceActor = await this.systemAccountService.getInstanceActor(); const instanceActor = await this.systemAccountService.getInstanceActor();
const remoteObject = await this.apRequestService.signedGet(summary.url, instanceActor).catch(() => null); const remoteObject = await this.apRequestService.signedGet(summary.url, instanceActor).catch(() => null);
if (remoteObject) { if (remoteObject) {
return remoteObject.id; summary.activityPub = remoteObject.id;
} return;
}
// No match :(
return null;
} }
} }