From e5d5f1c85f2cd0ffef79f3e33c8e2b13d20494d7 Mon Sep 17 00:00:00 2001 From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Date: Thu, 15 Dec 2022 20:08:14 +0200 Subject: [PATCH] Cleanup --- DiscordChatExporter.Core/Discord/DiscordClient.cs | 2 +- .../Utils/Extensions/ExceptionExtensions.cs | 13 ------------- .../Utils/Extensions/HttpExtensions.cs | 15 ++++++++++++++- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/DiscordChatExporter.Core/Discord/DiscordClient.cs b/DiscordChatExporter.Core/Discord/DiscordClient.cs index 5fe033a..1ba9e42 100644 --- a/DiscordChatExporter.Core/Discord/DiscordClient.cs +++ b/DiscordChatExporter.Core/Discord/DiscordClient.cs @@ -56,7 +56,7 @@ public class DiscordClient // This may add an unnecessary delay in case the user doesn't intend to // make any more requests, but implementing a smarter solution would // require properly keeping track of Discord's global/per-route/per-resource - // rate limits and that's not worth the effort. + // rate limits and that's just way too much effort. var remainingRequestCount = response .Headers .TryGetValue("X-RateLimit-Remaining")? diff --git a/DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs b/DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs index 3515559..6566264 100644 --- a/DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs +++ b/DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs @@ -1,9 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; -using System.Net; -using System.Net.Http; -using System.Text.RegularExpressions; namespace DiscordChatExporter.Core.Utils.Extensions; @@ -32,13 +28,4 @@ public static class ExceptionExtensions PopulateChildren(exception, children); return children; } - - public static HttpStatusCode? TryGetStatusCode(this HttpRequestException ex) => - // This is extremely frail, but there's no other way - Regex - .Match(ex.Message, @": (\d+) \(") - .Groups[1] - .Value - .NullIfWhiteSpace()? - .Pipe(s => (HttpStatusCode) int.Parse(s, CultureInfo.InvariantCulture)); } \ No newline at end of file diff --git a/DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs b/DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs index 971a8e3..622fe2d 100644 --- a/DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs +++ b/DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs @@ -1,4 +1,8 @@ -using System.Net.Http.Headers; +using System.Globalization; +using System.Net; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Text.RegularExpressions; namespace DiscordChatExporter.Core.Utils.Extensions; @@ -8,4 +12,13 @@ public static class HttpExtensions headers.TryGetValues(name, out var values) ? string.Concat(values) : null; + + public static HttpStatusCode? TryGetStatusCode(this HttpRequestException ex) => + // This is extremely frail, but there's no other way + Regex + .Match(ex.Message, @": (\d+) \(") + .Groups[1] + .Value + .NullIfWhiteSpace()? + .Pipe(s => (HttpStatusCode) int.Parse(s, CultureInfo.InvariantCulture)); } \ No newline at end of file