Merge e9b3114396 into 99a5e9cbc4

src/invidious/channels/about.cr

@@ -14,7 +14,8 @@ record AboutChannel,
   is_family_friendly : Bool,
   allowed_regions : Array(String),
   tabs : Array(String),
-  verified : Bool
+  verified : Bool,
+  is_age_gated : Bool
 
 def get_about_info(ucid, locale) : AboutChannel
   begin
@@ -43,6 +44,22 @@ def get_about_info(ucid, locale) : AboutChannel
     auto_generated = true
   end
 
+  tab_names = [] of String
+  total_views = 0_i64
+  joined = Time.unix(0)
+
+  if ageGate = initdata.dig?("contents", "twoColumnBrowseResultsRenderer", "tabs", 0, "tabRenderer", "content", "sectionListRenderer", "contents", 0, "channelAgeGateRenderer")
+    description_node = nil
+    author = ageGate["channelTitle"].as_s
+    ucid = initdata["responseContext"]["serviceTrackingParams"][0]["params"][0]["value"].as_s
+    author_url = "https://www.youtube.com/channel/" + ucid
+    author_thumbnail = ageGate["avatar"]["thumbnails"][0]["url"].as_s
+    banner = nil
+    is_family_friendly = false
+    is_age_gated = true
+    tab_names = ["videos", "shorts", "streams"]
+    auto_generated = false
+  else
     if auto_generated
       author = initdata["header"]["interactiveTabbedHeaderRenderer"]["title"]["simpleText"].as_s
       author_url = initdata["microformat"]["microformatDataRenderer"]["urlCanonical"].as_s
@@ -71,31 +88,7 @@ def get_about_info(ucid, locale) : AboutChannel
 
       description_node = initdata["metadata"]["channelMetadataRenderer"]?.try &.["description"]?
     end
-
     is_family_friendly = initdata["microformat"]["microformatDataRenderer"]["familySafe"].as_bool
-
-  allowed_regions = initdata
-    .dig?("microformat", "microformatDataRenderer", "availableCountries")
-    .try &.as_a.map(&.as_s) || [] of String
-
-  description = !description_node.nil? ? description_node.as_s : ""
-  description_html = HTML.escape(description)
-
-  if !description_node.nil?
-    if description_node.as_h?.nil?
-      description_node = text_to_parsed_content(description_node.as_s)
-    end
-    description_html = parse_content(description_node)
-    if description_html == "" && description != ""
-      description_html = HTML.escape(description)
-    end
-  end
-
-  total_views = 0_i64
-  joined = Time.unix(0)
-
-  tab_names = [] of String
-
     if tabs_json = initdata["contents"]["twoColumnBrowseResultsRenderer"]["tabs"]?
       # Get the name of the tabs available on this channel
       tab_names = tabs_json.as_a.compact_map do |entry|
@@ -135,6 +128,24 @@ def get_about_info(ucid, locale) : AboutChannel
         )
       end
     end
+  end
+
+  allowed_regions = initdata
+    .dig?("microformat", "microformatDataRenderer", "availableCountries")
+    .try &.as_a.map(&.as_s) || [] of String
+
+  description = !description_node.nil? ? description_node.as_s : ""
+  description_html = HTML.escape(description)
+
+  if !description_node.nil?
+    if description_node.as_h?.nil?
+      description_node = text_to_parsed_content(description_node.as_s)
+    end
+    description_html = parse_content(description_node)
+    if description_html == "" && description != ""
+      description_html = HTML.escape(description)
+    end
+  end
 
   sub_count = initdata
     .dig?("header", "c4TabbedHeaderRenderer", "subscriberCountText", "simpleText").try &.as_s?
@@ -156,6 +167,7 @@ def get_about_info(ucid, locale) : AboutChannel
     allowed_regions: allowed_regions,
     tabs: tab_names,
     verified: author_verified || false,
+    is_age_gated: is_age_gated || false,
   )
 end
 

src/invidious/playlists.cr

@@ -46,8 +46,14 @@ struct PlaylistVideo
     XML.build { |xml| to_xml(xml) }
   end
 
+  def to_json(locale : String?, json : JSON::Builder)
+    to_json(json)
+  end
+
   def to_json(json : JSON::Builder, index : Int32? = nil)
     json.object do
+      json.field "type", "video"
+
       json.field "title", self.title
       json.field "videoId", self.id
 
@@ -67,6 +73,7 @@ struct PlaylistVideo
       end
 
       json.field "lengthSeconds", self.length_seconds
+      json.field "liveNow", self.live_now
     end
   end
 

src/invidious/routes/api/v1/channels.cr

@@ -27,11 +27,22 @@ module Invidious::Routes::API::V1::Channels
     # Retrieve "sort by" setting from URL parameters
     sort_by = env.params.query["sort_by"]?.try &.downcase || "newest"
 
+    if channel.is_age_gated
+      begin
+        playlist = get_playlist(channel.ucid.sub("UC", "UULF"))
+        videos = get_playlist_videos(playlist, offset: 0)
+      rescue ex : InfoException
+        # playlist doesnt exist.
+        videos = [] of PlaylistVideo
+      end
+      next_continuation = nil
+    else
       begin
         videos, _ = Channel::Tabs.get_videos(channel, sort_by: sort_by)
       rescue ex
         return error_json(500, ex)
       end
+    end
 
     JSON.build do |json|
       # TODO: Refactor into `to_json` for InvidiousChannel
@@ -84,6 +95,7 @@ module Invidious::Routes::API::V1::Channels
         json.field "joined", channel.joined.to_unix
 
         json.field "autoGenerated", channel.auto_generated
