From eaec736676becb48b9a31e28448550caa9de3f61 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 18 Oct 2023 22:55:37 +0200 Subject: [PATCH] Remove invalid next/prev in pages sorted by random --- back/src/Kyoo.Abstractions/Models/Page.cs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/back/src/Kyoo.Abstractions/Models/Page.cs b/back/src/Kyoo.Abstractions/Models/Page.cs index 55fc9a5e..ca176489 100644 --- a/back/src/Kyoo.Abstractions/Models/Page.cs +++ b/back/src/Kyoo.Abstractions/Models/Page.cs @@ -91,17 +91,20 @@ namespace Kyoo.Abstractions.Models Items = items; This = url + query.ToQueryString(); - if (items.Count > 0 && query.ContainsKey("afterID")) + if (!(query.TryGetValue("sortBy", out string? sort) && sort.Contains("random"))) { - query["afterID"] = items.First().Id.ToString(); - query["reverse"] = "true"; - Previous = url + query.ToQueryString(); - } - query.Remove("reverse"); - if (items.Count == limit && limit > 0) - { - query["afterID"] = items.Last().Id.ToString(); - Next = url + query.ToQueryString(); + if (items.Count > 0 && query.ContainsKey("afterID")) + { + query["afterID"] = items.First().Id.ToString(); + query["reverse"] = "true"; + Previous = url + query.ToQueryString(); + } + query.Remove("reverse"); + if (items.Count == limit && limit > 0) + { + query["afterID"] = items.Last().Id.ToString(); + Next = url + query.ToQueryString(); + } } query.Remove("afterID");