From f298e225a114578e0551e04d5e68f2bfcbe84e72 Mon Sep 17 00:00:00 2001
From: chunky programmer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Mon, 24 Apr 2023 19:29:34 -0400
Subject: [PATCH] fix live video attachments, parse playlists

---
 src/invidious/channels/community.cr         | 68 ++++++---------------
 src/invidious/helpers/serialized_yt_data.cr |  1 +
 src/invidious/yt_backend/extractors.cr      |  2 +-
 3 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/src/invidious/channels/community.cr b/src/invidious/channels/community.cr
index ad786f3a..87430305 100644
--- a/src/invidious/channels/community.cr
+++ b/src/invidious/channels/community.cr
@@ -123,49 +123,13 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
 
               if attachment = post["backstageAttachment"]?
                 json.field "attachment" do
-                  json.object do
-                    case attachment.as_h
-                    when .has_key?("videoRenderer")
-                      attachment = attachment["videoRenderer"]
-                      json.field "type", "video"
-
-                      if !attachment["videoId"]?
-                        error_message = (attachment["title"]["simpleText"]? ||
-                                         attachment["title"]["runs"]?.try &.[0]?.try &.["text"]?)
-
-                        json.field "error", error_message
-                      else
-                        video_id = attachment["videoId"].as_s
-
-                        video_title = attachment["title"]["simpleText"]? || attachment["title"]["runs"]?.try &.[0]?.try &.["text"]?
-                        json.field "title", video_title
-                        json.field "videoId", video_id
-                        json.field "videoThumbnails" do
-                          Invidious::JSONify::APIv1.thumbnails(json, video_id)
-                        end
-
-                        json.field "lengthSeconds", decode_length_seconds(attachment["lengthText"]["simpleText"].as_s)
-
-                        author_info = attachment["ownerText"]["runs"][0].as_h
-
-                        json.field "author", author_info["text"].as_s
-                        json.field "authorId", author_info["navigationEndpoint"]["browseEndpoint"]["browseId"]
-                        json.field "authorUrl", author_info["navigationEndpoint"]["commandMetadata"]["webCommandMetadata"]["url"]
-
-                        # TODO: json.field "authorThumbnails", "channelThumbnailSupportedRenderers"
-                        # TODO: json.field "authorVerified", "ownerBadges"
-
-                        published = decode_date(attachment["publishedTimeText"]["simpleText"].as_s)
-
-                        json.field "published", published.to_unix
-                        json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
-
-                        view_count = attachment["viewCountText"]?.try &.["simpleText"].as_s.gsub(/\D/, "").to_i64? || 0_i64
-
-                        json.field "viewCount", view_count
-                        json.field "viewCountText", translate_count(locale, "generic_views_count", view_count, NumberFormatting::Short)
-                      end
-                    when .has_key?("backstageImageRenderer")
+                  case attachment.as_h
+                  when .has_key?("videoRenderer")
+                    parse_item(attachment)
+                      .as(SearchVideo)
+                      .to_json(locale, json)
+                  when .has_key?("backstageImageRenderer")
+                    json.object do
                       attachment = attachment["backstageImageRenderer"]
                       json.field "type", "image"
 
@@ -186,7 +150,9 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
                           end
                         end
                       end
-                    when .has_key?("pollRenderer")
+                    end
+                  when .has_key?("pollRenderer")
+                    json.object do
                       attachment = attachment["pollRenderer"]
                       json.field "type", "poll"
                       json.field "totalVotes", short_text_to_number(attachment["totalVotes"]["simpleText"].as_s.split(" ")[0])
@@ -219,7 +185,9 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
                           end
                         end
                       end
-                    when .has_key?("postMultiImageRenderer")
+                    end
+                  when .has_key?("postMultiImageRenderer")
+                    json.object do
                       attachment = attachment["postMultiImageRenderer"]
                       json.field "type", "multiImage"
                       json.field "images" do
@@ -243,10 +211,14 @@ def fetch_channel_community(ucid, continuation, locale, format, thin_mode)
                           end
                         end
                       end
-                    else
-                      json.field "type", "unknown"
-                      json.field "error", "Unrecognized attachment type."
                     end
+                  when .has_key?("playlistRenderer")
+                    parse_item(attachment)
+                      .as(SearchPlaylist)
+                      .to_json(locale, json)
+                  else
+                    json.field "type", "unknown"
+                    json.field "error", "Unrecognized attachment type."
                   end
                 end
               end
diff --git a/src/invidious/helpers/serialized_yt_data.cr b/src/invidious/helpers/serialized_yt_data.cr
index c1874780..7c12ad0e 100644
--- a/src/invidious/helpers/serialized_yt_data.cr
+++ b/src/invidious/helpers/serialized_yt_data.cr
@@ -84,6 +84,7 @@ struct SearchVideo
       json.field "descriptionHtml", self.description_html
 
       json.field "viewCount", self.views
+      json.field "viewCountText", translate_count(locale, "generic_views_count", self.views, NumberFormatting::Short)
       json.field "published", self.published.to_unix
       json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale))
       json.field "lengthSeconds", self.length_seconds
diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr
index 9c041361..8ff4c1f9 100644
--- a/src/invidious/yt_backend/extractors.cr
+++ b/src/invidious/yt_backend/extractors.cr
@@ -268,7 +268,7 @@ private module Parsers
     end
 
     private def self.parse(item_contents, author_fallback)
-      title = item_contents["title"]["simpleText"]?.try &.as_s || ""
+      title = extract_text(item_contents["title"]) || ""
       plid = item_contents["playlistId"]?.try &.as_s || ""
 
       video_count = HelperExtractors.get_video_count(item_contents)