From 84d14ab1855b21c53b399bf2d2d3333d911cee8f Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 16 Apr 2020 21:23:26 +0200 Subject: [PATCH] Use new GetFromJson method for convenience. --- Content.Server/MoMMILink.cs | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Content.Server/MoMMILink.cs b/Content.Server/MoMMILink.cs index 2b7bcfc8bb..0ae57f928d 100644 --- a/Content.Server/MoMMILink.cs +++ b/Content.Server/MoMMILink.cs @@ -88,21 +88,15 @@ namespace Content.Server } var password = _configurationManager.GetCVar("status.mommipassword"); - OOCPostMessage message; - using (var streamReader = new StreamReader(request.Body, EncodingHelpers.UTF8)) - using (var jsonReader = new JsonTextReader(streamReader)) + OOCPostMessage message = null; + try { - var serializer = new JsonSerializer(); - try - { - message = serializer.Deserialize(jsonReader); - } - catch (JsonSerializationException) - { - response.StatusCode = (int) HttpStatusCode.BadRequest; - return true; - } + message = request.GetFromJson(); + } + catch (JsonSerializationException) + { + // message null so enters block down below. } if (message == null)