Merge 0aaa3e6a08 into b673695aa2

Use Trending API for health checks

docker-compose.yml

@@ -32,7 +32,7 @@ services:
         # statistics_enabled: false
         hmac_key: "CHANGE_ME!!"
     healthcheck:
-      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/comments/jNQXAC9IVRw || exit 1
+      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/trending || exit 1
       interval: 30s
       timeout: 5s
       retries: 2

src/invidious/channels/about.cr

@@ -14,6 +14,7 @@ record AboutChannel,
   is_family_friendly : Bool,
   allowed_regions : Array(String),
   tabs : Array(String),
+  tags : Array(String),
   verified : Bool
 
 def get_about_info(ucid, locale) : AboutChannel
@@ -43,6 +44,8 @@ def get_about_info(ucid, locale) : AboutChannel
     auto_generated = true
   end
 
+  tags = [] of String
+
   if auto_generated
     author = initdata["header"]["interactiveTabbedHeaderRenderer"]["title"]["simpleText"].as_s
     author_url = initdata["microformat"]["microformatDataRenderer"]["urlCanonical"].as_s
@@ -52,7 +55,13 @@ def get_about_info(ucid, locale) : AboutChannel
     banners = initdata["header"]["interactiveTabbedHeaderRenderer"]?.try &.["banner"]?.try &.["thumbnails"]?
     banner = banners.try &.[-1]?.try &.["url"].as_s?
 
-    description_node = initdata["header"]["interactiveTabbedHeaderRenderer"]["description"]
+    description_base_node = initdata["header"]["interactiveTabbedHeaderRenderer"]["description"]
+    # some channels have the description in a simpleText
+    # ex: https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/
+    description_node = description_base_node.dig?("simpleText") || description_base_node
+
+    tags = initdata.dig?("header", "interactiveTabbedHeaderRenderer", "badges")
+      .try &.as_a.map(&.["metadataBadgeRenderer"]["label"].as_s) || [] of String
   else
     author = initdata["metadata"]["channelMetadataRenderer"]["title"].as_s
     author_url = initdata["metadata"]["channelMetadataRenderer"]["channelUrl"].as_s
@@ -70,6 +79,7 @@ def get_about_info(ucid, locale) : AboutChannel
     # end
 
     description_node = initdata["metadata"]["channelMetadataRenderer"]?.try &.["description"]?
+    tags = initdata.dig?("microformat", "microformatDataRenderer", "tags").try &.as_a.map(&.as_s) || [] of String
   end
 
   is_family_friendly = initdata["microformat"]["microformatDataRenderer"]["familySafe"].as_bool
@@ -131,7 +141,8 @@ def get_about_info(ucid, locale) : AboutChannel
       # ["description"]["simpleText"] and ["primaryLinks"][0]["title"]["simpleText"]
       auto_generated = (
         (channel_about_meta["primaryLinks"]?.try &.size) == 1 && \
-           extract_text(channel_about_meta.dig?("primaryLinks", 0, "title")) == "Auto-generated by YouTube"
+           extract_text(channel_about_meta.dig?("primaryLinks", 0, "title")) == "Auto-generated by YouTube" ||
+        channel_about_meta.dig?("links", 0, "channelExternalLinkViewModel", "title", "content").try &.as_s == "Auto-generated by YouTube"
       )
     end
   end
@@ -155,6 +166,7 @@ def get_about_info(ucid, locale) : AboutChannel
     is_family_friendly: is_family_friendly,
     allowed_regions: allowed_regions,
     tabs: tab_names,
+    tags: tags,
     verified: author_verified || false,
   )
 end

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

@@ -90,6 +90,7 @@ module Invidious::Routes::API::V1::Channels
 
         json.field "allowedRegions", channel.allowed_regions
         json.field "tabs", channel.tabs
+        json.field "tags", channel.tags
         json.field "authorVerified", channel.verified
 
         json.field "latestVideos" do