From 77ae2f248462e3b46226fb89f521d25a1c5ad5d9 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Wed, 17 May 2023 22:51:17 -0700
Subject: [PATCH] Fix Next button resending the same admin logs (#16557)

---
 Content.Client/Administration/UI/Logs/AdminLogsEui.cs   | 1 -
 Content.Server/Administration/Logs/AdminLogsEui.cs      | 4 ++--
 Content.Shared/Administration/Logs/AdminLogsEuiState.cs | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
index 41eafe7978..be1bddcd37 100644
--- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs
@@ -62,7 +62,6 @@ public sealed class AdminLogsEui : BaseEui
             LogsControl.SelectedPlayers.ToArray(),
             null,
             LogsControl.IncludeNonPlayerLogs,
-            null,
             DateOrder.Descending);
 
         SendMessage(request);
diff --git a/Content.Server/Administration/Logs/AdminLogsEui.cs b/Content.Server/Administration/Logs/AdminLogsEui.cs
index fe032d33cc..8bd870b2c7 100644
--- a/Content.Server/Administration/Logs/AdminLogsEui.cs
+++ b/Content.Server/Administration/Logs/AdminLogsEui.cs
@@ -165,8 +165,8 @@ public sealed class AdminLogsEui : BaseEui
 
             var largestId = _filter.DateOrder switch
             {
-                DateOrder.Ascending => ^1,
-                DateOrder.Descending => 0,
+                DateOrder.Ascending => 0,
+                DateOrder.Descending => ^1,
                 _ => throw new ArgumentOutOfRangeException(nameof(_filter.DateOrder), _filter.DateOrder, null)
             };
 
diff --git a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
index fa94fd0b45..68b56ae9dd 100644
--- a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
+++ b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs
@@ -69,7 +69,6 @@ public static class AdminLogsEuiMsg
             Guid[]? anyPlayers,
             Guid[]? allPlayers,
             bool includeNonPlayers,
-            int? lastLogId,
             DateOrder dateOrder)
         {
             RoundId = roundId;
@@ -82,7 +81,6 @@ public static class AdminLogsEuiMsg
             AnyPlayers = anyPlayers is { Length: > 0 } ? anyPlayers : null;
             AllPlayers = allPlayers is { Length: > 0 } ? allPlayers : null;
             IncludeNonPlayers = includeNonPlayers;
-            LastLogId = lastLogId;
             DateOrder = dateOrder;
         }
 
@@ -96,7 +94,6 @@ public static class AdminLogsEuiMsg
         public Guid[]? AnyPlayers { get; set; }
         public Guid[]? AllPlayers { get; set; }
         public bool IncludeNonPlayers { get; set; }
-        public int? LastLogId { get; set; }
         public DateOrder DateOrder { get; set; }
     }