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

Allow ProcessNoteAsync to succeed even if inReplyTo resolution fails

Browse source
This commit is contained in:
Laura Hausmann 2024-01-28 23:33:57 +01:00
parent cb3caf4f26
commit 3f333b0c5d
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,8 +20,16 @@ public class ActivityFetcherService(HttpClient client, HttpRequestService httpRq
public async Task<IEnumerable<ASObject>> FetchActivityAsync(string url, User actor, UserKeypair keypair) {
var request = httpRqSvc.GetSigned(url, ["application/activity+json"], actor, keypair);
var response = await client.SendAsync(request);
var input = await response.Content.ReadAsStringAsync();
var json = JsonConvert.DeserializeObject<JObject?>(input, JsonSerializerSettings);
if (!response.IsSuccessStatusCode) return [];
if (response.Content.Headers.ContentType?.MediaType is
not "application/activity+json"
and not "application/ld+json"
and not "application/json")
return [];
var input = await response.Content.ReadAsStringAsync();
var json = JsonConvert.DeserializeObject<JObject?>(input, JsonSerializerSettings);
var res = LdHelpers.Expand(json) ?? throw new GracefulException("Failed to expand JSON-LD object");
return res.Select(p => p.ToObject<ASObject>(new JsonSerializer { Converters = { new ASObjectConverter() } }) ??

7
Iceshrimp.Backend/Core/Queues/InboxQueue.cs
View file

@ -13,8 +13,11 @@ public class InboxQueue {
return new JobQueue<InboxJob>("inbox", InboxQueueProcessorDelegateAsync, 4, redis, prefix);
}
private static async Task InboxQueueProcessorDelegateAsync(InboxJob job, IServiceProvider scope,
CancellationToken token) {
private static async Task InboxQueueProcessorDelegateAsync(
InboxJob job,
IServiceProvider scope,
CancellationToken token
) {
var expanded = LdHelpers.Expand(JToken.Parse(job.Body));
if (expanded == null) throw new Exception("Failed to expand ASObject");
var obj = ASObject.Deserialize(expanded);