mirrors/nadeko_invidious
1
0
Fork 0
mirror of https://git.nadeko.net/Fijxu/invidious.git synced 2025-12-20 18:08:54 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

HTML: Use the new pagination component for channel pages

Browse Source
This commit is contained in:
Samantaz Fox
2023-04-21 00:28:11 +02:00
parent efaf7cb09c
commit 7bd6d0ac49
5 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/invidious/routes/playlists.cr
View File

@@ -163,9 +163,9 @@ module Invidious::Routes::Playlists
end
begin
videos = get_playlist_videos(playlist, offset: (page - 1) * 100)
items = get_playlist_videos(playlist, offset: (page - 1) * 100)
rescue ex
videos = [] of PlaylistVideo
items = [] of PlaylistVideo
end
csrf_token = generate_response(sid, {":edit_playlist"}, HMAC_KEY)
@@ -174,7 +174,7 @@ module Invidious::Routes::Playlists
page_nav_html = Frontend::Pagination.nav_numeric(locale,
base_url: "/playlist?list=#{playlist.id}",
current_page: page,
show_next: (videos.size == 100)
show_next: (items.size == 100)
)
templated "edit_playlist"
@@ -254,9 +254,9 @@ module Invidious::Routes::Playlists
begin
query = Invidious::Search::Query.new(env.params.query, :playlist, region)
videos = query.process.select(SearchVideo).map(&.as(SearchVideo))
items = query.process.select(SearchVideo).map(&.as(SearchVideo))
rescue ex
videos = [] of SearchVideo
items = [] of SearchVideo
end
# Pagination
@@ -264,7 +264,7 @@ module Invidious::Routes::Playlists
page_nav_html = Frontend::Pagination.nav_numeric(locale,
base_url: "/add_playlist_items?list=#{playlist.id}&q=#{query_encoded}",
current_page: page,
show_next: (videos.size >= 20)
show_next: (items.size >= 20)
)
env.set "add_playlist_items", plid
@@ -433,7 +433,7 @@ module Invidious::Routes::Playlists
end
begin
videos = get_playlist_videos(playlist, offset: (page - 1) * 200)
items = get_playlist_videos(playlist, offset: (page - 1) * 200)
rescue ex
return error_template(500, "Error encountered while retrieving playlist videos.<br>#{ex.message}")
end

8
src/invidious/routes/search.cr
View File

@@ -52,7 +52,7 @@ module Invidious::Routes::Search
user = env.get? "user"
begin
videos = query.process
items = query.process
rescue ex : ChannelSearchException
return error_template(404, "Unable to find channel with id of '#{HTML.escape(ex.channel)}'. Are you sure that's an actual channel id? It should look like 'UC4QobU6STFB0P71PMvOGN5A'.")
rescue ex
@@ -65,7 +65,7 @@ module Invidious::Routes::Search
page_nav_html = Frontend::Pagination.nav_numeric(locale,
base_url: "/search?#{query.to_http_params}",
current_page: query.page,
show_next: (videos.size >= 20)
show_next: (items.size >= 20)
)
if query.type == Invidious::Search::Query::Type::Channel
@@ -95,7 +95,7 @@ module Invidious::Routes::Search
end
begin
videos = Invidious::Hashtag.fetch(hashtag, page)
items = Invidious::Hashtag.fetch(hashtag, page)
rescue ex
return error_template(500, ex)
end
@@ -105,7 +105,7 @@ module Invidious::Routes::Search
page_nav_html = Frontend::Pagination.nav_numeric(locale,
base_url: "/hashtag/#{hashtag_encoded}",
current_page: page,
show_next: (videos.size >= 60)
show_next: (items.size >= 60)
)
templated "hashtag"