Fixing some issues with RateLimiting handling in 1.1 API

Twitterizer2/Core/TwitterCommand.cs

@@ -43,6 +43,7 @@ namespace Twitterizer.Core
     using System.Web;
 #endif
     using Twitterizer;
+    using Newtonsoft.Json;
 
     /// <summary>
     /// The base command class.
@@ -246,6 +247,20 @@ public TwitterResponse<T> ExecuteCommand()
                 responseData = ConversionUtility.ReadStream(exceptionResponse.GetResponseStream());
                 twitterResponse.Content = Encoding.UTF8.GetString(responseData, 0, responseData.Length);
 
+                if (!String.IsNullOrEmpty(twitterResponse.Content))
+                {
+                    var responseContent = JsonConvert.DeserializeObject<dynamic>(twitterResponse.Content);
+                    if (responseContent != null && responseContent.errors != null)
+                    {
+                        var errors = responseContent.errors;
+                        if (errors != null && ((IEnumerable<dynamic>)errors).Any())
+                        {
+                            foreach (var error in errors)
+                                twitterResponse.ErrorMessage += error.code + ":" + error.message + ";";
+                        }
+                    }
+                }
+
 #if !SILVERLIGHT
                 rateLimiting = ParseRateLimitHeaders(exceptionResponse.Headers);
 
@@ -318,10 +333,11 @@ private static void SetStatusCode(TwitterResponse<T> twitterResponse, HttpStatus
                     break;
 
                 case HttpStatusCode.BadRequest:
-                    twitterResponse.Result = (rateLimiting != null && rateLimiting.Remaining == 0) ? RequestResult.RateLimited : RequestResult.BadRequest;
+                    twitterResponse.Result = RequestResult.BadRequest;
                     break;
 
                 case (HttpStatusCode)420: //Rate Limited from Search/Trends API
+                case (HttpStatusCode)429:
                     twitterResponse.Result = RequestResult.RateLimited;
                     break;
 
@@ -372,12 +388,12 @@ private static RateLimiting ParseRateLimitHeaders(WebHeaderCollection responseHe
         {
             RateLimiting rateLimiting = new RateLimiting();
 
-            if (responseHeaders.AllKeys.Contains("X-RateLimit-Limit"))
+            if (responseHeaders.AllKeys.Any(x => x.Equals("X-RateLimit-Limit", StringComparison.InvariantCultureIgnoreCase)))
             {
                 rateLimiting.Total = int.Parse(responseHeaders["X-RateLimit-Limit"], CultureInfo.InvariantCulture);
             }
 
-            if (responseHeaders.AllKeys.Contains("X-RateLimit-Remaining"))
+            if (responseHeaders.AllKeys.Any(x => x.Equals("X-RateLimit-Remaining", StringComparison.InvariantCultureIgnoreCase)))
             {
                 rateLimiting.Remaining = int.Parse(responseHeaders["X-RateLimit-Remaining"], CultureInfo.InvariantCulture);
             }