liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore weirdly formatted server errors too

Browse Source
This commit is contained in:
Ske 2020-02-19 01:00:23 +01:00
parent 2354e7fd74
commit 456fe8f7af
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PluralKit.Bot/Services/WebhookExecutorService.cs
View File

@ -70,8 +70,12 @@ namespace PluralKit.Bot
using var response = await _client.PostAsync($"{DiscordConfig.APIUrl}webhooks/{webhook.Id}/{webhook.Token}?wait=true", mfd);
timerCtx.Dispose();
// TODO: are there cases where an error won't also return a parseable JSON object?
var responseJson = JsonConvert.DeserializeObject<JObject>(await response.Content.ReadAsStringAsync());
var responseString = await response.Content.ReadAsStringAsync();
if (responseString.StartsWith("<"))
// if the response starts with a < it's probably a CloudFlare error or similar, so just force-break
response.EnsureSuccessStatusCode();
var responseJson = JsonConvert.DeserializeObject<JObject>(responseString);
if (responseJson.ContainsKey("code"))
{
var errorCode = responseJson["code"].Value<int>();