From 0863d83574e0701b3bcef3623cead0a08ec60877 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Sat, 8 May 2021 02:41:16 -0700
Subject: [PATCH] Make feat. chan page URL to compatible with yt

---
 src/invidious.cr                              |  1 -
 src/invidious/helpers/serialized_yt_data.cr   |  3 +++
 src/invidious/routes/channels.cr              | 17 ++++++++++------
 .../views/channel/featured_channels.ecr       | 20 ++++++++++---------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/invidious.cr b/src/invidious.cr
index c771d406..0316b10d 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -323,7 +323,6 @@ end
   Invidious::Routing.get "/channel/:ucid/playlists", Invidious::Routes::Channels, :playlists
   Invidious::Routing.get "/channel/:ucid/community", Invidious::Routes::Channels, :community
   Invidious::Routing.get "/channel/:ucid/channels", Invidious::Routes::Channels, :channels
-  Invidious::Routing.get "/channel/:ucid/channels/:param", Invidious::Routes::Channels, :featured_channel_category
   Invidious::Routing.get "/channel/:ucid/about", Invidious::Routes::Channels, :about
 
   ["", "/videos", "/playlists", "/community", "/about"].each do |path|
diff --git a/src/invidious/helpers/serialized_yt_data.cr b/src/invidious/helpers/serialized_yt_data.cr
index 61356555..20ef7267 100644
--- a/src/invidious/helpers/serialized_yt_data.cr
+++ b/src/invidious/helpers/serialized_yt_data.cr
@@ -235,6 +235,9 @@ class Category
   property description_html : String
   property badges : Array(Tuple(String, String))?
 
+  # Data unique to only specific types of categories.
+  property auxiliary_data : Hash(String, String)
+
   def to_json(locale, json : JSON::Builder)
     json.object do
       json.field "title", self.title
diff --git a/src/invidious/routes/channels.cr b/src/invidious/routes/channels.cr
index 1d2ab2c6..b64fb7a8 100644
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@@ -113,17 +113,22 @@ module Invidious::Routes::Channels
 
       # Previous continuation
       previous_continuation = env.params.query["previous"]?
-      # Category title is not returned when using a continuation token.
-      title = env.params.query["title"]?
 
-      featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, continuation, title).not_nil!
+      featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil, continuation, current_category_title).not_nil!
+    elsif view && shelf_id
+      offset = env.params.query["offset"]?
+      if offset
+        offset = offset.to_i
+      else
+        offset = 0
+      end
+
+      featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], view, shelf_id, continuation, current_category_title).not_nil!
     else
       previous_continuation = nil
-      category_param = nil
       offset = 0
-      title = nil
 
-      featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil).not_nil!
+      featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil, current_category_title).not_nil!
     end
 
     templated "channel/featured_channels", buffer_footer: true
diff --git a/src/invidious/views/channel/featured_channels.ecr b/src/invidious/views/channel/featured_channels.ecr
index e2e49d24..a936a01a 100644
--- a/src/invidious/views/channel/featured_channels.ecr
+++ b/src/invidious/views/channel/featured_channels.ecr
@@ -14,8 +14,9 @@
                 <details open="">
                     <summary style="display: revert;">
                         <h3 class="category-heading">
-                            <% if (category_request_param = category.browse_endpoint_data).is_a?(String) %>
-                                <a href="/channel/<%=channel.ucid%>/channels/<%=HTML.escape(category_request_param)%>">
+                            <% if category.auxiliary_data.has_key?("view") %>
+                                <% category_url_param = "?view=#{category.auxiliary_data["view"]}&shelf_id=#{category.auxiliary_data["shelf_id"]}" %>
+                                <a href="/channel/<%=channel.ucid%>/channels<%=HTML.escape(category_url_param)%>">
                                     <%= category.title %>
                                 </a>
                             <%else%>
@@ -90,14 +91,15 @@
 </div>
 
 <% if !featured_channel_categories.empty? %>
+    <% base_url = "/channel/#{channel.ucid}/channels?view=#{view}&shelf_id=#{shelf_id}" %>
     <div class="pure-g h-box">
         <div class="pure-u-1 pure-u-lg-1-5">
             <% if previous_continuation %>
-                <a href="/channel/<%=channel.ucid%>/channels/<%=category_param%>?continuation=<%=HTML.escape(previous_continuation)%>&offset=<%=offset.not_nil!-1%>&title=<%=HTML.escape(title.not_nil!)%>">
+                <a href="<%= base_url %>&continuation=<%=HTML.escape(previous_continuation)%>&offset=<%=offset.not_nil!-1%>&title=<%=HTML.escape(current_category_title.not_nil!)%>">
                     <%= translate(locale, "Previous page") %>
                 </a>
             <% elsif (offset - 1) == 0 %>
-                <a href="/channel/<%=channel.ucid%>/channels/<%=category_param%>">
+                <a href="<%= base_url %>">
                     <%= translate(locale, "Previous page") %>
                 </a>
             <% end %>
@@ -105,15 +107,15 @@
         <div class="pure-u-1 pure-u-lg-3-5"></div>
         <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
             <% if (next_cont_token = featured_channel_categories[0].continuation_token) %>
-                <% additional_url_param = ""%>
+                <% previous = ""%>
                 <% if continuation %>
-                    <% additional_url_param = "&previous=#{HTML.escape(continuation)}"%>
+                    <% previous = "&previous=#{HTML.escape(continuation)}"%>
                 <% end %> 
-                <% if !title %>
-                    <% title = featured_channel_categories[0].title %>
+                <% if !current_category_title %>
+                    <% current_category_title = featured_channel_categories[0].title %>
                 <% end %>
 
-                <a href="/channel/<%=channel.ucid%>/channels/<%=category_param%>?continuation=<%=HTML.escape(next_cont_token)%>&offset=<%=offset.not_nil!+1%>&title=<%=HTML.escape(title)%><%=additional_url_param%>">
+                <a href="<%= base_url %>&continuation=<%=HTML.escape(next_cont_token)%>&offset=<%=offset.not_nil!+1%>&title=<%=HTML.escape(current_category_title)%><%=previous%>">
                     <%= translate(locale, "Next page") %>
                 </a>
             <% end %>