iv-org-mirror/invidious-copy-2022-03-16
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/invidious-copy-2022-03-16.git synced 2024-08-15 00:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move continuation_token out of Category struct

Browse source
This commit is contained in:
syeopite 2021-05-08 04:54:12 -07:00
parent 0863d83574
commit bbfbe70930
No known key found for this signature in database
GPG key ID: 6FA616E5A5294A82
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/invidious/routes/channels.cr
View file

@ -114,7 +114,7 @@ module Invidious::Routes::Channels
# Previous continuation # Previous continuation
previous_continuation = env.params.query["previous"]? previous_continuation = env.params.query["previous"]?
featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil, continuation, current_category_title).not_nil! featured_channel_categories, continuation_token = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil, continuation, current_category_title).not_nil!
elsif view && shelf_id elsif view && shelf_id
offset = env.params.query["offset"]? offset = env.params.query["offset"]?
if offset if offset
@ -123,12 +123,12 @@ module Invidious::Routes::Channels
offset = 0 offset = 0
end end
featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], view, shelf_id, continuation, current_category_title).not_nil! featured_channel_categories, continuation_token = fetch_channel_featured_channels(ucid, channel.tabs["channels"], view, shelf_id, continuation, current_category_title).not_nil!
else else
previous_continuation = nil previous_continuation = nil
offset = 0 offset = 0
featured_channel_categories = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil, current_category_title).not_nil! featured_channel_categories, continuation_token = fetch_channel_featured_channels(ucid, channel.tabs["channels"], nil, nil, current_category_title).not_nil!
end end
templated "channel/featured_channels", buffer_footer: true templated "channel/featured_channels", buffer_footer: true

2
src/invidious/views/channel/featured_channels.ecr
View file

@ -106,7 +106,7 @@
</div> </div>
<div class="pure-u-1 pure-u-lg-3-5"></div> <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"> <div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
<% if (next_cont_token = featured_channel_categories[0].continuation_token) %> <% if (next_cont_token = continuation_token) %>
<% previous = ""%> <% previous = ""%>
<% if continuation %> <% if continuation %>
<% previous = "&previous=#{HTML.escape(continuation)}"%> <% previous = "&previous=#{HTML.escape(continuation)}"%>