From 84bd684013120341902068ec253452524e940bcc Mon Sep 17 00:00:00 2001
From: Scrub <72096833+ScrubN@users.noreply.github.com>
Date: Sun, 11 Dec 2022 15:54:23 -0500
Subject: [PATCH] Add additional information to chat jsons (#440)

* Add video/clip ID to json

* Also store title and creation date in json

* Add video length parameter

* Put ChatRoot in namespace

* Swap GQL and ChatRoot video class names

* Add ChatRootInfo property for tracking chatroot version and creation date

* Typo

* I should think of all possible scenarios before committing

* Make ChatRoot version not a string for easier parsing

* Trim entries and index out of bounds protection, add int based constructor

* Add ChatRootVersion.ToString() override

* Move Gql responses to dedicated namespace, Move ChatRootInfo to dedicated class, add ChatRootVersion operators and methods

* Remove string constructor due to complexity and unclear usage
---
 TwitchDownloaderCore/ChatDownloader.cs        |  49 ++--
 TwitchDownloaderCore/ChatRenderer.cs          |   5 +-
 TwitchDownloaderCore/TwitchHelper.cs          |   1 +
 .../TwitchObjects/ChatRoot.cs                 | 264 +++++++++---------
 .../TwitchObjects/ChatRootInfo.cs             |  98 +++++++
 .../{ => Gql}/GqlCheerResponse.cs             |   2 +-
 .../{ => Gql}/GqlClipResponse.cs              |   2 +-
 .../{ => Gql}/GqlClipSearchResponse.cs        |   2 +-
 .../{ => Gql}/GqlCommentResponse.cs           |   2 +-
 .../{ => Gql}/GqlVideoResponse.cs             |   7 +-
 .../{ => Gql}/GqlVideoSearchResponse.cs       |   2 +-
 TwitchDownloaderWPF/PageChatDownload.xaml.cs  |   4 +-
 TwitchDownloaderWPF/PageClipDownload.xaml.cs  |   2 +-
 TwitchDownloaderWPF/PageVodDownload.xaml.cs   |   2 +-
 .../WindowMassDownload.xaml.cs                |   2 +-
 TwitchDownloaderWPF/WindowUrlList.xaml.cs     |   2 +-
 16 files changed, 277 insertions(+), 169 deletions(-)
 create mode 100644 TwitchDownloaderCore/TwitchObjects/ChatRootInfo.cs
 rename TwitchDownloaderCore/TwitchObjects/{ => Gql}/GqlCheerResponse.cs (95%)
 rename TwitchDownloaderCore/TwitchObjects/{ => Gql}/GqlClipResponse.cs (94%)
 rename TwitchDownloaderCore/TwitchObjects/{ => Gql}/GqlClipSearchResponse.cs (95%)
 rename TwitchDownloaderCore/TwitchObjects/{ => Gql}/GqlCommentResponse.cs (98%)
 rename TwitchDownloaderCore/TwitchObjects/{ => Gql}/GqlVideoResponse.cs (82%)
 rename TwitchDownloaderCore/TwitchObjects/{ => Gql}/GqlVideoSearchResponse.cs (96%)

diff --git a/TwitchDownloaderCore/ChatDownloader.cs b/TwitchDownloaderCore/ChatDownloader.cs
index c941cb19..238913de 100644
--- a/TwitchDownloaderCore/ChatDownloader.cs
+++ b/TwitchDownloaderCore/ChatDownloader.cs
@@ -1,7 +1,4 @@
-using NeoSmart.Unicode;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -13,6 +10,7 @@
 using System.Web;
 using TwitchDownloaderCore.Options;
 using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 
 namespace TwitchDownloaderCore
 {
@@ -235,47 +233,60 @@ private List<Comment> ConvertComments(CommentVideo video)
 
         public async Task DownloadAsync(IProgress<ProgressReport> progress, CancellationToken cancellationToken)
         {
-            DownloadType downloadType = downloadOptions.Id.All(x => Char.IsDigit(x)) ? DownloadType.Video : DownloadType.Clip;
-            string videoId = "";
+            DownloadType downloadType = downloadOptions.Id.All(x => char.IsDigit(x)) ? DownloadType.Video : DownloadType.Clip;
 
             List<Comment> comments = new List<Comment>();
-            ChatRoot chatRoot = new ChatRoot() { streamer = new Streamer(), video = new VideoTime(), comments = comments };
+            ChatRoot chatRoot = new ChatRoot() { FileInfo = new ChatRootInfo() { Version = new ChatRootVersion(1, 1, 0) }, streamer = new Streamer(), video = new Video(), comments = comments };
 
+            string videoId = "";
+            string videoTitle = "";
+            DateTime videoCreatedAt;
             double videoStart = 0.0;
             double videoEnd = 0.0;
             double videoDuration = 0.0;
+            double videoTotalLength;
             int connectionCount = downloadOptions.ConnectionCount;
 
             if (downloadType == DownloadType.Video)
             {
                 videoId = downloadOptions.Id;
-                GqlVideoResponse taskInfo = await TwitchHelper.GetVideoInfo(Int32.Parse(videoId));
-                chatRoot.streamer.name = taskInfo.data.video.owner.displayName;
-                chatRoot.streamer.id = int.Parse(taskInfo.data.video.owner.id);
+                GqlVideoResponse taskVideoInfo = await TwitchHelper.GetVideoInfo(int.Parse(videoId));
+                chatRoot.streamer.name = taskVideoInfo.data.video.owner.displayName;
+                chatRoot.streamer.id = int.Parse(taskVideoInfo.data.video.owner.id);
+                videoTitle = taskVideoInfo.data.video.title;
+                videoCreatedAt = taskVideoInfo.data.video.createdAt;
                 videoStart = downloadOptions.CropBeginning ? downloadOptions.CropBeginningTime : 0.0;
-                videoEnd = downloadOptions.CropEnding ? downloadOptions.CropEndingTime : taskInfo.data.video.lengthSeconds;
+                videoEnd = downloadOptions.CropEnding ? downloadOptions.CropEndingTime : taskVideoInfo.data.video.lengthSeconds;
+                videoTotalLength = taskVideoInfo.data.video.lengthSeconds;
             }
             else
             {
-                GqlClipResponse taskInfo = await TwitchHelper.GetClipInfo(downloadOptions.Id);
+                GqlClipResponse taskClipInfo = await TwitchHelper.GetClipInfo(downloadOptions.Id);
 
-                if (taskInfo.data.clip.video == null || taskInfo.data.clip.videoOffsetSeconds == null)
+                if (taskClipInfo.data.clip.video == null || taskClipInfo.data.clip.videoOffsetSeconds == null)
                     throw new Exception("Invalid VOD for clip, deleted/expired VOD possibly?");
 
-                videoId = taskInfo.data.clip.video.id;
+                videoId = taskClipInfo.data.clip.video.id;
                 downloadOptions.CropBeginning = true;
-                downloadOptions.CropBeginningTime = (int)taskInfo.data.clip.videoOffsetSeconds;
+                downloadOptions.CropBeginningTime = (int)taskClipInfo.data.clip.videoOffsetSeconds;
                 downloadOptions.CropEnding = true;
-                downloadOptions.CropEndingTime = downloadOptions.CropBeginningTime + taskInfo.data.clip.durationSeconds;
-                chatRoot.streamer.name = taskInfo.data.clip.broadcaster.displayName;
-                chatRoot.streamer.id = int.Parse(taskInfo.data.clip.broadcaster.id);
-                videoStart = (int)taskInfo.data.clip.videoOffsetSeconds;
-                videoEnd = (int)taskInfo.data.clip.videoOffsetSeconds + taskInfo.data.clip.durationSeconds;
+                downloadOptions.CropEndingTime = downloadOptions.CropBeginningTime + taskClipInfo.data.clip.durationSeconds;
+                chatRoot.streamer.name = taskClipInfo.data.clip.broadcaster.displayName;
+                chatRoot.streamer.id = int.Parse(taskClipInfo.data.clip.broadcaster.id);
+                videoTitle = taskClipInfo.data.clip.title;
+                videoCreatedAt = taskClipInfo.data.clip.createdAt;
+                videoStart = (int)taskClipInfo.data.clip.videoOffsetSeconds;
+                videoEnd = (int)taskClipInfo.data.clip.videoOffsetSeconds + taskClipInfo.data.clip.durationSeconds;
+                videoTotalLength = taskClipInfo.data.clip.durationSeconds;
                 connectionCount = 1;
             }
 
+            chatRoot.video.title = videoTitle;
+            chatRoot.video.id = videoId;
+            chatRoot.video.created_at = videoCreatedAt;
             chatRoot.video.start = videoStart;
             chatRoot.video.end = videoEnd;
+            chatRoot.video.length = videoTotalLength;
             videoDuration = videoEnd - videoStart;
 
             SortedSet<Comment> commentsSet = new SortedSet<Comment>(new SortedCommentComparer());
diff --git a/TwitchDownloaderCore/ChatRenderer.cs b/TwitchDownloaderCore/ChatRenderer.cs
index 7eed7697..063acb40 100644
--- a/TwitchDownloaderCore/ChatRenderer.cs
+++ b/TwitchDownloaderCore/ChatRenderer.cs
@@ -1100,10 +1100,7 @@ public static async Task<ChatRoot> ParseJsonStatic(string inputJson)
 
             if (jsonDocument.RootElement.TryGetProperty("video", out JsonElement videoJson))
             {
-                if (videoJson.TryGetProperty("start", out JsonElement videoStartJson) && videoJson.TryGetProperty("end", out JsonElement videoEndJson))
-                {
-                    chatRoot.video = videoJson.Deserialize<VideoTime>();
-                }
+                chatRoot.video = videoJson.Deserialize<Video>();
             }
 
             if (jsonDocument.RootElement.TryGetProperty("embeddedData", out JsonElement embedDataJson))
diff --git a/TwitchDownloaderCore/TwitchHelper.cs b/TwitchDownloaderCore/TwitchHelper.cs
index 433cc4e2..3ce9824e 100644
--- a/TwitchDownloaderCore/TwitchHelper.cs
+++ b/TwitchDownloaderCore/TwitchHelper.cs
@@ -16,6 +16,7 @@
 using System.Xml.Linq;
 using TwitchDownloaderCore.Properties;
 using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 
 namespace TwitchDownloaderCore
 {
diff --git a/TwitchDownloaderCore/TwitchObjects/ChatRoot.cs b/TwitchDownloaderCore/TwitchObjects/ChatRoot.cs
index 6ea3ed15..443793a5 100644
--- a/TwitchDownloaderCore/TwitchObjects/ChatRoot.cs
+++ b/TwitchDownloaderCore/TwitchObjects/ChatRoot.cs
@@ -1,135 +1,137 @@
 using System;
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
-public class Streamer
-{
-    public string name { get; set; }
-    public int id { get; set; }
-}
-
-public class Commenter
-{
-    public string display_name { get; set; }
-    public string _id { get; set; }
-    public string name { get; set; }
-    public string type { get; set; }
-    public string bio { get; set; }
-    public DateTime created_at { get; set; }
-    public DateTime updated_at { get; set; }
-    public string logo { get; set; }
-}
-
-public class Emoticon
-{
-    public string emoticon_id { get; set; }
-    public string emoticon_set_id { get; set; }
-}
-
-public class Fragment
-{
-    public string text { get; set; }
-    public Emoticon emoticon { get; set; }
-}
-
-public class UserBadge
-{
-    public string _id { get; set; }
-    public string version { get; set; }
-}
-
-public class Emoticon2
-{
-    public string _id { get; set; }
-    public int begin { get; set; }
-    public int end { get; set; }
-}
-
-public class Message
-{
-    public string body { get; set; }
-    public int bits_spent { get; set; }
-    public List<Fragment> fragments { get; set; }
-    public bool is_action { get; set; }
-    public List<UserBadge> user_badges { get; set; }
-    public string user_color { get; set; }
-    public UserNoticeParams user_notice_params { get; set; }
-    public List<Emoticon2> emoticons { get; set; }
-}
-
-public class UserNoticeParams
-{
-    [JsonPropertyName("msg-id")]
-    public string msg_id { get; set; }
-}
-
-public class Comment
-{
-    public string _id { get; set; }
-    public DateTime created_at { get; set; }
-    public DateTime updated_at { get; set; }
-    public string channel_id { get; set; }
-    public string content_type { get; set; }
-    public string content_id { get; set; }
-    public double content_offset_seconds { get; set; }
-    public Commenter commenter { get; set; }
-    public string source { get; set; }
-    public string state { get; set; }
-    public Message message { get; set; }
-    public bool more_replies { get; set; }
-}
-
-public class VideoTime
-{
-    public double start { get; set; }
-    public double end { get; set; }
-}
-
-public class EmbedEmoteData
-{
-    public string id { get; set; }
-    public int imageScale { get; set; }
-    public byte[] data { get; set; }
-    public string name { get; set; }
-    public string url { get; set; }
-    public int width { get; set; }
-    public int height { get; set; }
-}
-
-public class EmbedChatBadge
-{
-    public string name { get; set; }
-    public Dictionary<string, byte[]> versions { get; set; }
-}
-
-public class EmbedCheerEmote
-{
-    public string prefix { get; set; }
-    public Dictionary<int, EmbedEmoteData> tierList { get; set; }
-}
-
-public class EmbeddedData
-{
-    public List<EmbedEmoteData> thirdParty { get; set; }
-    public List<EmbedEmoteData> firstParty { get; set; }
-    public List<EmbedChatBadge> twitchBadges { get; set; }
-    public List<EmbedCheerEmote> twitchBits { get; set; }
-}
-
-public class CommentResponse
-{
-    public List<Comment> comments { get; set; }
-    public string _next { get; set; }
-}
-
-public class ChatRoot
-{
-    [JsonPropertyOrder(0)]
-    public Streamer streamer { get; set; }
-    [JsonPropertyOrder(1)]
-    public VideoTime video { get; set; }
-    [JsonPropertyOrder(2)]
-    public List<Comment> comments { get; set; }
-    [JsonPropertyOrder(3)]
-    public EmbeddedData embeddedData { get; set; }
+namespace TwitchDownloaderCore.TwitchObjects
+{
+    public class Streamer
+    {
+        public string name { get; set; }
+        public int id { get; set; }
+    }
+
+    public class Commenter
+    {
+        public string display_name { get; set; }
+        public string _id { get; set; }
+        public string name { get; set; }
+        public string type { get; set; }
+        public string bio { get; set; }
+        public DateTime created_at { get; set; }
+        public DateTime updated_at { get; set; }
+        public string logo { get; set; }
+    }
+
+    public class Emoticon
+    {
+        public string emoticon_id { get; set; }
+        public string emoticon_set_id { get; set; }
+    }
+
+    public class Fragment
+    {
+        public string text { get; set; }
+        public Emoticon emoticon { get; set; }
+    }
+
+    public class UserBadge
+    {
+        public string _id { get; set; }
+        public string version { get; set; }
+    }
+
+    public class Emoticon2
+    {
+        public string _id { get; set; }
+        public int begin { get; set; }
+        public int end { get; set; }
+    }
+
+    public class Message
+    {
+        public string body { get; set; }
+        public int bits_spent { get; set; }
+        public List<Fragment> fragments { get; set; }
+        public bool is_action { get; set; }
+        public List<UserBadge> user_badges { get; set; }
+        public string user_color { get; set; }
+        public UserNoticeParams user_notice_params { get; set; }
+        public List<Emoticon2> emoticons { get; set; }
+    }
+
+    public class UserNoticeParams
+    {
+        public string msg_id { get; set; }
+    }
+
+    public class Comment
+    {
+        public string _id { get; set; }
+        public DateTime created_at { get; set; }
+        public DateTime updated_at { get; set; }
+        public string channel_id { get; set; }
+        public string content_type { get; set; }
+        public string content_id { get; set; }
+        public double content_offset_seconds { get; set; }
+        public Commenter commenter { get; set; }
+        public string source { get; set; }
+        public string state { get; set; }
+        public Message message { get; set; }
+        public bool more_replies { get; set; }
+    }
+
+    public class Video
+    {
+        public string title { get; set; }
+        public string id { get; set; }
+        public DateTime created_at { get; set; }
+        public double start { get; set; }
+        public double end { get; set; }
+        public double length { get; set; }
+    }
+
+    public class EmbedEmoteData
+    {
+        public string id { get; set; }
+        public int imageScale { get; set; }
+        public byte[] data { get; set; }
+        public string name { get; set; }
+        public string url { get; set; }
+        public int width { get; set; }
+        public int height { get; set; }
+    }
+
+    public class EmbedChatBadge
+    {
+        public string name { get; set; }
+        public Dictionary<string, byte[]> versions { get; set; }
+    }
+
+    public class EmbedCheerEmote
+    {
+        public string prefix { get; set; }
+        public Dictionary<int, EmbedEmoteData> tierList { get; set; }
+    }
+
+    public class EmbeddedData
+    {
+        public List<EmbedEmoteData> thirdParty { get; set; }
+        public List<EmbedEmoteData> firstParty { get; set; }
+        public List<EmbedChatBadge> twitchBadges { get; set; }
+        public List<EmbedCheerEmote> twitchBits { get; set; }
+    }
+
+    public class CommentResponse
+    {
+        public List<Comment> comments { get; set; }
+        public string _next { get; set; }
+    }
+
+    public class ChatRoot
+    {
+        public ChatRootInfo FileInfo { get; set; } = new ChatRootInfo();
+        public Streamer streamer { get; set; }
+        public Video video { get; set; }
+        public List<Comment> comments { get; set; }
+        public EmbeddedData embeddedData { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/TwitchDownloaderCore/TwitchObjects/ChatRootInfo.cs b/TwitchDownloaderCore/TwitchObjects/ChatRootInfo.cs
new file mode 100644
index 00000000..9d25d6d9
--- /dev/null
+++ b/TwitchDownloaderCore/TwitchObjects/ChatRootInfo.cs
@@ -0,0 +1,98 @@
+using System;
+
+namespace TwitchDownloaderCore.TwitchObjects
+{
+    public class ChatRootInfo
+    {
+        public ChatRootVersion Version { get; set; } = new ChatRootVersion();
+        public DateTime CreatedAt { get; set; } = DateTime.Now;
+    }
+
+    public class ChatRootVersion
+    {
+        // Fields
+        public int Major { get; set; } = 1;
+        public int Minor { get; set; } = 0;
+        public int Patch { get; set; } = 0;
+
+        // Constructors
+        /// <summary>
+        /// Initializes a new <see cref="ChatRootVersion"/> object with the default version of 1.0.0
+        /// </summary>
+        public ChatRootVersion() { }
+
+        /// <summary>
+        /// Initializes a new <see cref="ChatRootVersion"/> object with the version number of <paramref name="major"/>.<paramref name="minor"/>.<paramref name="patch"/>
+        /// </summary>
+        public ChatRootVersion(int major, int minor, int patch)
+        {
+            Major = major;
+            Minor = minor;
+            Patch = patch;
+        }
+
+        // Methods
+        public override string ToString()
+            => $"{Major}.{Minor}.{Patch}";
+
+        public override int GetHashCode()
+            => ToString().GetHashCode();
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(this, obj))
+                return true;
+
+            if (!(obj is ChatRootVersion crv))
+                return false;
+
+            return this == crv;
+        }
+
+        // Operators
+        public static bool operator >(ChatRootVersion left, ChatRootVersion right)
+        {
+            if (left.Major > right.Major) return true;
+            else if (left.Major == right.Major)
+            {
+                if (left.Minor > right.Minor) return true;
+                else if (left.Minor == right.Minor)
+                {
+                    if (left.Patch > right.Patch) return true;
+                }
+            }
+            return false;
+        }
+
+        public static bool operator <(ChatRootVersion left, ChatRootVersion right)
+        {
+            if (left.Major < right.Major) return true;
+            else if (left.Major == right.Major)
+            {
+                if (left.Minor < right.Minor) return true;
+                else if (left.Minor == right.Minor)
+                {
+                    if (left.Patch < right.Patch) return true;
+                }
+            }
+            return false;
+        }
+
+        public static bool operator ==(ChatRootVersion left, ChatRootVersion right)
+        {
+            if (left.Major != right.Major) return false;
+            if (left.Minor != right.Minor) return false;
+            if (left.Patch != right.Patch) return false;
+            return true;
+        }
+
+        public static bool operator !=(ChatRootVersion left, ChatRootVersion right)
+            => !(left == right);
+
+        public static bool operator >=(ChatRootVersion left, ChatRootVersion right)
+            => (left > right) || (left == right);
+
+        public static bool operator <=(ChatRootVersion left, ChatRootVersion right)
+            => (left < right) || (left == right);
+    }
+}
diff --git a/TwitchDownloaderCore/TwitchObjects/GqlCheerResponse.cs b/TwitchDownloaderCore/TwitchObjects/Gql/GqlCheerResponse.cs
similarity index 95%
rename from TwitchDownloaderCore/TwitchObjects/GqlCheerResponse.cs
rename to TwitchDownloaderCore/TwitchObjects/Gql/GqlCheerResponse.cs
index c848fb40..21feda0c 100644
--- a/TwitchDownloaderCore/TwitchObjects/GqlCheerResponse.cs
+++ b/TwitchDownloaderCore/TwitchObjects/Gql/GqlCheerResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TwitchDownloaderCore.TwitchObjects
+namespace TwitchDownloaderCore.TwitchObjects.Gql
 {
     public class Tier
     {
diff --git a/TwitchDownloaderCore/TwitchObjects/GqlClipResponse.cs b/TwitchDownloaderCore/TwitchObjects/Gql/GqlClipResponse.cs
similarity index 94%
rename from TwitchDownloaderCore/TwitchObjects/GqlClipResponse.cs
rename to TwitchDownloaderCore/TwitchObjects/Gql/GqlClipResponse.cs
index 48f21266..fe5bd79b 100644
--- a/TwitchDownloaderCore/TwitchObjects/GqlClipResponse.cs
+++ b/TwitchDownloaderCore/TwitchObjects/Gql/GqlClipResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TwitchDownloaderCore.TwitchObjects
+namespace TwitchDownloaderCore.TwitchObjects.Gql
 {
     public class ClipBroadcaster
     {
diff --git a/TwitchDownloaderCore/TwitchObjects/GqlClipSearchResponse.cs b/TwitchDownloaderCore/TwitchObjects/Gql/GqlClipSearchResponse.cs
similarity index 95%
rename from TwitchDownloaderCore/TwitchObjects/GqlClipSearchResponse.cs
rename to TwitchDownloaderCore/TwitchObjects/Gql/GqlClipSearchResponse.cs
index 01a7b3fc..25b7ff6a 100644
--- a/TwitchDownloaderCore/TwitchObjects/GqlClipSearchResponse.cs
+++ b/TwitchDownloaderCore/TwitchObjects/Gql/GqlClipSearchResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TwitchDownloaderCore.TwitchObjects
+namespace TwitchDownloaderCore.TwitchObjects.Gql
 {
     public class ClipNode
     {
diff --git a/TwitchDownloaderCore/TwitchObjects/GqlCommentResponse.cs b/TwitchDownloaderCore/TwitchObjects/Gql/GqlCommentResponse.cs
similarity index 98%
rename from TwitchDownloaderCore/TwitchObjects/GqlCommentResponse.cs
rename to TwitchDownloaderCore/TwitchObjects/Gql/GqlCommentResponse.cs
index 7ced807b..165a4348 100644
--- a/TwitchDownloaderCore/TwitchObjects/GqlCommentResponse.cs
+++ b/TwitchDownloaderCore/TwitchObjects/Gql/GqlCommentResponse.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TwitchDownloaderCore.TwitchObjects
+namespace TwitchDownloaderCore.TwitchObjects.Gql
 {
     public class CommentChannel
     {
diff --git a/TwitchDownloaderCore/TwitchObjects/GqlVideoResponse.cs b/TwitchDownloaderCore/TwitchObjects/Gql/GqlVideoResponse.cs
similarity index 82%
rename from TwitchDownloaderCore/TwitchObjects/GqlVideoResponse.cs
rename to TwitchDownloaderCore/TwitchObjects/Gql/GqlVideoResponse.cs
index d4e08405..914d0800 100644
--- a/TwitchDownloaderCore/TwitchObjects/GqlVideoResponse.cs
+++ b/TwitchDownloaderCore/TwitchObjects/Gql/GqlVideoResponse.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
-namespace TwitchDownloaderCore.TwitchObjects
+namespace TwitchDownloaderCore.TwitchObjects.Gql
 {
     public class VideoOwner
     {
@@ -10,7 +9,7 @@ public class VideoOwner
         public string displayName { get; set; }
     }
 
-    public class Video
+    public class VideoInfo
     {
         public string title { get; set; }
         public List<string> thumbnailURLs { get; set; }
@@ -21,7 +20,7 @@ public class Video
 
     public class VideoData
     {
-        public Video video { get; set; }
+        public VideoInfo video { get; set; }
     }
 
     public class GqlVideoResponse
diff --git a/TwitchDownloaderCore/TwitchObjects/GqlVideoSearchResponse.cs b/TwitchDownloaderCore/TwitchObjects/Gql/GqlVideoSearchResponse.cs
similarity index 96%
rename from TwitchDownloaderCore/TwitchObjects/GqlVideoSearchResponse.cs
rename to TwitchDownloaderCore/TwitchObjects/Gql/GqlVideoSearchResponse.cs
index 25e4f712..857697fd 100644
--- a/TwitchDownloaderCore/TwitchObjects/GqlVideoSearchResponse.cs
+++ b/TwitchDownloaderCore/TwitchObjects/Gql/GqlVideoSearchResponse.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TwitchDownloaderCore.TwitchObjects
+namespace TwitchDownloaderCore.TwitchObjects.Gql
 {
     public class VideoNode
     {
diff --git a/TwitchDownloaderWPF/PageChatDownload.xaml.cs b/TwitchDownloaderWPF/PageChatDownload.xaml.cs
index 414f8b21..beeefe93 100644
--- a/TwitchDownloaderWPF/PageChatDownload.xaml.cs
+++ b/TwitchDownloaderWPF/PageChatDownload.xaml.cs
@@ -12,12 +12,12 @@
 using TwitchDownloader.Properties;
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Options;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 using WpfAnimatedGif;
 
 namespace TwitchDownloaderWPF
 {
-	public enum DownloadType { Clip, Video }
+    public enum DownloadType { Clip, Video }
 	/// <summary>
 	/// Interaction logic for PageChatDownload.xaml
 	/// </summary>
diff --git a/TwitchDownloaderWPF/PageClipDownload.xaml.cs b/TwitchDownloaderWPF/PageClipDownload.xaml.cs
index 5aa756d9..e5a87b26 100644
--- a/TwitchDownloaderWPF/PageClipDownload.xaml.cs
+++ b/TwitchDownloaderWPF/PageClipDownload.xaml.cs
@@ -12,7 +12,7 @@
 using TwitchDownloader.Properties;
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Options;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 using WpfAnimatedGif;
 
 namespace TwitchDownloaderWPF
diff --git a/TwitchDownloaderWPF/PageVodDownload.xaml.cs b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
index 59e605b2..f2550427 100644
--- a/TwitchDownloaderWPF/PageVodDownload.xaml.cs
+++ b/TwitchDownloaderWPF/PageVodDownload.xaml.cs
@@ -18,7 +18,7 @@
 using TwitchDownloader.Properties;
 using TwitchDownloaderCore;
 using TwitchDownloaderCore.Options;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 using WpfAnimatedGif;
 
 namespace TwitchDownloaderWPF
diff --git a/TwitchDownloaderWPF/WindowMassDownload.xaml.cs b/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
index b3232170..a66e3d25 100644
--- a/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
+++ b/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
@@ -10,7 +10,7 @@
 using System.Windows.Media.Imaging;
 using TwitchDownloader.TwitchTasks;
 using TwitchDownloaderCore;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 using TwitchDownloaderWPF;
 using static TwitchDownloaderWPF.App;
 
diff --git a/TwitchDownloaderWPF/WindowUrlList.xaml.cs b/TwitchDownloaderWPF/WindowUrlList.xaml.cs
index c75cd364..8d186301 100644
--- a/TwitchDownloaderWPF/WindowUrlList.xaml.cs
+++ b/TwitchDownloaderWPF/WindowUrlList.xaml.cs
@@ -6,7 +6,7 @@
 using System.Windows.Media.Imaging;
 using TwitchDownloader.TwitchTasks;
 using TwitchDownloaderCore;
-using TwitchDownloaderCore.TwitchObjects;
+using TwitchDownloaderCore.TwitchObjects.Gql;
 using TwitchDownloaderWPF;
 using static TwitchDownloaderWPF.App;