Ahelp / player list changes (#11392)

Content.Client/Administration/AdminNameOverlay.cs

@@ -35,11 +35,11 @@ namespace Content.Client.Administration
             foreach (var playerInfo in _system.PlayerList)
             {
                 // Otherwise the entity can not exist yet
-                var entity = playerInfo.EntityUid;
+                if (!_entityManager.EntityExists(playerInfo.EntityUid))
-                if (!_entityManager.EntityExists(entity))
                 {
                     continue;
                 }
+                var entity = playerInfo.EntityUid.Value;
 
                 // if not on the same map, continue
                 if (_entityManager.GetComponent<TransformComponent>(entity).MapID != _eyeManager.CurrentMap)

Content.Client/Administration/Systems/AdminSystem.cs

@@ -28,7 +28,6 @@ namespace Content.Client.Administration.Systems
             InitializeOverlay();
             SubscribeNetworkEvent<FullPlayerListEvent>(OnPlayerListChanged);
             SubscribeNetworkEvent<PlayerInfoChangedEvent>(OnPlayerInfoChanged);
-            SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
         }
 
         public override void Shutdown()
@@ -37,20 +36,6 @@ namespace Content.Client.Administration.Systems
             ShutdownOverlay();
         }
 
-        private void OnRoundRestartCleanup(RoundRestartCleanupEvent msg, EntitySessionEventArgs args)
-        {
-            if (_playerList == null)
-                return;
-
-            foreach (var (id, playerInfo) in _playerList.ToArray())
-            {
-                if (playerInfo.Connected)
-                    continue;
-                _playerList.Remove(id);
-            }
-            PlayerListChanged?.Invoke(_playerList.Values.ToList());
-        }
-
         private void OnPlayerInfoChanged(PlayerInfoChangedEvent ev)
         {
             if(ev.PlayerInfo == null) return;

Content.Client/Administration/UI/BwoinkWindow.xaml.cs

@@ -57,7 +57,12 @@ namespace Content.Client.Administration.UI
             ChannelSelector.OverrideText += (info, text) =>
             {
                 var sb = new StringBuilder();
-                sb.Append(info.Connected ? '●' : '○');
+
+                if (info.Connected)
+                    sb.Append('●');
+                else
+                    sb.Append(info.ActiveThisRound ? '○' : '·');
+                
                 sb.Append(' ');
                 if (_adminAHelpHelper.TryGetChannel(info.SessionId, out var panel) && panel.Unread > 0)
                 {
@@ -68,7 +73,7 @@ namespace Content.Client.Administration.UI
                     sb.Append(' ');
                 }
 
-                if (info.Antag)
+                if (info.Antag && info.ActiveThisRound)
                     sb.Append(new Rune(0x1F5E1)); // 🗡
 
                 sb.AppendFormat("\"{0}\"", text);
@@ -89,6 +94,23 @@ namespace Content.Client.Administration.UI
                 if (!bChannelExists)
                     return -1;
 
+                // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
+                // status, not number of unread messages, so that more recent unread messages take priority.
+                var aUnread = ach!.Unread > 0;
+                var bUnread = bch!.Unread > 0;
+                if (aUnread != bUnread)
+                    return aUnread ? -1 : 1;
+
+                // Next, sort by connection status. Any disconnected players are grouped towards the end.
+                if (a.Connected != b.Connected)
+                    return a.Connected ? -1 : 1;
+
+                // Next, group by whether or not the players have participated in this round.
+                // The ahelp window shows all players that have connected since server restart, this groups them all towards the bottom.
+                if (a.ActiveThisRound != b.ActiveThisRound)
+                    return a.ActiveThisRound ? -1 : 1;
+
+                // Finally, sort by the most recent message.
                 return bch!.LastMessage.CompareTo(ach!.LastMessage);
             };
 

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs

@@ -54,9 +54,9 @@ namespace Content.Client.Administration.UI.CustomControls
                 if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label)
                     label.Text = GetText(selectedPlayer);
             }
-            else if (args.Event.Function == EngineKeyFunctions.UseSecondary)
+            else if (args.Event.Function == EngineKeyFunctions.UseSecondary && selectedPlayer.EntityUid != null)
             {
-                _verbSystem.VerbMenu.OpenVerbMenu(selectedPlayer.EntityUid);
+                _verbSystem.VerbMenu.OpenVerbMenu(selectedPlayer.EntityUid.Value);
             }
         }
 

Content.Client/Verbs/VerbSystem.cs

@@ -227,6 +227,10 @@ namespace Content.Client.Verbs
                 RaiseNetworkEvent(new RequestServerVerbsEvent(target, verbTypes, adminRequest: force));
             }
 
+            // Some admin menu interactions will try get verbs for entities that have not yet been sent to the player.
+            if (!Exists(target))
+                return new();
+
             return GetLocalVerbs(target, user, verbTypes, force);
         }
 

Content.Server/Administration/Systems/AdminSystem.cs

@@ -1,11 +1,13 @@
-using System.Globalization;
+using System.Globalization;
 using System.Linq;
 using Content.Server.Administration.Managers;
