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

Translate newlines in MoMMI relay to spaces.

Browse Source 
Fixes #6299
This commit is contained in:
Pieter-Jan Briers
2022-01-24 23:36:42 +01:00
parent 2f033ae26f
commit 775c18d525
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/MoMMI/MoMMILink.cs
View File

@@ -70,7 +70,7 @@ namespace Content.Server.MoMMI
} }
} }
private bool HandleChatPost(IStatusHandlerContext context) private async Task<bool> HandleChatPost(IStatusHandlerContext context)
{ {
if (context.RequestMethod != HttpMethod.Post || context.Url!.AbsolutePath != "/ooc") if (context.RequestMethod != HttpMethod.Post || context.Url!.AbsolutePath != "/ooc")
{ {
@@ -81,14 +81,14 @@ namespace Content.Server.MoMMI
if (string.IsNullOrEmpty(password)) if (string.IsNullOrEmpty(password))
{ {
context.RespondError(HttpStatusCode.Forbidden); await context.RespondErrorAsync(HttpStatusCode.Forbidden);
return true; return true;
} }
OOCPostMessage? message = null; OOCPostMessage? message = null;
try try
{ {
message = context.RequestBodyJson<OOCPostMessage>(); message = await context.RequestBodyJsonAsync<OOCPostMessage>();
} }
catch (JsonException) catch (JsonException)
{ {
@@ -97,20 +97,22 @@ namespace Content.Server.MoMMI
if (message == null) if (message == null)
{ {
context.RespondError(HttpStatusCode.BadRequest); await context.RespondErrorAsync(HttpStatusCode.BadRequest);
return true; return true;
} }
if (message.Password != password) if (message.Password != password)
{ {
context.RespondError(HttpStatusCode.Forbidden); await context.RespondErrorAsync(HttpStatusCode.Forbidden);
return true; return true;
} }
_taskManager.RunOnMainThread(() => _chatManager.SendHookOOC(message.Sender, message.Contents)); var sender = message.Sender;
var contents = message.Contents.ReplaceLineEndings(" ");
context.Respond("Success", HttpStatusCode.OK); _taskManager.RunOnMainThread(() => _chatManager.SendHookOOC(sender, contents));
await context.RespondAsync("Success", HttpStatusCode.OK);
return true; return true;
} }