From f2fa3da9d2f8ffc1684997526ddd5b3357d88897 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Wed, 12 Jul 2023 11:06:34 -0700
Subject: [PATCH 1/2] Add support for releases and podcasts tabs

---
 locales/en-US.json                      |  2 +
 src/invidious/channels/playlists.cr     | 18 +++++++
 src/invidious/frontend/channel_page.cr  |  2 +
 src/invidious/routes/api/v1/channels.cr | 62 ++++++++++++++++++++++++-
 src/invidious/routes/channels.cr        | 44 +++++++++++++++++-
 src/invidious/routing.cr                |  5 ++
 src/invidious/views/channel.ecr         |  2 +
 src/invidious/yt_backend/extractors.cr  |  5 +-
 8 files changed, 134 insertions(+), 6 deletions(-)

diff --git a/locales/en-US.json b/locales/en-US.json
index e13ba968..29dd7a40 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -474,6 +474,8 @@
     "channel_tab_videos_label": "Videos",
     "channel_tab_shorts_label": "Shorts",
     "channel_tab_streams_label": "Livestreams",
+    "channel_tab_podcasts_label": "Podcasts",
+    "channel_tab_releases_label": "Releases",
     "channel_tab_playlists_label": "Playlists",
     "channel_tab_community_label": "Community",
     "channel_tab_channels_label": "Channels"
diff --git a/src/invidious/channels/playlists.cr b/src/invidious/channels/playlists.cr
index 8dc824b2..91029fe3 100644
--- a/src/invidious/channels/playlists.cr
+++ b/src/invidious/channels/playlists.cr
@@ -26,3 +26,21 @@ def fetch_channel_playlists(ucid, author, continuation, sort_by)
 
   return extract_items(initial_data, author, ucid)
 end
+
+def fetch_channel_podcasts(ucid, author, continuation)
+  if continuation
+    initial_data = YoutubeAPI.browse(continuation)
+  else
+    initial_data = YoutubeAPI.browse(ucid, params: "Eghwb2RjYXN0c_IGBQoDugEA")
+  end
+  return extract_items(initial_data, author, ucid)
+end
+
+def fetch_channel_releases(ucid, author, continuation)
+  if continuation
+    initial_data = YoutubeAPI.browse(continuation)
+  else
+    initial_data = YoutubeAPI.browse(ucid, params: "EghyZWxlYXNlc_IGBQoDsgEA")
+  end
+  return extract_items(initial_data, author, ucid)
+end
diff --git a/src/invidious/frontend/channel_page.cr b/src/invidious/frontend/channel_page.cr
index 53745dd5..fe7d6d6e 100644
--- a/src/invidious/frontend/channel_page.cr
+++ b/src/invidious/frontend/channel_page.cr
@@ -5,6 +5,8 @@ module Invidious::Frontend::ChannelPage
     Videos
     Shorts
     Streams
+    Podcasts
+    Releases
     Playlists
     Community
     Channels
diff --git a/src/invidious/routes/api/v1/channels.cr b/src/invidious/routes/api/v1/channels.cr
index bcb4db2c..adf05d30 100644
--- a/src/invidious/routes/api/v1/channels.cr
+++ b/src/invidious/routes/api/v1/channels.cr
@@ -245,7 +245,7 @@ module Invidious::Routes::API::V1::Channels
     channel = nil # Make the compiler happy
     get_channel()
 
-    items, continuation = fetch_channel_playlists(channel.ucid, channel.author, continuation, sort_by)
+    items, next_continuation = fetch_channel_playlists(channel.ucid, channel.author, continuation, sort_by)
 
     JSON.build do |json|
       json.object do
@@ -257,7 +257,65 @@ module Invidious::Routes::API::V1::Channels
           end
         end
 
-        json.field "continuation", continuation
+        json.field "continuation", next_continuation if next_continuation
+      end
+    end
+  end
+
+  def self.podcasts(env)
+    locale = env.get("preferences").as(Preferences).locale
+
+    env.response.content_type = "application/json"
+
+    ucid = env.params.url["ucid"]
+    continuation = env.params.query["continuation"]?
+
+    # Use the macro defined above
+    channel = nil # Make the compiler happy
+    get_channel()
+
+    items, next_continuation = fetch_channel_podcasts(channel.ucid, channel.author, continuation)
+
+    JSON.build do |json|
+      json.object do
+        json.field "playlists" do
+          json.array do
+            items.each do |item|
+              item.to_json(locale, json) if item.is_a?(SearchPlaylist)
+            end
+          end
+        end
+
+        json.field "continuation", next_continuation if next_continuation
+      end
+    end
+  end
+
+  def self.releases(env)
+    locale = env.get("preferences").as(Preferences).locale
+
+    env.response.content_type = "application/json"
+
+    ucid = env.params.url["ucid"]
+    continuation = env.params.query["continuation"]?
+
+    # Use the macro defined above
+    channel = nil # Make the compiler happy
+    get_channel()
+
+    items, next_continuation = fetch_channel_releases(channel.ucid, channel.author, continuation)
+
+    JSON.build do |json|
+      json.object do
+        json.field "playlists" do
+          json.array do
+            items.each do |item|
+              item.to_json(locale, json) if item.is_a?(SearchPlaylist)
+            end
+          end
+        end
+
+        json.field "continuation", next_continuation if next_continuation
       end
     end
   end
diff --git a/src/invidious/routes/channels.cr b/src/invidious/routes/channels.cr
index 16621994..9892ae2a 100644
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@@ -27,7 +27,7 @@ module Invidious::Routes::Channels
           item.author
         end
       end
