Merge branch 'Tweetinvi-0.9.10.1' of https://github.com/linvi/tweetinvi…

… into Tweetinvi-0.9.10.1
linvi · Jan 17, 2016 · 914de43 · 914de43
2 parents 41281d6 + d4932ce
commit 914de43
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/Tweetinvi.Logic/DTO/TweetDTO.cs b/Tweetinvi.Logic/DTO/TweetDTO.cs
@@ -105,6 +105,7 @@ public long Id
         public ITweetDTO QuotedTweetDTO { get; set; }
 
         [JsonProperty("retweet_count")]
+        [JsonConverter(typeof(JsonPropertyConverterRepository))]
         public int RetweetCount { get; set; }
 
         [JsonProperty("retweeted")]

diff --git a/Tweetinvi.Streams/StreamTask.cs b/Tweetinvi.Streams/StreamTask.cs
@@ -121,6 +121,11 @@ public void Start()
                     var isJsonResponseValid = json.IsMatchingJsonFormat();
                     if (!isJsonResponseValid)
                     {
+                        if (json != null)
+                        {
+                            throw new WebException(json);
+                        }
+
                         if (TryHandleInvalidResponse(numberOfRepeatedFailures))
                         {
                             ++numberOfRepeatedFailures;

diff --git a/Tweetinvi/Tweet.cs b/Tweetinvi/Tweet.cs
@@ -247,6 +247,24 @@ public static bool FavoriteTweet(long tweetId)
         {
             return TweetController.FavoriteTweet(tweetId);
         }
+
+        // UnFavorite Tweet
+
+        /// <summary>
+        /// UnFavorite a specific tweet
+        /// </summary>
+        public static bool UnFavoriteTweet(ITweet tweet)
+        {
+            return TweetController.UnFavoriteTweet(tweet);
+        }
+
+        /// <summary>
+        /// UnFavorite a specific tweet
+        /// </summary>
+        public static bool UnFavoriteTweet(long tweetId)
+        {
+            return TweetController.UnFavoriteTweet(tweetId);
+        }
 
         // Generate OEmbedTweet
 
@@ -268,4 +286,4 @@ public static IOEmbedTweet GenerateOEmbedTweet(long tweetId)
 
         #endregion
     }
-}
+}