Fix old chats with stringified streamer ids being undeserializable (#843

)
lay295 · Oct 7, 2023 · fefd3d1 · fefd3d1
1 parent 68a6b85
commit fefd3d1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/TwitchDownloaderCore/Chat/ChatJson.cs b/TwitchDownloaderCore/Chat/ChatJson.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Threading;
@@ -66,7 +67,20 @@ public static class ChatJson
 
             if (jsonDocument.RootElement.TryGetProperty("streamer", out JsonElement streamerElement))
             {
-                returnChatRoot.streamer = streamerElement.Deserialize<Streamer>(options: _jsonSerializerOptions);
+                if (returnChatRoot.FileInfo.Version > new ChatRootVersion(1, 0, 0))
+                {
+                    returnChatRoot.streamer = streamerElement.Deserialize<Streamer>(options: _jsonSerializerOptions);
+                }
+                else
+                {
+                    var legacyStreamer = streamerElement.Deserialize<LegacyStreamer>(options: _jsonSerializerOptions);
+                    returnChatRoot.streamer = legacyStreamer.id.ValueKind switch
+                    {
+                        JsonValueKind.Number => new Streamer { name = legacyStreamer.name, id = legacyStreamer.id.GetInt32() },
+                        JsonValueKind.String => new Streamer { name = legacyStreamer.name, id = int.Parse(legacyStreamer.id.GetString()!) },
+                        _ => null // Fallback to UpgradeChatJson()
+                    };
+                }
             }
 
             if (jsonDocument.RootElement.TryGetProperty("video", out JsonElement videoElement))

diff --git a/TwitchDownloaderCore/TwitchObjects/ChatRoot.cs b/TwitchDownloaderCore/TwitchObjects/ChatRoot.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace TwitchDownloaderCore.TwitchObjects
@@ -11,6 +12,13 @@ public class Streamer
         public int id { get; set; }
     }
 
+    public class LegacyStreamer
+    {
+        public string name { get; set; }
+        /// <remarks>Some old chats use a string instead of an integer.</remarks>
+        public JsonElement id { get; set; }
+    }
+
     [DebuggerDisplay("{display_name}")]
     public class Commenter
     {