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

Fix player list sorting (#12457)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-09 09:19:49 +13:00
committed by GitHub
parent c1af5874e8
commit 8e167800d4
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/Administration/UI/BwoinkWindow.xaml.cs
View File

@@ -83,21 +83,13 @@ namespace Content.Client.Administration.UI
ChannelSelector.Comparison = (a, b) => ChannelSelector.Comparison = (a, b) =>
{ {
var aChannelExists = _adminAHelpHelper.TryGetChannel(a.SessionId, out var ach); var ach = _adminAHelpHelper.EnsurePanel(a.SessionId);
var bChannelExists = _adminAHelpHelper.TryGetChannel(b.SessionId, out var bch); var bch = _adminAHelpHelper.EnsurePanel(b.SessionId);
if (!aChannelExists && !bChannelExists)
return 0;
if (!aChannelExists)
return 1;
if (!bChannelExists)
return -1;
// First, sort by unread. Any chat with unread messages appears first. We just sort based on unread // 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. // status, not number of unread messages, so that more recent unread messages take priority.
var aUnread = ach!.Unread > 0; var aUnread = ach.Unread > 0;
var bUnread = bch!.Unread > 0; var bUnread = bch.Unread > 0;
if (aUnread != bUnread) if (aUnread != bUnread)
return aUnread ? -1 : 1; return aUnread ? -1 : 1;
@@ -156,6 +148,8 @@ namespace Content.Client.Administration.UI
if (_currentPlayer is not null) if (_currentPlayer is not null)
_console.ExecuteCommand($"respawn \"{_currentPlayer.Username}\""); _console.ExecuteCommand($"respawn \"{_currentPlayer.Username}\"");
}; };
OnOpen += () => ChannelSelector.PopulateList();
} }
private Dictionary<Control, (CancellationTokenSource cancellation, string? originalText)> Confirmations { get; } = new(); private Dictionary<Control, (CancellationTokenSource cancellation, string? originalText)> Confirmations { get; } = new();