Fixed serialization for TweetMediaType.AnimatedGif. Added Url to Twee…

…tMedia because TweetMediaType.Photo has Url and not PreviewImageUrl.
JoeMayo · Aug 12, 2021 · 4a47339 · 4a47339
1 parent 3e4b0b4
commit 4a47339
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 3 deletions.
diff --git a/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/SearchDemos.cs b/Samples/LinqToTwitter6/Console/ConsoleDemo.CSharp/ConsoleDemo.CSharp/SearchDemos.cs
@@ -160,6 +160,7 @@ static async Task DoPagedSearchAsync(TwitterContext twitterCtx)
         static async Task DoRecentSearchAsync(TwitterContext twitterCtx)
         {
             string searchTerm = "\"LINQ to Twitter\" OR Linq2Twitter OR LinqToTwitter OR JoeMayo";
+            searchTerm = "Twitter";
 
             // default is id and text and this also brings in created_at and geo
             string tweetFields =
@@ -177,6 +178,7 @@ static async Task DoRecentSearchAsync(TwitterContext twitterCtx)
                 (from search in twitterCtx.TwitterSearch
                  where search.Type == SearchType.RecentSearch &&
                        search.Query == searchTerm &&
+                       search.MaxResults == 100 &&
                        search.TweetFields == TweetField.AllFieldsExceptPermissioned &&
                        search.Expansions == ExpansionField.AllTweetFields &&
                        search.MediaFields == MediaField.AllFieldsExceptPermissioned &&

diff --git a/src/LinqToTwitter6/LinqToTwitter/Search/TwitterSearchRequestProcessor.cs b/src/LinqToTwitter6/LinqToTwitter/Search/TwitterSearchRequestProcessor.cs
@@ -267,7 +267,8 @@ TwitterSearch JsonDeserialize(string responseJson)
             {
                 Converters =
                 {
-                    new JsonStringEnumConverter()
+                    new JsonStringEnumConverter(),
+                    new TweetMediaTypeConverter()
                 }
             };
             TwitterSearch? search = JsonSerializer.Deserialize<TwitterSearch>(responseJson, options);

diff --git a/src/LinqToTwitter6/LinqToTwitter/Tweet/TweetMedia.cs b/src/LinqToTwitter6/LinqToTwitter/Tweet/TweetMedia.cs
@@ -34,7 +34,7 @@ public record TweetMedia
         public object? OrganicMetrics { get; init; }
 
         /// <summary>
-        /// URL to video preview image
+        /// URL to animated GIF and video preview image
         /// </summary>
         [JsonPropertyName("preview_image_url")]
         public string? PreviewImageUrl { get; init; }
@@ -50,9 +50,16 @@ public record TweetMedia
         /// <summary>
         /// Type of media - e.g. gif, photo, or video
         /// </summary>
+        [JsonConverter(typeof(TweetMediaTypeConverter))]
         [JsonPropertyName("type")]
         public TweetMediaType Type { get; init; }
 
+        /// <summary>
+        /// URL to photo preview image
+        /// </summary>
+        [JsonPropertyName("url")]
+        public string? Url { get; init; }
+
         /// <summary>
         /// Width in pixels
         /// </summary>

diff --git a/src/LinqToTwitter6/LinqToTwitter/Tweet/TweetMediaTypeConverter.cs b/src/LinqToTwitter6/LinqToTwitter/Tweet/TweetMediaTypeConverter.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace LinqToTwitter
+{
+    public class TweetMediaTypeConverter : JsonConverter<TweetMediaType>
+    {
+        public override TweetMediaType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return reader.GetString() switch
+            {
+                "animated_gif" => TweetMediaType.AnimatedGif,
+                "photo" => TweetMediaType.Photo,
+                "video" => TweetMediaType.Video,
+                _ => TweetMediaType.None
+            };
+        }
+
+        public override void Write(Utf8JsonWriter writer, TweetMediaType value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(
+                value switch
+                {
+                    TweetMediaType.AnimatedGif => "animated_gif",
+                    TweetMediaType.Photo => "photo",
+                    TweetMediaType.Video => "video",
+                    _ => ""
+                });
+        }
+    }
+}
diff --git a/src/LinqToTwitter6/LinqToTwitter/Tweet/TweetRequestProcessor.cs b/src/LinqToTwitter6/LinqToTwitter/Tweet/TweetRequestProcessor.cs
@@ -357,7 +357,8 @@ TweetQuery JsonDeserialize(string responseJson)
             {
                 Converters =
                 {
-                    new JsonStringEnumConverter()
+                    new JsonStringEnumConverter(),
+                    new TweetMediaTypeConverter()
                 }
             };
             TweetQuery? tweet = JsonSerializer.Deserialize<TweetQuery>(responseJson, options);