Merge pull request #2868 from SamantazFox/related-channels-items-fix

Related channel may contain a continuation entry

src/invidious/channels/about.cr

@@ -140,19 +140,32 @@ def fetch_related_channels(about_channel : AboutChannel) : Array(AboutRelatedCha
 
   return [] of AboutRelatedChannel if tab.nil?
 
-  items = tab.dig?("tabRenderer", "content", "sectionListRenderer", "contents", 0, "itemSectionRenderer", "contents", 0, "gridRenderer", "items").try(&.as_a?) || [] of JSON::Any
-
-  items.map do |item|
-    related_id = item.dig("gridChannelRenderer", "channelId").as_s
-    related_title = item.dig("gridChannelRenderer", "title", "simpleText").as_s
-    related_author_url = item.dig("gridChannelRenderer", "navigationEndpoint", "browseEndpoint", "canonicalBaseUrl").as_s
-    related_author_thumbnail = item.dig("gridChannelRenderer", "thumbnail", "thumbnails", -1, "url").as_s
-
-    AboutRelatedChannel.new(
+  items = tab.dig?(
+    "tabRenderer", "content",
+    "sectionListRenderer", "contents", 0,
+    "itemSectionRenderer", "contents", 0,
+    "gridRenderer", "items"
+  ).try &.as_a?
+
+  related = [] of AboutRelatedChannel
+  return related if (items.nil? || items.empty?)
+
+  items.each do |item|
+    renderer = item["gridChannelRenderer"]?
+    next if !renderer
+
+    related_id = renderer.dig("channelId").as_s
+    related_title = renderer.dig("title", "simpleText").as_s
+    related_author_url = renderer.dig("navigationEndpoint", "browseEndpoint", "canonicalBaseUrl").as_s
+    related_author_thumbnail = HelperExtractors.get_thumbnails(renderer)
+
+    related << AboutRelatedChannel.new(
       ucid: related_id,
       author: related_title,
       author_url: related_author_url,
       author_thumbnail: related_author_thumbnail,
     )
   end
+
+  return related
 end

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

@@ -96,7 +96,14 @@ module Invidious::Routes::API::V1::Channels
 
         json.field "relatedChannels" do
           json.array do
-            fetch_related_channels(channel).each do |related_channel|
+            # Fetch related channels
+            begin
+              related_channels = fetch_related_channels(channel)
+            rescue ex
+              related_channels = [] of AboutRelatedChannel
+            end
+
+            related_channels.each do |related_channel|
               json.object do
                 json.field "author", related_channel.author
                 json.field "authorId", related_channel.ucid
@@ -118,7 +125,8 @@ module Invidious::Routes::API::V1::Channels
               end
             end
           end
-        end
+        end # relatedChannels
+
       end
     end
   end