From 000e7f6a644ae68e8cb0b998fb03cc776efb2fe4 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Wed, 29 Jun 2022 10:17:45 +0200 Subject: [PATCH] Fix duplicate logs when skipping before filtering (#9275) --- .../Administration/Logs/AdminLogManager.Cache.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs index ee7e3700a8..d4058b5d16 100644 --- a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs +++ b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs @@ -97,11 +97,6 @@ public sealed partial class AdminLogManager $"Unknown {nameof(DateOrder)} value {filter.DateOrder}") }; - if (filter.LogsSent != 0) - { - query = query.Skip(filter.LogsSent); - } - if (filter.Search != null) { query = query.Where(log => log.Message.Contains(filter.Search, StringComparison.OrdinalIgnoreCase)); @@ -137,6 +132,11 @@ public sealed partial class AdminLogManager query = query.Where(log => filter.AllPlayers.All(filterPlayer => log.Players.Contains(filterPlayer))); } + if (filter.LogsSent != 0) + { + query = query.Skip(filter.LogsSent); + } + if (filter.Limit != null) { query = query.Take(filter.Limit.Value);