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

Administration: Ahelp tabs (#5965)

Browse Source
This commit is contained in:
E F R
2022-01-03 00:54:44 +00:00
committed by GitHub
parent a3f21e9603
commit df9aecb6a0
14 changed files with 291 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
Content.Client/Administration/BwoinkSystem.cs
View File

@@ -1,12 +1,18 @@
#nullable enable
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Client.Administration.Managers;
using Content.Client.Administration.UI;
using Content.Client.Administration.UI.CustomControls;
using Content.Shared.Administration;
using JetBrains.Annotations;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Player;
using Robust.Shared.Localization;
using Robust.Shared.Audio;
using Robust.Shared.IoC;
using Robust.Shared.Network;
@@ -16,18 +22,21 @@ namespace Content.Client.Administration
[UsedImplicitly]
public class BwoinkSystem : SharedBwoinkSystem
{
[Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IClyde _clyde = default!;
private readonly Dictionary<NetUserId, BwoinkWindow> _activeWindowMap = new();
private BwoinkWindow? _adminWindow;
private DefaultWindow? _plainWindow;
private readonly Dictionary<NetUserId, BwoinkPanel> _activePanelMap = new();
protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySessionEventArgs eventArgs)
{
base.OnBwoinkTextMessage(message, eventArgs);
LogBwoink(message);
// Actual line
var window = EnsureWindow(message.ChannelId);
window.ReceiveLine(message.Text);
var window = EnsurePanel(message.ChannelId);
window.ReceiveLine($"[color=gray]{message.SentAt.ToShortTimeString()}[/color] {message.Text}");
// Play a sound if we didn't send it
var localPlayer = _playerManager.LocalPlayer;
if (localPlayer?.UserId != message.TrueSender)
@@ -35,27 +44,67 @@ namespace Content.Client.Administration
SoundSystem.Play(Filter.Local(), "/Audio/Effects/adminhelp.ogg");
_clyde.RequestWindowAttention();
}
_adminWindow?.OnBwoink(message.ChannelId);
}
public BwoinkWindow EnsureWindow(NetUserId channelId)
public bool TryGetChannel(NetUserId ch, [NotNullWhen(true)] out BwoinkPanel? bp) => _activePanelMap.TryGetValue(ch, out bp);
private BwoinkPanel EnsureAdmin(NetUserId channelId)
{
if (!_activeWindowMap.TryGetValue(channelId, out var existingWindow))
_adminWindow ??= new BwoinkWindow(this);
if (!_activePanelMap.TryGetValue(channelId, out var existingPanel))
{
_activeWindowMap[channelId] = existingWindow = new BwoinkWindow(channelId,
_playerManager.SessionsDict.TryGetValue(channelId, out var otherSession)
? otherSession.Name
: channelId.ToString());
_activePanelMap[channelId] = existingPanel = new BwoinkPanel(this, channelId);
existingPanel.Visible = false;
if (!_adminWindow.BwoinkArea.Children.Contains(existingPanel))
_adminWindow.BwoinkArea.AddChild(existingPanel);
}
existingWindow.Open();
return existingWindow;
_adminWindow.Open();
return existingPanel;
}
public void EnsureWindowForLocalPlayer()
private BwoinkPanel EnsurePlain(NetUserId channelId)
{
BwoinkPanel bp;
if (_plainWindow is null)
{
bp = new BwoinkPanel(this, channelId);
_plainWindow = new DefaultWindow()
{
TitleClass="windowTitleAlert",
HeaderClass="windowHeaderAlert",
Title=Loc.GetString("bwoink-user-title"),
SetSize=(400, 200),
};
_plainWindow.Contents.AddChild(bp);
}
else
{
bp = (BwoinkPanel) _plainWindow.Contents.GetChild(0);
}
_plainWindow.Open();
return bp;
}
public BwoinkPanel EnsurePanel(NetUserId channelId)
{
if (_adminManager.HasFlag(AdminFlags.Adminhelp))
return EnsureAdmin(channelId);
return EnsurePlain(channelId);
}
public void EnsurePanelForLocalPlayer()
{
var localPlayer = _playerManager.LocalPlayer;
if (localPlayer != null)
EnsureWindow(localPlayer.UserId);
EnsurePanel(localPlayer.UserId);
}
public void Send(NetUserId channelId, string text)

23
Content.Client/Administration/UI/BwoinkWindow.xaml
View File

@@ -1,11 +1,20 @@
<SS14Window
<DefaultWindow
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
SetSize="400 200"
HeaderClass="windowHeaderAlert"
TitleClass="windowTitleAlert"
>
<BoxContainer Orientation="Vertical">
<OutputPanel Name="TextOutput" VerticalExpand="true" />
<HistoryLineEdit Name="SenderLineEdit" />
</BoxContainer>
</SS14Window>
Title="{Loc 'bwoink-user-title'}" >
<SplitContainer Orientation="Horizontal">
<cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="1" />
<BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
<BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
<BoxContainer Orientation="Horizontal" HorizontalAlignment="Right">
<Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" />
<Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" />
<Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" />
<Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" />
</BoxContainer>
</BoxContainer>
</SplitContainer>
</DefaultWindow>

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

@@ -1,13 +1,17 @@
#nullable enable
using System.Text;
using System.Linq;
using Content.Client.Administration.Managers;
using Content.Client.Administration.UI.CustomControls;
using Content.Client.Administration.UI.Tabs.AdminTab;
using Content.Shared.Administration;
using Robust.Client.AutoGenerated;
using Robust.Client.Player;
using Robust.Client.Console;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.IoC;
using Robust.Shared.GameObjects;
using Robust.Shared.Network;
using Robust.Shared.Utility;
using Robust.Shared.IoC;
namespace Content.Client.Administration.UI
{
@@ -15,40 +19,140 @@ namespace Content.Client.Administration.UI
/// This window connects to a BwoinkSystem channel. BwoinkSystem manages the rest.
/// </summary>
[GenerateTypedNameReferences]
public partial class BwoinkWindow : SS14Window
public partial class BwoinkWindow : DefaultWindow
{
[Dependency] private readonly IEntitySystemManager _systemManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly IClientConsoleHost _console = default!;
private readonly NetUserId _channelId;
private readonly BwoinkSystem _bwoinkSystem;
private PlayerInfo? _currentPlayer = default;
public BwoinkWindow(NetUserId userId, string channelName)
public BwoinkWindow(BwoinkSystem bs)
{
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
_bwoinkSystem = bs;
_channelId = userId;
Title = (_playerManager.LocalPlayer?.UserId == _channelId) ? "Admin Message" : channelName;
_adminManager.AdminStatusUpdated += () => FixButtons();
FixButtons();
SenderLineEdit.OnTextEntered += Input_OnTextEntered;
ChannelSelector.OnSelectionChanged += sel =>
{
_currentPlayer = sel;
if (sel is not null)
{
SwitchToChannel(sel.SessionId);
Title = $"{sel.CharacterName} / {sel.Username}";
}
foreach (var li in ChannelSelector.PlayerItemList)
li.Text = FormatTabTitle(li);
};
ChannelSelector.DecoratePlayer += (PlayerInfo pl, ItemList.Item li) =>
{
li.Text = FormatTabTitle(li, pl);
};
ChannelSelector.SortKey = (PlayerInfo pl) =>
{
if (_bwoinkSystem.TryGetChannel(pl.SessionId, out var ch))
{
return ch.Unread;
}
return 0;
};
// ew
Ban.OnPressed += _ =>
{
var bw = new BanWindow();
bw.OnPlayerSelectionChanged(_currentPlayer);
bw.Open();
};
Kick.OnPressed += _ =>
{
// TODO: Reason field
if (_currentPlayer is not null)
_console.ExecuteCommand($"kick \"{_currentPlayer.Username}\"");
};
Teleport.OnPressed += _ =>
{
if (_currentPlayer is not null)
_console.ExecuteCommand($"tpto \"{_currentPlayer.Username}\"");
};
Respawn.OnPressed += _ =>
{
if (_currentPlayer is not null)
_console.ExecuteCommand($"respawn \"{_currentPlayer.Username}\"");
};
}
private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
public void OnBwoink(NetUserId channel)
{
if (!string.IsNullOrWhiteSpace(args.Text))
var open = IsOpen;
Open();
ChannelSelector.Refresh();
if (!open)
{
var bwoink = _systemManager.GetEntitySystem<BwoinkSystem>();
bwoink.Send(_channelId, args.Text);
var pi = ChannelSelector
.PlayerItemList
.FirstOrDefault(i => ((PlayerInfo) i.Metadata!).SessionId == channel);
if (pi is not null)
pi.Selected = true;
}
}
private void FixButtons()
{
Ban.Visible = _adminManager.HasFlag(AdminFlags.Ban);
Ban.Disabled = !Ban.Visible;
Kick.Visible = _adminManager.CanCommand("kick");
Kick.Disabled = !Kick.Visible;
Teleport.Visible = _adminManager.CanCommand("tpto");
Teleport.Disabled = !Teleport.Visible;
Respawn.Visible = _adminManager.CanCommand("respawn");
Respawn.Disabled = !Respawn.Visible;
}
private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
{
pl ??= (PlayerInfo) li.Metadata!;
var sb = new StringBuilder();
sb.Append(pl.Connected ? '●' : '○');
sb.Append(' ');
if (_bwoinkSystem.TryGetChannel(pl.SessionId, out var panel) && panel.Unread > 0)
{
if (panel.Unread < 11)
sb.Append(new Rune('➀' + (panel.Unread-1)));
else
sb.Append(new Rune(0x2639)); // ☹
sb.Append(' ');
}
SenderLineEdit.Clear();
if (pl.Antag)
sb.Append(new Rune(0x1F5E1)); // 🗡
sb.AppendFormat("\"{0}\"", pl.CharacterName)
.Append(' ')
.Append(pl.Username);
return sb.ToString();
}
public void ReceiveLine(string text)
public void SwitchToChannel(NetUserId ch)
{
var formatted = new FormattedMessage(1);
formatted.AddMarkup(text);
TextOutput.AddMessage(formatted);
foreach (var bw in BwoinkArea.Children)
bw.Visible = (bw as BwoinkPanel)?.ChannelId == ch;
}
}
}

7
Content.Client/Administration/UI/CustomControls/BwoinkPanel.xaml Normal file
View File

@@ -0,0 +1,7 @@
<BoxContainer
xmlns="https://spacestation14.io"
Orientation="Vertical"
HorizontalExpand="true">
<OutputPanel Name="TextOutput" VerticalExpand="true" />
<HistoryLineEdit Name="SenderLineEdit" />
</BoxContainer>

49
Content.Client/Administration/UI/CustomControls/BwoinkPanel.xaml.cs Normal file
View File

@@ -0,0 +1,49 @@
#nullable enable
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Network;
using Robust.Shared.Utility;
namespace Content.Client.Administration.UI.CustomControls
{
[GenerateTypedNameReferences]
public partial class BwoinkPanel : BoxContainer
{
private readonly BwoinkSystem _bwoinkSystem;
public readonly NetUserId ChannelId;
public int Unread { get; private set; } = 0;
public BwoinkPanel(BwoinkSystem bwoinkSys, NetUserId userId)
{
RobustXamlLoader.Load(this);
_bwoinkSystem = bwoinkSys;
ChannelId = userId;
OnVisibilityChanged += c =>
{
if (c.Visible)
Unread = 0;
};
SenderLineEdit.OnTextEntered += Input_OnTextEntered;
}
private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
{
if (!string.IsNullOrWhiteSpace(args.Text))
_bwoinkSystem.Send(ChannelId, args.Text);
SenderLineEdit.Clear();
}
public void ReceiveLine(string text)
{
if (!Visible)
Unread++;
var formatted = new FormattedMessage(1);
formatted.AddMarkup(text);
TextOutput.AddMessage(formatted);
}
}
}

1
Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
View File

@@ -6,6 +6,7 @@
HorizontalExpand="True"
PlaceHolder="{Loc Filter}"/>
<ItemList Name="PlayerItemList"
Access="Public"
SelectMode="Single"
VerticalExpand="True"
HorizontalExpand="True"

21
Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
View File

@@ -2,14 +2,11 @@
using System.Collections.Generic;
using System.Linq;
using Content.Shared.Administration;
using Content.Shared.Administration.Events;
using Robust.Client.AutoGenerated;
using Robust.Client.Player;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Players;
namespace Content.Client.Administration.UI.CustomControls
{
@@ -20,6 +17,9 @@ namespace Content.Client.Administration.UI.CustomControls
public event Action<PlayerInfo?>? OnSelectionChanged;
public Action<PlayerInfo, ItemList.Item>? DecoratePlayer;
public Func<PlayerInfo, int>? SortKey;
public PlayerListControl()
{
_adminSystem = EntitySystem.Get<AdminSystem>();
@@ -53,10 +53,17 @@ namespace Content.Client.Administration.UI.CustomControls
OnSelectionChanged?.Invoke(null);
}
public void Refresh() => PopulateList();
private void PopulateList(IReadOnlyList<PlayerInfo> _ = null!)
{
PlayerItemList.Clear();
foreach (var info in _adminSystem.PlayerList)
IEnumerable<PlayerInfo> iter = _adminSystem.PlayerList;
if (SortKey is not null)
iter = _adminSystem.PlayerList.OrderByDescending(SortKey);
foreach (var info in iter)
{
var displayName = $"{info.CharacterName} ({info.Username})";
if (!string.IsNullOrEmpty(FilterLineEdit.Text) &&
@@ -65,11 +72,13 @@ namespace Content.Client.Administration.UI.CustomControls
continue;
}
PlayerItemList.Add(new ItemList.Item(PlayerItemList)
var item = new ItemList.Item(PlayerItemList)
{
Metadata = info,
Text = displayName
});
};
DecoratePlayer?.Invoke(info, item);
PlayerItemList.Add(item);
}
}
}

