diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs index 0cddd65ae2..ec818632ce 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs @@ -48,7 +48,7 @@ public class AdminLogsEui : BaseEui { var request = new LogsRequest( LogsControl.SelectedRoundId, - LogsControl.SelectedTypes.ToList(), + LogsControl.SelectedTypes.ToHashSet(), null, null, null, diff --git a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs index e78d501560..c32c5932dd 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs @@ -122,7 +122,7 @@ public class AddTests : ContentIntegrationTest { Round = log.RoundId, Search = log.Message, - Types = new List {log.Type}, + Types = new HashSet {log.Type}, }; await foreach (var json in sDatabase.GetAdminLogsJson(filter)) @@ -295,7 +295,7 @@ public class AddTests : ContentIntegrationTest { Round = log.RoundId, Search = log.Message, - Types = new List {log.Type}, + Types = new HashSet {log.Type}, }; await foreach (var json in sDatabase.GetAdminLogsJson(filter)) diff --git a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs index 6ba0e6ad55..390384abc1 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Content.Server.Administration.Logs; using Content.Server.GameTicking; -using Content.Shared.Administration.Logs; using Content.Shared.CCVar; using Content.Shared.Database; using NUnit.Framework; @@ -53,7 +52,7 @@ public class QueryTests : ContentIntegrationTest { Round = sGamerTicker.RoundId, Search = guid.ToString(), - Types = new List {LogType.Unknown}, + Types = new HashSet {LogType.Unknown}, After = date, AnyPlayers = new[] {player.UserId.UserId} }; diff --git a/Content.Server/Administration/Logs/LogFilter.cs b/Content.Server/Administration/Logs/LogFilter.cs index 20ac639adf..b917ff36b1 100644 --- a/Content.Server/Administration/Logs/LogFilter.cs +++ b/Content.Server/Administration/Logs/LogFilter.cs @@ -14,9 +14,9 @@ public sealed class LogFilter public string? Search { get; set; } - public List? Types { get; set; } + public HashSet? Types { get; set; } - public List? Impacts { get; set; } + public HashSet? Impacts { get; set; } public DateTime? Before { get; set; } diff --git a/Content.Shared/Administration/AdminLogsEuiState.cs b/Content.Shared/Administration/AdminLogsEuiState.cs index 3eb48524be..551a5ecbb0 100644 --- a/Content.Shared/Administration/AdminLogsEuiState.cs +++ b/Content.Shared/Administration/AdminLogsEuiState.cs @@ -48,8 +48,8 @@ public static class AdminLogsEuiMsg { public LogsRequest( int? roundId, - List? types, - List? impacts, + HashSet? types, + HashSet? impacts, DateTime? before, DateTime? after, Guid[]? anyPlayers, @@ -69,8 +69,8 @@ public static class AdminLogsEuiMsg } public int? RoundId { get; set; } - public List? Types { get; set; } - public List? Impacts { get; set; } + public HashSet? Types { get; set; } + public HashSet? Impacts { get; set; } public DateTime? Before { get; set; } public DateTime? After { get; set; } public Guid[]? AnyPlayers { get; set; }