From 324d6bab206abb99480745ef0c5c1cfe3278ef88 Mon Sep 17 00:00:00 2001 From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Date: Thu, 15 Dec 2022 20:18:32 +0200 Subject: [PATCH] Don't add margin for rate limit delays --- DiscordChatExporter.Core/Discord/DiscordClient.cs | 4 ++-- DiscordChatExporter.Core/Utils/Http.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DiscordChatExporter.Core/Discord/DiscordClient.cs b/DiscordChatExporter.Core/Discord/DiscordClient.cs index 1ba9e42..9f37f65 100644 --- a/DiscordChatExporter.Core/Discord/DiscordClient.cs +++ b/DiscordChatExporter.Core/Discord/DiscordClient.cs @@ -36,7 +36,7 @@ public class DiscordClient { using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url)); - // Don't validate because token can have special characters + // Don't validate because the token can have special characters // https://github.com/Tyrrrz/DiscordChatExporter/issues/828 request.Headers.TryAddWithoutValidation( "Authorization", @@ -68,7 +68,7 @@ public class DiscordClient .Pipe(s => TimeSpan.FromSeconds(double.Parse(s, CultureInfo.InvariantCulture))); if (remainingRequestCount <= 0 && resetAfterDelay is not null) - await Task.Delay(resetAfterDelay.Value + TimeSpan.FromSeconds(1), innerCancellationToken); + await Task.Delay(resetAfterDelay.Value, innerCancellationToken); return response; }, cancellationToken); diff --git a/DiscordChatExporter.Core/Utils/Http.cs b/DiscordChatExporter.Core/Utils/Http.cs index ab25951..b566b66 100644 --- a/DiscordChatExporter.Core/Utils/Http.cs +++ b/DiscordChatExporter.Core/Utils/Http.cs @@ -41,7 +41,7 @@ public static class Http { // If rate-limited, use retry-after header as the guide if (result.Result.Headers.RetryAfter?.Delta is { } retryAfter) - return retryAfter + TimeSpan.FromSeconds(1); + return retryAfter; return TimeSpan.FromSeconds(Math.Pow(2, i) + 1); },