2
Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
View File

@@ -68,7 +68,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
SubmitButton.Disabled = string.IsNullOrEmpty(PlayerNameLine.Text);
}
private void OnPlayerSelectionChanged(PlayerInfo? player)
public void OnPlayerSelectionChanged(PlayerInfo? player)
{
PlayerNameLine.Text = player?.Username ?? string.Empty;
OnPlayerNameChanged();

6
Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
View File

@@ -10,9 +10,9 @@
</BoxContainer>
<cc:PlayerListControl Name="PlayerList" VerticalExpand="True" />
<BoxContainer Orientation="Horizontal">
<Button Name="SubmitKickButton" Text="{Loc admin-player-actions-window-kick-text}" Disabled="True"/>
<Button Name="SubmitAHelpButton" Text="{Loc admin-player-actions-window-ahelp-text}" Disabled="True"/>
<Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-window-respawn-text}" Disabled="True"/>
<Button Name="SubmitKickButton" Text="{Loc admin-player-actions-kick}" Disabled="True"/>
<Button Name="SubmitAHelpButton" Text="{Loc admin-player-actions-ahelp}" Disabled="True"/>
<Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" Disabled="True"/>
</BoxContainer>
</BoxContainer>
</SS14Window>

4
Content.Client/Commands/OpenAHelpCommand.cs
View File

