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

Fixed disabling OOC not disabling the discord relay (#8275)

Browse Source 
Co-authored-by: ike709 <ike709@github.com>
This commit is contained in:
ike709
2022-05-19 22:18:28 -05:00
committed by GitHub
parent 25ef9d00b8
commit 20651fc71f
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -115,6 +115,10 @@ namespace Content.Server.Chat.Managers
public void SendHookOOC(string sender, string message) public void SendHookOOC(string sender, string message)
{ {
if (!_oocEnabled && _configurationManager.GetCVar(CCVars.DisablingOOCDisablesRelay))
{
return;
}
message = FormattedMessage.EscapeText(message); message = FormattedMessage.EscapeText(message);
var messageWrap = Loc.GetString("chat-manager-send-hook-ooc-wrap-message", ("senderName", sender)); var messageWrap = Loc.GetString("chat-manager-send-hook-ooc-wrap-message", ("senderName", sender));
ChatMessageToAll(ChatChannel.OOC, message, messageWrap); ChatMessageToAll(ChatChannel.OOC, message, messageWrap);

5
Content.Shared/CCVar/CCVars.cs
View File

@@ -697,6 +697,11 @@ namespace Content.Shared.CCVar
public static readonly CVarDef<bool> AdminOocEnabled = public static readonly CVarDef<bool> AdminOocEnabled =
CVarDef.Create("ooc.enabled_admin", true, CVar.NOTIFY); CVarDef.Create("ooc.enabled_admin", true, CVar.NOTIFY);
/// <summary>
/// If true, whenever OOC is disabled the Discord OOC relay will also be disabled.
/// </summary>
public static readonly CVarDef<bool> DisablingOOCDisablesRelay = CVarDef.Create("ooc.disabling_ooc_disables_relay", true, CVar.SERVERONLY);
/* /*
* LOOC * LOOC
*/ */