github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash if a rate limit header is unparsable

Browse Source
This commit is contained in:
RogueException
2017-03-31 13:34:03 -03:00
parent 158ce0f922
commit 57013d5639
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Discord.Net.Rest/Net/RateLimitInfo.cs
View File

@@ -15,14 +15,18 @@ namespace Discord.Net
internal RateLimitInfo(Dictionary<string, string> headers) internal RateLimitInfo(Dictionary<string, string> headers)
{ {
string temp; string temp;
IsGlobal = headers.TryGetValue("X-RateLimit-Global", out temp) ? bool.Parse(temp) : false; IsGlobal = headers.TryGetValue("X-RateLimit-Global", out temp) &&
Limit = headers.TryGetValue("X-RateLimit-Limit", out temp) ? int.Parse(temp) : (int?)null; bool.TryParse(temp, out var isGlobal) ? isGlobal : false;
Remaining = headers.TryGetValue("X-RateLimit-Remaining", out temp) ? int.Parse(temp) : (int?)null; Limit = headers.TryGetValue("X-RateLimit-Limit", out temp) &&
Reset = headers.TryGetValue("X-RateLimit-Reset", out temp) ? int.TryParse(temp, out var limit) ? limit : (int?)null;
DateTimeUtils.FromUnixSeconds(int.Parse(temp)) : (DateTimeOffset?)null; Remaining = headers.TryGetValue("X-RateLimit-Remaining", out temp) &&
RetryAfter = headers.TryGetValue("Retry-After", out temp) ? int.Parse(temp) : (int?)null; int.TryParse(temp, out var remaining) ? remaining : (int?)null;
Lag = headers.TryGetValue("Date", out temp) ? Reset = headers.TryGetValue("X-RateLimit-Reset", out temp) &&
DateTimeOffset.UtcNow - DateTimeOffset.Parse(temp) : (TimeSpan?)null; int.TryParse(temp, out var reset) ? DateTimeUtils.FromUnixSeconds(reset) : (DateTimeOffset?)null;
RetryAfter = headers.TryGetValue("Retry-After", out temp) &&
int.TryParse(temp, out var retryAfter) ? retryAfter : (int?)null;
Lag = headers.TryGetValue("Date", out temp) &&
DateTimeOffset.TryParse(temp, out var date) ? DateTimeOffset.UtcNow - date : (TimeSpan?)null;
} }
} }
} }