Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-18 12:14:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix watch_videos endpoint

Browse Source 
Playlists created by `watch_videos` do not have an author which caused a crash
previously.
This commit is contained in:
saltycrys 2021-01-04 05:35:59 +01:00
parent 8b56a038b7
commit 36e9fb9d68
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/invidious.cr
View File

@ -2621,6 +2621,8 @@ end
begin begin
playlist = get_playlist(PG_DB, plid, locale) playlist = get_playlist(PG_DB, plid, locale)
rescue ex : InfoException
next error_json(404, ex)
rescue ex rescue ex
next error_json(404, "Playlist does not exist.") next error_json(404, "Playlist does not exist.")
end end

24
src/invidious/playlists.cr
View File

@ -365,9 +365,13 @@ def fetch_playlist(plid, locale)
end end
initial_data = extract_initial_data(response.body) initial_data = extract_initial_data(response.body)
playlist_info = initial_data["sidebar"]?.try &.["playlistSidebarRenderer"]?.try &.["items"]?.try &.[0]["playlistSidebarPrimaryInfoRenderer"]?
playlist_sidebar_renderer = initial_data["sidebar"]?.try &.["playlistSidebarRenderer"]?.try &.["items"]?
raise InfoException.new("Could not extract playlistSidebarRenderer.") if !playlist_sidebar_renderer
playlist_info = playlist_sidebar_renderer[0]["playlistSidebarPrimaryInfoRenderer"]?
raise InfoException.new("Could not extract playlist info") if !playlist_info raise InfoException.new("Could not extract playlist info") if !playlist_info
title = playlist_info["title"]?.try &.["runs"][0]?.try &.["text"]?.try &.as_s || "" title = playlist_info["title"]?.try &.["runs"][0]?.try &.["text"]?.try &.as_s || ""
desc_item = playlist_info["description"]? desc_item = playlist_info["description"]?
@ -392,14 +396,18 @@ def fetch_playlist(plid, locale)
end end
end end
author_info = initial_data["sidebar"]?.try &.["playlistSidebarRenderer"]?.try &.["items"]?.try &.[1]["playlistSidebarSecondaryInfoRenderer"]? if playlist_sidebar_renderer.size < 2
.try &.["videoOwner"]["videoOwnerRenderer"]? author = ""
author_thumbnail = ""
ucid = ""
else
author_info = playlist_sidebar_renderer[1]["playlistSidebarSecondaryInfoRenderer"]?.try &.["videoOwner"]["videoOwnerRenderer"]?
raise InfoException.new("Could not extract author info") if !author_info
raise InfoException.new("Could not extract author info") if !author_info author = author_info["title"]["runs"][0]["text"]?.try &.as_s || ""
author_thumbnail = author_info["thumbnail"]["thumbnails"][0]["url"]?.try &.as_s || ""
author_thumbnail = author_info["thumbnail"]["thumbnails"][0]["url"]?.try &.as_s || "" ucid = author_info["title"]["runs"][0]["navigationEndpoint"]["browseEndpoint"]["browseId"]?.try &.as_s || ""
author = author_info["title"]["runs"][0]["text"]?.try &.as_s || "" end
ucid = author_info["title"]["runs"][0]["navigationEndpoint"]["browseEndpoint"]["browseId"]?.try &.as_s || ""
return Playlist.new({ return Playlist.new({
title: title, title: title,