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

[backend/federation] Limit collection iteration

Browse source
This commit is contained in:
Kopper 2024-09-14 11:27:51 +03:00 • committed by Laura Hausmann
parent deabdc4eec
commit e8e437b9f1
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Iceshrimp.Backend/Core/Federation/ActivityPub/ObjectResolver.cs
View file

@ -91,17 +91,36 @@ public class ObjectResolver(
foreach (var item in collection.Items) foreach (var item in collection.Items)
yield return item; yield return item;
// we only limit based on pages here. the consumer of this iterator may
// additionally limit per-item via System.Linq.Async Take()
var pageLimit = 50;
// some remote software (e.g. fedibird) can get in a state where page.next == page.id
var visitedPages = new HashSet<string>();
var page = collection.First; var page = collection.First;
while (page != null) while (page != null)
{ {
if (page.IsUnresolved) if (page.IsUnresolved)
page = await ResolveObject(page, force: true) as ASCollectionPage; page = await ResolveObject(page, force: true) as ASCollectionPage;
if (page == null) break; if (page == null) break;
if (page.Items != null) if (page.Items != null)
foreach (var item in page.Items) foreach (var item in page.Items)
yield return item; yield return item;
if (page.Next?.Id != null)
{
if (visitedPages.Contains(page.Next.Id))
break;
visitedPages.Add(page.Next.Id);
}
if (--pageLimit <= 0)
break;
page = page.Next; page = page.Next;
} }
} }