-      items = items.select(SearchPlaylist).map(&.as(SearchPlaylist))
+      items = items.select(SearchPlaylist)
       items.each(&.author = "")
     else
       sort_options = {"newest", "oldest", "popular"}
@@ -105,13 +105,53 @@ module Invidious::Routes::Channels
       channel.ucid, channel.author, continuation, (sort_by || "last")
     )
 
-    items = items.select(SearchPlaylist).map(&.as(SearchPlaylist))
+    items = items.select(SearchPlaylist)
     items.each(&.author = "")
 
     selected_tab = Frontend::ChannelPage::TabsAvailable::Playlists
     templated "channel"
   end
 
+  def self.podcasts(env)
+    data = self.fetch_basic_information(env)
+    return data if !data.is_a?(Tuple)
+
+    locale, user, subscriptions, continuation, ucid, channel = data
+
+    sort_by = ""
+    sort_options = [] of String
+
+    items, next_continuation = fetch_channel_podcasts(
+      channel.ucid, channel.author, continuation
+    )
+
+    items = items.select(SearchPlaylist)
+    items.each(&.author = "")
+
+    selected_tab = Frontend::ChannelPage::TabsAvailable::Podcasts
+    templated "channel"
+  end
+
+  def self.releases(env)
+    data = self.fetch_basic_information(env)
+    return data if !data.is_a?(Tuple)
+
+    locale, user, subscriptions, continuation, ucid, channel = data
+
+    sort_by = ""
+    sort_options = [] of String
+
+    items, next_continuation = fetch_channel_releases(
+      channel.ucid, channel.author, continuation
+    )
+
+    items = items.select(SearchPlaylist)
+    items.each(&.author = "")
+
+    selected_tab = Frontend::ChannelPage::TabsAvailable::Releases
+    templated "channel"
+  end
+
   def self.community(env)
     data = self.fetch_basic_information(env)
     if !data.is_a?(Tuple)
diff --git a/src/invidious/routing.cr b/src/invidious/routing.cr
index daaf4d88..9c43171c 100644
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@@ -118,6 +118,8 @@ module Invidious::Routing
     get "/channel/:ucid/videos", Routes::Channels, :videos
     get "/channel/:ucid/shorts", Routes::Channels, :shorts
     get "/channel/:ucid/streams", Routes::Channels, :streams
+    get "/channel/:ucid/podcasts", Routes::Channels, :podcasts
+    get "/channel/:ucid/releases", Routes::Channels, :releases
     get "/channel/:ucid/playlists", Routes::Channels, :playlists
     get "/channel/:ucid/community", Routes::Channels, :community
     get "/channel/:ucid/channels", Routes::Channels, :channels
@@ -228,6 +230,9 @@ module Invidious::Routing
       get "/api/v1/channels/:ucid", {{namespace}}::Channels, :home
       get "/api/v1/channels/:ucid/shorts", {{namespace}}::Channels, :shorts
       get "/api/v1/channels/:ucid/streams", {{namespace}}::Channels, :streams
+      get "/api/v1/channels/:ucid/podcasts", {{namespace}}::Channels, :podcasts
+      get "/api/v1/channels/:ucid/releases", {{namespace}}::Channels, :releases
+
       get "/api/v1/channels/:ucid/channels", {{namespace}}::Channels, :channels
 
       {% for route in {"videos", "latest", "playlists", "community", "search"} %}
diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
index 6e62a471..066e25b5 100644
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -9,6 +9,8 @@
     when .streams?   then "/channel/#{ucid}/streams"
     when .playlists? then "/channel/#{ucid}/playlists"
     when .channels?  then "/channel/#{ucid}/channels"
+    when .podcasts? then "/channel/#{ucid}/podcasts"
+    when .releases? then "/channel/#{ucid}/releases"
     else
       "/channel/#{ucid}"
     end
diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr
index 6686e6e7..e5029dc5 100644
--- a/src/invidious/yt_backend/extractors.cr
+++ b/src/invidious/yt_backend/extractors.cr
@@ -408,8 +408,8 @@ private module Parsers
   # Returns nil when the given object isn't a RichItemRenderer
   #
   # A richItemRenderer seems to be a simple wrapper for a videoRenderer, used
-  # by the result page for hashtags. It is located inside a continuationItems
-  # container.
+  # by the result page for hashtags and for the podcast tab on channels.
+  # It is located inside a continuationItems container for hashtags.
   #
   module RichItemRendererParser
     def self.process(item : JSON::Any, author_fallback : AuthorFallback)
@@ -421,6 +421,7 @@ private module Parsers
     private def self.parse(item_contents, author_fallback)
       child = VideoRendererParser.process(item_contents, author_fallback)
       child ||= ReelItemRendererParser.process(item_contents, author_fallback)
+      child ||= PlaylistRendererParser.process(item_contents, author_fallback)
       return child
     end
 

From 05cc5033910cabe7008832e8917b93ee3112a540 Mon Sep 17 00:00:00 2001
From: Samantaz Fox <coding@samantaz.fr>
Date: Sat, 15 Jul 2023 12:57:26 +0000
Subject: [PATCH 2/2] Fix lint

---
 src/invidious/views/channel.ecr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
index 066e25b5..4b50e7a0 100644
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -9,8 +9,8 @@
     when .streams?   then "/channel/#{ucid}/streams"
     when .playlists? then "/channel/#{ucid}/playlists"
     when .channels?  then "/channel/#{ucid}/channels"
-    when .podcasts? then "/channel/#{ucid}/podcasts"
-    when .releases? then "/channel/#{ucid}/releases"
+    when .podcasts?  then "/channel/#{ucid}/podcasts"
+    when .releases?  then "/channel/#{ucid}/releases"
     else
       "/channel/#{ucid}"
     end