VeritableValor/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2026-08-16 21:10:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty author and authorId in playlists by falling back to avatar command

Browse Source
This commit is contained in:
sergiobuilds 2026-08-12 02:08:06 +09:00
parent 8fde720f94
commit ef2a535596
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/invidious/playlists.cr
View File

@ -445,7 +445,7 @@ def get_playlist_videos(playlist : InvidiousPlaylist | Playlist, offset : Int32,
# 100 videos per request # 100 videos per request
ctoken = produce_playlist_continuation(playlist.id, offset) ctoken = produce_playlist_continuation(playlist.id, offset)
initial_data = YoutubeAPI.browse(ctoken) initial_data = YoutubeAPI.browse(ctoken)
videos += extract_playlist_videos(playlist.id, initial_data) videos += extract_playlist_videos(playlist, initial_data)
offset += 100 offset += 100
end end
@ -458,7 +458,7 @@ end
# the same LockupViewModel used in Channel videos and Youtube playlists that # the same LockupViewModel used in Channel videos and Youtube playlists that
# appears on searches (Invidious /search endpoint). # appears on searches (Invidious /search endpoint).
# Related to https://github.com/iv-org/invidious/pull/5736 # Related to https://github.com/iv-org/invidious/pull/5736
def extract_playlist_videos(playlist_id : String, initial_data : Hash(String, JSON::Any)) def extract_playlist_videos(playlist : InvidiousPlaylist | Playlist, initial_data : Hash(String, JSON::Any))
videos = [] of PlaylistVideo | ProblematicTimelineItem videos = [] of PlaylistVideo | ProblematicTimelineItem
if initial_data["contents"]? if initial_data["contents"]?
@ -489,7 +489,7 @@ def extract_playlist_videos(playlist_id : String, initial_data : Hash(String, JS
watch_endpoint = i.dig?("rendererContext", "commandContext", "onTap", "innertubeCommand", "watchEndpoint") watch_endpoint = i.dig?("rendererContext", "commandContext", "onTap", "innertubeCommand", "watchEndpoint")
video_id = watch_endpoint.try &.["videoId"]?.try &.as_s video_id = watch_endpoint.try &.["videoId"]?.try &.as_s
plid = watch_endpoint.try &.["playlistId"]?.try &.as_s || playlist_id plid = watch_endpoint.try &.["playlistId"]?.try &.as_s || playlist.id
index = watch_endpoint.try &.["index"]?.try &.as_i64 index = watch_endpoint.try &.["index"]?.try &.as_i64
metadata = i["metadata"]? metadata = i["metadata"]?
@ -505,6 +505,8 @@ def extract_playlist_videos(playlist_id : String, initial_data : Hash(String, JS
parts && parts.any? { |item2| item2.dig?("text", "commandRuns").try &.as_a } parts && parts.any? { |item2| item2.dig?("text", "commandRuns").try &.as_a }
}.try &.["metadataParts"].as_a }.try &.["metadataParts"].as_a
author = nil
ucid = nil
if author_info = metadata_parts.try &.find(&.dig?("text", "commandRuns")) if author_info = metadata_parts.try &.find(&.dig?("text", "commandRuns"))
.try &.["text"] .try &.["text"]
author = author_info["content"].as_s author = author_info["content"].as_s
@ -512,6 +514,26 @@ def extract_playlist_videos(playlist_id : String, initial_data : Hash(String, JS
.try &.as_s .try &.as_s
end end
unless author && ucid
avatar_cmd = lockup_metadata_view_model.try &.dig?(
"image", "decoratedAvatarViewModel", "rendererContext", "commandContext", "onTap", "innertubeCommand"
)
if avatar_cmd
ucid ||= avatar_cmd.dig?("browseEndpoint", "browseId").try &.as_s
if ucid && playlist.responds_to?(:ucid) && ucid == playlist.ucid
author ||= playlist.author
end
if !author || author.empty?
handle = avatar_cmd.dig?("commandMetadata", "webCommandMetadata", "url").try &.as_s
if handle && handle.starts_with?("/@")
author = handle.lchop("/@")
end
end
end
end
length = thumbnail_view_model.try &.dig?("overlays", 0, "thumbnailBottomOverlayViewModel", "badges", 0, "thumbnailBadgeViewModel", "text").try &.as_s length = thumbnail_view_model.try &.dig?("overlays", 0, "thumbnailBottomOverlayViewModel", "badges", 0, "thumbnailBadgeViewModel", "text").try &.as_s
length_seconds = decode_length_seconds(length) if length length_seconds = decode_length_seconds(length) if length