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

infer ActivityPub links from local DB

Browse source
This commit is contained in:
Hazelnoot 2025-05-05 09:07:26 -04:00
parent 2fb56bc4ea
commit ab65f4b8b2
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,9 @@ import { RedisKVCache } from '@/misc/cache.js';
import { UtilityService } from '@/core/UtilityService.js'; import { UtilityService } from '@/core/UtilityService.js';
import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js'; import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
import type { FastifyRequest, FastifyReply } from 'fastify'; import type { FastifyRequest, FastifyReply } from 'fastify';
import type { NotesRepository } from '@/models/_.js';
import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
import { IsNull, Not } from 'typeorm';
export type LocalSummalyResult = SummalyResult & { export type LocalSummalyResult = SummalyResult & {
haveNoteLocally?: boolean; haveNoteLocally?: boolean;
@ -40,9 +43,13 @@ export class UrlPreviewService {
@Inject(DI.meta) @Inject(DI.meta)
private readonly meta: MiMeta, private readonly meta: MiMeta,
@Inject(DI.notesRepository)
private readonly notesRepository: NotesRepository,
private httpRequestService: HttpRequestService, private httpRequestService: HttpRequestService,
private loggerService: LoggerService, private loggerService: LoggerService,
private readonly utilityService: UtilityService, private readonly utilityService: UtilityService,
private readonly apUtilityService: ApUtilityService,
private readonly apDbResolverService: ApDbResolverService, private readonly apDbResolverService: ApDbResolverService,
) { ) {
this.logger = this.loggerService.getLogger('url-preview'); this.logger = this.loggerService.getLogger('url-preview');
@ -143,6 +150,9 @@ export class UrlPreviewService {
if (summary.activityPub) { if (summary.activityPub) {
summary.haveNoteLocally = !!await this.apDbResolverService.getNoteFromApId(summary.activityPub); summary.haveNoteLocally = !!await this.apDbResolverService.getNoteFromApId(summary.activityPub);
} else {
// Summaly cannot always detect links to a fedi post, so check if it matches anything we already have
await this.inferActivityPubLink(summary);
} }
this.previewCache.set(key, summary); this.previewCache.set(key, summary);
@ -198,4 +208,33 @@ export class UrlPreviewService {
return this.httpRequestService.getJson<LocalSummalyResult>(`${proxy}?${queryStr}`, 'application/json, */*', undefined, true); return this.httpRequestService.getJson<LocalSummalyResult>(`${proxy}?${queryStr}`, 'application/json, */*', undefined, true);
} }
private async inferActivityPubLink(summary: LocalSummalyResult) {
// Match canonical URI first.
// This covers local and remote links.
const isCanonicalUri = !!await this.apDbResolverService.getNoteFromApId(summary.url);
if (isCanonicalUri) {
summary.activityPub = summary.url;
summary.haveNoteLocally = true;
}
// Try public URL next.
// This is necessary for Mastodon and other software with a different public URL.
const urlMatches = await this.notesRepository.find({
select: {
uri: true,
},
where: {
url: summary.url,
uri: Not(IsNull()),
},
}) as { uri: string }[];
// Older versions did not validate URL, so do it now to avoid impersonation.
const matchByUrl = urlMatches.find(({ uri }) => this.apUtilityService.haveSameAuthority(uri, summary.url));
if (matchByUrl) {
summary.activityPub = matchByUrl.uri;
summary.haveNoteLocally = true;
}
}
} }