Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add cvar to disable ooc chat (#3258)

Browse Source
This commit is contained in:
DrSmugleaf
2021-02-16 20:14:32 +01:00
committed by GitHub
parent 3c54c755ce
commit ecb9993d80
7 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Administration/ClientAdminManager.cs
View File

@@ -21,6 +21,11 @@ namespace Content.Client.Administration
public event Action? AdminStatusUpdated;
public bool IsActive()
{
return _adminData?.Active ?? false;
}
public bool HasFlag(AdminFlags flag)
{
return _adminData?.HasFlag(flag) ?? false;

6
Content.Client/Administration/IClientAdminManager.cs
View File

@@ -15,6 +15,12 @@ namespace Content.Client.Administration
/// </summary>
event Action AdminStatusUpdated;
/// <summary>
/// Checks whether the local player is an admin.
/// </summary>
/// <returns>true if the local player is an admin, false otherwise even if they are deadminned.</returns>
bool IsActive();
/// <summary>
/// Checks whether the local player has an admin flag.
/// </summary>

49
Content.Client/State/GameScreen.cs
View File

@@ -1,11 +1,14 @@
using Content.Client.Administration;
using Content.Client.Chat;
using Content.Client.Interfaces.Chat;
using Content.Client.UserInterface;
using Content.Client.Voting;
using Content.Shared;
using Content.Shared.Input;
using Robust.Client.Input;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.Configuration;
using Robust.Shared.Input.Binding;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
@@ -20,9 +23,14 @@ namespace Content.Client.State
[Dependency] private readonly IInputManager _inputManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IVoteManager _voteManager = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IClientAdminManager _adminManager = default!;
[ViewVariables] private ChatBox _gameChat;
private bool _oocEnabled;
private bool _adminOocEnabled;
public override void Startup()
{
base.Startup();
@@ -42,13 +50,17 @@ namespace Content.Client.State
_gameChat.Input.PlaceHolder = Loc.GetString("Say something! [ for OOC");
_inputManager.SetInputCommand(ContentKeyFunctions.FocusChat,
InputCmdHandler.FromDelegate(s => FocusChat(_gameChat)));
InputCmdHandler.FromDelegate(_ => FocusChat(_gameChat)));
_inputManager.SetInputCommand(ContentKeyFunctions.FocusOOC,
InputCmdHandler.FromDelegate(s => FocusOOC(_gameChat)));
InputCmdHandler.FromDelegate(_ => FocusOOC(_gameChat)));
_inputManager.SetInputCommand(ContentKeyFunctions.FocusAdminChat,
InputCmdHandler.FromDelegate(s => FocusAdminChat(_gameChat)));
InputCmdHandler.FromDelegate(_ => FocusAdminChat(_gameChat)));
_configurationManager.OnValueChanged(CCVars.OocEnabled, OnOocEnabledChanged, true);
_configurationManager.OnValueChanged(CCVars.AdminOocEnabled, OnAdminOocEnabledChanged, true);
_adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
}
public override void Shutdown()
@@ -59,6 +71,37 @@ namespace Content.Client.State
_gameHud.RootControl.Orphan();
}
private void OnOocEnabledChanged(bool val)
{
_oocEnabled = val;
if (_adminManager.IsActive())
{
return;
}
_gameChat.Input.PlaceHolder = Loc.GetString(_oocEnabled ? "Say something! [ for OOC" : "Say something!");
}
private void OnAdminOocEnabledChanged(bool val)
{
_adminOocEnabled = val;
if (!_adminManager.IsActive())
{
return;
}
_gameChat.Input.PlaceHolder = Loc.GetString(_adminOocEnabled ? "Say something! [ for OOC" : "Say something!");
}
private void OnAdminStatusUpdated()
{
_gameChat.Input.PlaceHolder = _adminManager.IsActive()
? Loc.GetString(_adminOocEnabled ? "Say something! [ for OOC" : "Say something!")
: Loc.GetString(_oocEnabled ? "Say something! [ for OOC" : "Say something!");
}
internal static void FocusChat(ChatBox chat)
{
if (chat == null || chat.UserInterfaceManager.KeyboardFocused != null)