From 60a28c314cb840851dc8bcd1942cd630d34001a0 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Tue, 9 Jul 2024 22:26:21 +0200 Subject: [PATCH] [backend/asp] Fix link header pagination --- .../Shared/Attributes/LinkPaginationAttribute.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs b/Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs index 1f043f02..005f2d62 100644 --- a/Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs +++ b/Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs @@ -29,8 +29,11 @@ public class LinkPaginationAttribute(int defaultLimit, int maxLimit, bool offset var query = actionArguments.Values.OfType().FirstOrDefault(); if (query == null) return; - if (context.Result is not OkObjectResult result) return; - if ((context.HttpContext.GetPaginationData() ?? result.Value) is not IEnumerable entities) return; + var entities = context.HttpContext.GetPaginationData(); + if (entities == null && context.Result is ObjectResult { StatusCode: null or >= 200 and <= 299 } result) + entities = result.Value as IEnumerable; + + if (entities is null) return; var ids = entities.Select(p => p.Id).ToList(); if (ids.Count == 0) return; if (query.MinId != null) ids.Reverse();