tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix duplicate logs when skipping before filtering (#9275)

Browse Source
This commit is contained in:
DrSmugleaf
2022-06-29 10:17:45 +02:00
committed by GitHub
parent fedd63118c
commit 000e7f6a64
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Administration/Logs/AdminLogManager.Cache.cs
View File

@@ -97,11 +97,6 @@ public sealed partial class AdminLogManager
$"Unknown {nameof(DateOrder)} value {filter.DateOrder}") $"Unknown {nameof(DateOrder)} value {filter.DateOrder}")
}; };
if (filter.LogsSent != 0)
{
query = query.Skip(filter.LogsSent);
}
if (filter.Search != null) if (filter.Search != null)
{ {
query = query.Where(log => log.Message.Contains(filter.Search, StringComparison.OrdinalIgnoreCase)); 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))); 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) if (filter.Limit != null)
{ {
query = query.Take(filter.Limit.Value); query = query.Take(filter.Limit.Value);