Merge branch '20-11-27-merge'

This commit is contained in:
Pieter-Jan Briers
2020-11-27 00:54:29 +01:00
24 changed files with 177 additions and 144 deletions

View File

@@ -14,7 +14,6 @@
</PropertyGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>

View File

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
using Content.Server.Interfaces;
using Content.Server.Interfaces.Chat;
using Content.Shared;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using Robust.Server.Interfaces.ServerStatus;
using Robust.Server.ServerStatus;
@@ -74,9 +73,9 @@ namespace Content.Server
}
}
private bool _handleChatPost(HttpMethod method, HttpRequest request, HttpResponse response)
private bool _handleChatPost(HttpMethod method, HttpListenerRequest request, HttpListenerResponse response)
{
if (method != HttpMethod.Post || request.Path != "/ooc")
if (method != HttpMethod.Post || request.Url!.AbsolutePath != "/ooc")
{
return false;
}