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

[backend/federation] Mention resolver failures shouldn't reject an entire request / job process (ISH-50)

Browse source
This commit is contained in:
Laura Hausmann 2024-02-12 20:12:21 +01:00
parent 75a6fcce21
commit da99cff582
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Iceshrimp.Backend/Core/Services/NoteService.cs
View file

@ -79,8 +79,8 @@ public class NoteService(
var recipients = await db.Users
.Where(p => mentionedUserIds.Contains(p.Id))
.Select(p => new User {
Host = p.Host,
Inbox = p.Inbox
Host = p.Host,
Inbox = p.Inbox
})
.ToListAsync();
@ -198,10 +198,17 @@ public class NoteService(
private async Task<MentionQuad> ResolveNoteMentionsAsync(ASNote note) {
var mentionTags = note.Tags?.OfType<ASMention>().Where(p => p.Href != null) ?? [];
var users = await mentionTags
.Select(async p => await userResolver.ResolveAsync(p.Href!.Id!))
.Select(async p => {
try {
return await userResolver.ResolveAsync(p.Href!.Id!);
}
catch {
return null;
}
})
.AwaitAllNoConcurrencyAsync();
return ResolveNoteMentions(users);
return ResolveNoteMentions(users.Where(p => p != null).Select(p => p!).ToList());
}
private async Task<MentionQuad> ResolveNoteMentionsAsync(string? text) {
@ -209,11 +216,19 @@ public class NoteService(
? await MfmParser.Parse(text)
.SelectMany(p => p.Children.Append(p))
.OfType<MfmMentionNode>()
.Select(async p => await userResolver.ResolveAsync(p.Acct))
.DistinctBy(p => p.Acct)
.Select(async p => {
try {
return await userResolver.ResolveAsync(p.Acct);
}
catch {
return null;
}
})
.AwaitAllNoConcurrencyAsync()
: [];
return ResolveNoteMentions(users);
return ResolveNoteMentions(users.Where(p => p != null).Select(p => p!).ToList());
}
private MentionQuad ResolveNoteMentions(IReadOnlyCollection<User> users) {