Fix duplicate logs when skipping before filtering (#9275)

space-wizards · Jun 29, 2022 · 000e7f6 · 000e7f6
1 parent fedd631
commit 000e7f6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs
@@ -97,11 +97,6 @@ private bool TrySearchCache(LogFilter? filter, [NotNullWhen(true)] out List<Shar
                 $"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 @@ private bool TrySearchCache(LogFilter? filter, [NotNullWhen(true)] out List<Shar
             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);