Browse Source

Fix NRE when ratelimmited requests don't return a body (#2135)

tags/3.4.0
CottageDwellingCat GitHub 3 years ago
parent
commit
b95b94231c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs

+ 2
- 1
src/Discord.Net.Rest/Net/Queue/RequestQueueBucket.cs View File

@@ -377,7 +377,8 @@ namespace Discord.Net.Queue
// use the payload reset after value
var payload = info.ReadRatelimitPayload(body);

resetTick = DateTimeOffset.UtcNow.Add(TimeSpan.FromSeconds(payload.RetryAfter));
// fallback on stored ratelimit info when payload is null, https://github.com/discord-net/Discord.Net/issues/2123
resetTick = DateTimeOffset.UtcNow.Add(TimeSpan.FromSeconds(payload?.RetryAfter ?? info.ResetAfter?.TotalSeconds ?? 0));
#if DEBUG_LIMITS
Debug.WriteLine($"[{id}] Reset-After: {info.ResetAfter.Value} ({info.ResetAfter?.TotalMilliseconds} ms)");
#endif


Loading…
Cancel
Save