@@ -23,13 +23,13 @@ namespace Content.Client.Commands
}
if (args.Length == 0)
{
EntitySystem.Get<BwoinkSystem>().EnsureWindowForLocalPlayer();
EntitySystem.Get<BwoinkSystem>().EnsurePanelForLocalPlayer();
}
else
{
if (Guid.TryParse(args[0], out var guid))
{
EntitySystem.Get<BwoinkSystem>().EnsureWindow(new NetUserId(guid));
EntitySystem.Get<BwoinkSystem>().EnsurePanel(new NetUserId(guid));
}
else
{

4
Content.Shared/Administration/SharedBwoinkSystem.cs
View File

@@ -32,6 +32,7 @@ namespace Content.Shared.Administration
[Serializable, NetSerializable]
public sealed class BwoinkTextMessage : EntityEventArgs
{
public DateTime SentAt { get; }
public NetUserId ChannelId { get; }
// This is ignored from the client.
// It's checked by the client when receiving a message from the server for bwoink noises.
@@ -39,8 +40,9 @@ namespace Content.Shared.Administration
public NetUserId TrueSender { get; }
public string Text { get; }
public BwoinkTextMessage(NetUserId channelId, NetUserId trueSender, string text)
public BwoinkTextMessage(NetUserId channelId, NetUserId trueSender, string text, DateTime? sentAt = default)
{
SentAt = sentAt ?? DateTime.Now;
ChannelId = channelId;
TrueSender = trueSender;
Text = text;

2
Resources/Locale/en-US/administration/bwoink.ftl
View File

@@ -1,3 +1,5 @@
bwoink-user-title = Admin Message
bwoink-system-starmute-message-no-other-users = *System: Nobody is available to receive your message. Try pinging Game Admins on Discord.
bwoink-system-starmute-message-no-other-users-webhook = *System: Your message has been relayed to the admins via discord.

5
Resources/Locale/en-US/administration/ui/actions.ftl Normal file
View File

@@ -0,0 +1,5 @@
admin-player-actions-kick = Kick
admin-player-actions-ban = Ban
admin-player-actions-ahelp = AHelp
admin-player-actions-respawn = Respawn
admin-player-actions-teleport = Teleport To

3
Resources/Locale/en-US/administration/ui/tabs/admin-tab/player-actions-window.ftl
View File

@@ -1,4 +1 @@
admin-player-actions-window-title = Player Actions Panel
admin-player-actions-window-kick-text = Kick
admin-player-actions-window-ahelp-text = AHelp
admin-player-actions-window-respawn-text = Respawn