+        json.field "ageGated", channel.is_age_gated
         json.field "isFamilyFriendly", channel.is_family_friendly
         json.field "description", html_to_content(channel.description_html)
         json.field "descriptionHtml", channel.description_html
@@ -141,6 +153,16 @@ module Invidious::Routes::API::V1::Channels
     sort_by = env.params.query["sort_by"]?.try &.downcase || "newest"
     continuation = env.params.query["continuation"]?
 
+    if channel.is_age_gated
+      begin
+        playlist = get_playlist(channel.ucid.sub("UC", "UULF"))
+        videos = get_playlist_videos(playlist, offset: 0)
+      rescue ex : InfoException
+        # playlist doesnt exist.
+        videos = [] of PlaylistVideo
+      end
+      next_continuation = nil
+    else
       begin
         videos, next_continuation = Channel::Tabs.get_60_videos(
           channel, continuation: continuation, sort_by: sort_by
@@ -148,6 +170,7 @@ module Invidious::Routes::API::V1::Channels
       rescue ex
         return error_json(500, ex)
       end
+    end
 
     return JSON.build do |json|
       json.object do
@@ -175,6 +198,16 @@ module Invidious::Routes::API::V1::Channels
     # Retrieve continuation from URL parameters
     continuation = env.params.query["continuation"]?
 
+    if channel.is_age_gated
+      begin
+        playlist = get_playlist(channel.ucid.sub("UC", "UUSH"))
+        videos = get_playlist_videos(playlist, offset: 0)
+      rescue ex : InfoException
+        # playlist doesnt exist.
+        videos = [] of PlaylistVideo
+      end
+      next_continuation = nil
+    else
       begin
         videos, next_continuation = Channel::Tabs.get_shorts(
           channel, continuation: continuation
@@ -182,6 +215,7 @@ module Invidious::Routes::API::V1::Channels
       rescue ex
         return error_json(500, ex)
       end
+    end
 
     return JSON.build do |json|
       json.object do
@@ -209,6 +243,16 @@ module Invidious::Routes::API::V1::Channels
     # Retrieve continuation from URL parameters
     continuation = env.params.query["continuation"]?
 
+    if channel.is_age_gated
+      begin
+        playlist = get_playlist(channel.ucid.sub("UC", "UULV"))
+        videos = get_playlist_videos(playlist, offset: 0)
+      rescue ex : InfoException
+        # playlist doesnt exist.
+        videos = [] of PlaylistVideo
+      end
+      next_continuation = nil
+    else
       begin
         videos, next_continuation = Channel::Tabs.get_60_livestreams(
           channel, continuation: continuation
@@ -216,6 +260,7 @@ module Invidious::Routes::API::V1::Channels
       rescue ex
         return error_json(500, ex)
       end
+    end
 
     return JSON.build do |json|
       json.object do

src/invidious/routes/channels.cr

@@ -36,13 +36,25 @@ module Invidious::Routes::Channels
       items = items.select(SearchPlaylist)
       items.each(&.author = "")
     else
-      sort_options = {"newest", "oldest", "popular"}
-
       # Fetch items and continuation token
+      if channel.is_age_gated
+        sort_by = ""
+        sort_options = [] of String
+        begin
+          playlist = get_playlist(channel.ucid.sub("UC", "UULF"))
+          items = get_playlist_videos(playlist, offset: 0)
+        rescue ex : InfoException
+          # playlist doesnt exist.
+          items = [] of PlaylistVideo
+        end
+        next_continuation = nil
+      else
+        sort_options = {"newest", "oldest", "popular"}
         items, next_continuation = Channel::Tabs.get_videos(
           channel, continuation: continuation, sort_by: (sort_by || "newest")
         )
       end
+    end
 
     selected_tab = Frontend::ChannelPage::TabsAvailable::Videos
     templated "channel"
@@ -58,6 +70,18 @@ module Invidious::Routes::Channels
       return env.redirect "/channel/#{channel.ucid}"
     end
 
+    if channel.is_age_gated
+      sort_by = ""
+      sort_options = [] of String
+      begin
+        playlist = get_playlist(channel.ucid.sub("UC", "UUSH"))
+        items = get_playlist_videos(playlist, offset: 0)
+      rescue ex : InfoException
+        # playlist doesnt exist.
+        items = [] of PlaylistVideo
+      end
+      next_continuation = nil
+    else
       # TODO: support sort option for shorts
       sort_by = ""
       sort_options = [] of String
@@ -66,6 +90,7 @@ module Invidious::Routes::Channels
       items, next_continuation = Channel::Tabs.get_shorts(
         channel, continuation: continuation
       )
+    end
 
     selected_tab = Frontend::ChannelPage::TabsAvailable::Shorts
     templated "channel"
@@ -81,6 +106,18 @@ module Invidious::Routes::Channels
       return env.redirect "/channel/#{channel.ucid}"
     end
 
+    if channel.is_age_gated
+      sort_by = ""
+      sort_options = [] of String
+      begin
+        playlist = get_playlist(channel.ucid.sub("UC", "UULV"))
+        items = get_playlist_videos(playlist, offset: 0)
+      rescue ex : InfoException
+        # playlist doesnt exist.
+        items = [] of PlaylistVideo
+      end
+      next_continuation = nil
+    else
       # TODO: support sort option for livestreams
       sort_by = ""
       sort_options = [] of String
@@ -89,6 +126,7 @@ module Invidious::Routes::Channels
       items, next_continuation = Channel::Tabs.get_60_livestreams(
         channel, continuation: continuation
       )
+    end
 
     selected_tab = Frontend::ChannelPage::TabsAvailable::Streams
     templated "channel"