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

Makes ahelp relay messages a little less disgusting to look at (#11149)

Browse Source 
* Makes ahelp relay messages a little less disgusting to look at

* Improve title
This commit is contained in:
Visne
2022-09-10 08:43:46 +02:00
committed by GitHub
parent d569948dd2
commit 6fbac12ac3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Administration/Systems/BwoinkSystem.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.Administration.Systems
_config.OnValueChanged(CCVars.DiscordAHelpWebhook, OnWebhookChanged, true); _config.OnValueChanged(CCVars.DiscordAHelpWebhook, OnWebhookChanged, true);
_config.OnValueChanged(CVars.GameHostName, OnServerNameChanged, true); _config.OnValueChanged(CVars.GameHostName, OnServerNameChanged, true);
_sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("AHELP"); _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("AHELP");
_maxAdditionalChars = GenerateAHelpMessage("", "", true, true).Length + Header("").Length; _maxAdditionalChars = GenerateAHelpMessage("", "", true, true).Length;
SubscribeLocalEvent<RoundStartingEvent>(RoundStarting); SubscribeLocalEvent<RoundStartingEvent>(RoundStarting);
} }
@@ -70,8 +70,6 @@ namespace Content.Server.Administration.Systems
_webhookUrl = obj; _webhookUrl = obj;
} }
private string Header(string serverName) => $"Server: {serverName}";
private async void ProcessQueue(NetUserId channelId, Queue<string> messages) private async void ProcessQueue(NetUserId channelId, Queue<string> messages)
{ {
if (!_relayMessages.TryGetValue(channelId, out var oldMessage) || messages.Sum(x => x.Length+2) + oldMessage.content.Length > MessageMax) if (!_relayMessages.TryGetValue(channelId, out var oldMessage) || messages.Sum(x => x.Length+2) + oldMessage.content.Length > MessageMax)
@@ -85,7 +83,7 @@ namespace Content.Server.Administration.Systems
return; return;
} }
oldMessage = (string.Empty, lookup.Username, Header(_serverName)); oldMessage = (string.Empty, lookup.Username, "");
} }
while (messages.TryDequeue(out var message)) while (messages.TryDequeue(out var message))
@@ -95,7 +93,7 @@ namespace Content.Server.Administration.Systems
var payload = new WebhookPayload() var payload = new WebhookPayload()
{ {
Username = $"R:{_gameTicker.RoundId}|N:{oldMessage.username}", Username = $"{oldMessage.username} on {_serverName} (round {_gameTicker.RoundId})",
Content = oldMessage.content Content = oldMessage.content
}; };
@@ -237,9 +235,9 @@ namespace Content.Server.Administration.Systems
if (noReceiver) if (noReceiver)
stringbuilder.Append(":sos:"); stringbuilder.Append(":sos:");
stringbuilder.Append(admin ? ":outbox_tray:" : ":inbox_tray:"); stringbuilder.Append(admin ? ":outbox_tray:" : ":inbox_tray:");
stringbuilder.Append(' '); stringbuilder.Append(" **");
stringbuilder.Append(username); stringbuilder.Append(username);
stringbuilder.Append(": "); stringbuilder.Append(":** ");
stringbuilder.Append(message); stringbuilder.Append(message);
return stringbuilder.ToString(); return stringbuilder.ToString();
} }