Merge 6ffdb5d2c811a27bd6d09aeaabcff5a3a3382db5 into 35d1d499bc42a9b141b3dc92c4a5827b5f21a3ff

src/invidious/trending.cr

@@ -4,20 +4,21 @@ def fetch_trending(trending_type, region, locale)
 
   plid = nil
 
-  browse_id = "FEtrending"
+  browse_id = ""
 
   case trending_type.try &.downcase
-  when "music"
-    params = "4gINGgt5dG1hX2NoYXJ0cw%3D%3D"
   when "gaming"
-    params = "4gIcGhpnYW1pbmdfY29ycHVzX21vc3RfcG9wdWxhcg%3D%3D"
-  when "movies"
-    params = "4gIKGgh0cmFpbGVycw%3D%3D"
+    browse_id = "UCOpNcN46UbXVtpKMrmU4Abg"
+    params = "Egh0cmVuZGluZw%3D%3D"
   when "livestreams"
     browse_id = "UC4R8DWoMoI7CAwX8_LjQHig"
     params = "EgdsaXZldGFikgEDCKEK"
-  else # Default
-    params = ""
+  else
+    # Livestreams is the default one as Youtube removed
+    # the aggregated trending page
+    # https://github.com/iv-org/invidious/issues/5397#issuecomment-3218928458
+    browse_id = "UC4R8DWoMoI7CAwX8_LjQHig"
+    params = "EgdsaXZldGFikgEDCKEK"
   end
 
   client_config = YoutubeAPI::ClientConfig.new(region: region)

src/invidious/views/feeds/trending.ecr

@@ -21,7 +21,7 @@
     </div>
     <div class="pure-u-1-3">
         <div class="pure-g" style="text-align:right">
-            <% {"Default", "Music", "Gaming", "Movies", "Livestreams"}.each do |option| %>
+            <% {"Livestreams", "Gaming"}.each do |option| %>
                 <div class="pure-u-1 pure-md-1-3">
                     <% if trending_type == option %>
                         <b><%= translate(locale, option) %></b>

src/invidious/yt_backend/extractors.cr

@@ -442,6 +442,7 @@ private module Parsers
         if content_container = special_category_container["horizontalListRenderer"]?
         elsif content_container = special_category_container["expandedShelfContentsRenderer"]?
         elsif content_container = special_category_container["verticalListRenderer"]?
+        elsif content_container = special_category_container["gridRenderer"]?
         else
           # Anything else, such as `horizontalMovieListRenderer` is currently unsupported.
           return