+using Content.Server.GameTicking.Events;
 using Content.Server.IdentityManagement;
 using Content.Server.Players;
 using Content.Server.Roles;
 using Content.Shared.Administration;
 using Content.Shared.Administration.Events;
+using Content.Shared.GameTicking;
 using Content.Shared.IdentityManagement;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -21,6 +23,13 @@ namespace Content.Server.Administration.Systems
 
         private readonly Dictionary<NetUserId, PlayerInfo> _playerList = new();
 
+        /// <summary>
+        ///     Set of players that have participated in this round.
+        /// </summary>
+        public IReadOnlySet<NetUserId> RoundActivePlayers => _roundActivePlayers;
+
+        private readonly HashSet<NetUserId> _roundActivePlayers = new();
+
         public override void Initialize()
         {
             base.Initialize();
@@ -32,11 +41,36 @@ namespace Content.Server.Administration.Systems
             SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetached);
             SubscribeLocalEvent<RoleAddedEvent>(OnRoleEvent);
             SubscribeLocalEvent<RoleRemovedEvent>(OnRoleEvent);
+            SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestartCleanup);
+        }
+
+        private void OnRoundRestartCleanup(RoundRestartCleanupEvent ev)
+        {
+            _roundActivePlayers.Clear();
+
+            foreach (var (id, data) in _playerList)
+            {
+                if (!data.ActiveThisRound)
+                    continue;
+
+                if (!_playerManager.TryGetPlayerData(id, out var playerData))
+                    return;
+
+                _playerManager.TryGetSessionById(id, out var session);
+                _playerList[id] = GetPlayerInfo(playerData, session);
+            }
+
+            var updateEv = new FullPlayerListEvent() { PlayersInfo = _playerList.Values.ToList() };
+
+            foreach (var admin in _adminManager.ActiveAdmins)
+            {
+                RaiseNetworkEvent(updateEv, admin.ConnectedClient);
+            }
         }
 
         public void UpdatePlayerList(IPlayerSession player)
         {
-            _playerList[player.UserId] = GetPlayerInfo(player);
+            _playerList[player.UserId] = GetPlayerInfo(player.Data, player);
 
             var playerInfoChangedEvent = new PlayerInfoChangedEvent
             {
@@ -89,6 +123,7 @@ namespace Content.Server.Administration.Systems
         {
             if(ev.Player.Status == SessionStatus.Disconnected) return;
 
+            _roundActivePlayers.Add(ev.Player.UserId);
             UpdatePlayerList(ev.Player);
         }
 
@@ -113,29 +148,29 @@ namespace Content.Server.Administration.Systems
             RaiseNetworkEvent(ev, playerSession.ConnectedClient);
         }
 
-        private PlayerInfo GetPlayerInfo(IPlayerSession session)
+        private PlayerInfo GetPlayerInfo(IPlayerData data, IPlayerSession? session)
         {
-            var name = session.Name;
+            var name = data.UserName;
-            var username = string.Empty;
+            var entityName = string.Empty;
             var identityName = string.Empty;
 
-            if (session.AttachedEntity != null)
+            if (session?.AttachedEntity != null)
             {
-                username = EntityManager.GetComponent<MetaDataComponent>(session.AttachedEntity.Value).EntityName;
+                entityName = EntityManager.GetComponent<MetaDataComponent>(session.AttachedEntity.Value).EntityName;
                 identityName = Identity.Name(session.AttachedEntity.Value, EntityManager);
             }
 
-            var mind = session.ContentData()?.Mind;
+            var mind = data.ContentData()?.Mind;
 
             var job = mind?.AllRoles.FirstOrDefault(role => role is Job);
             var startingRole = job != null ? CultureInfo.CurrentCulture.TextInfo.ToTitleCase(job.Name) : string.Empty;
 
             var antag = mind?.AllRoles.Any(r => r.Antagonist) ?? false;
 
-            var connected = session.Status is SessionStatus.Connected or SessionStatus.InGame;
+            var connected = session != null && session.Status is SessionStatus.Connected or SessionStatus.InGame;
 
-            return new PlayerInfo(name, username, identityName, startingRole, antag, session.AttachedEntity.GetValueOrDefault(), session.UserId,
+            return new PlayerInfo(name, entityName, identityName, startingRole, antag, session?.AttachedEntity, data.UserId,
-                connected);
+                connected, _roundActivePlayers.Contains(data.UserId));
         }
     }
 }

Content.Shared/Administration/PlayerInfo.cs

@@ -1,8 +1,17 @@
-using Robust.Shared.Network;
+using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration
 {
     [Serializable, NetSerializable]
-    public record PlayerInfo(string Username, string CharacterName, string IdentityName, string StartingJob, bool Antag, EntityUid EntityUid, NetUserId SessionId, bool Connected);
+    public record PlayerInfo(
+        string Username,
+        string CharacterName,
+        string IdentityName,
+        string StartingJob,
+        bool Antag,
+        EntityUid? EntityUid,
+        NetUserId SessionId,
+        bool Connected,
+        bool ActiveThisRound);
 }