notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/federation] Set VerifiedFetch in FetchNoteAsync (ISH-262)

Browse source
This commit is contained in:
Laura Hausmann 2024-04-16 18:10:14 +02:00
parent 3fad9632c7
commit 469f02c5ac
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityFetcherService.cs
View file

@ -56,7 +56,7 @@ public class ActivityFetcherService(
if (activityIdUri.Host != finalUri.Host) if (activityIdUri.Host != finalUri.Host)
throw GracefulException.UnprocessableEntity("Activity identifier doesn't match final host"); throw GracefulException.UnprocessableEntity("Activity identifier doesn't match final host");
logger.LogDebug("Fetching activity {url} as user {id} (attempt 2)", activityIdUri.AbsoluteUri, actor.Id); logger.LogDebug("Fetching activity {url} as user {id} (attempt 2)", activityIdUri.AbsoluteUri, actor.Id);
(activity, finalUri) = await FetchActivityInternal(activityIdUri.AbsoluteUri, actor, keypair); (activity, finalUri) = await FetchActivityInternal(activityIdUri.AbsoluteUri, actor, keypair);
if (activity == null) return []; if (activity == null) return [];
@ -190,24 +190,25 @@ public class ActivityFetcherService(
throw new GracefulException("Failed to fetch actor"); throw new GracefulException("Failed to fetch actor");
} }
public async Task<ASNote?> FetchNoteAsync(string uri, User actor, UserKeypair keypair) private async Task<ASNote?> FetchNoteAsync(string uri, User actor, UserKeypair keypair)
{ {
var activity = await FetchActivityAsync(uri, actor, keypair); var activity = await FetchActivityAsync(uri, actor, keypair);
return activity.OfType<ASNote>().FirstOrDefault(); var note = activity.OfType<ASNote>().FirstOrDefault();
if (note != null)
note.VerifiedFetch = true;
return note;
} }
public async Task<ASNote?> FetchNoteAsync(string uri, User actor) public async Task<ASNote?> FetchNoteAsync(string uri, User actor)
{ {
var keypair = await db.UserKeypairs.FirstOrDefaultAsync(p => p.User == actor) ?? var keypair = await db.UserKeypairs.FirstOrDefaultAsync(p => p.User == actor) ??
throw new Exception("Actor has no keypair"); throw new Exception("Actor has no keypair");
var activity = await FetchActivityAsync(uri, actor, keypair); return await FetchNoteAsync(uri, actor, keypair);
return activity.OfType<ASNote>().FirstOrDefault();
} }
public async Task<ASNote?> FetchNoteAsync(string uri) public async Task<ASNote?> FetchNoteAsync(string uri)
{ {
var (actor, keypair) = await systemUserSvc.GetInstanceActorWithKeypairAsync(); var (actor, keypair) = await systemUserSvc.GetInstanceActorWithKeypairAsync();
var activity = await FetchActivityAsync(uri, actor, keypair); return await FetchNoteAsync(uri, actor, keypair);
return activity.OfType<ASNote>().FirstOrDefault();
} }
} }