Mirrored_Repos/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-11-10 10:18:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

playlists: Fix description being simple text (issue #1767)

Browse Source
This commit is contained in:
Samantaz Fox 2021-03-11 00:44:35 +00:00
parent 57ea45ff51
commit b86476410f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/invidious/playlists.cr
View File

@ -101,6 +101,7 @@ struct Playlist
property author_thumbnail : String property author_thumbnail : String
property ucid : String property ucid : String
property description : String property description : String
property description_html : String
property video_count : Int32 property video_count : Int32
property views : Int64 property views : Int64
property updated : Time property updated : Time
@ -163,10 +164,6 @@ struct Playlist
def privacy def privacy
PlaylistPrivacy::Public PlaylistPrivacy::Public
end end
def description_html
HTML.escape(self.description).gsub("\n", "<br>")
end
end end
enum PlaylistPrivacy enum PlaylistPrivacy
@ -374,8 +371,15 @@ def fetch_playlist(plid, locale)
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"]?
description = desc_item.try &.["runs"]?.try &.as_a.map(&.["text"].as_s).join("") || desc_item.try &.["simpleText"]?.try &.as_s || ""
description_txt = desc_item.try &.["runs"]?.try &.as_a
.map(&.["text"].as_s).join("") || desc_item.try &.["simpleText"]?.try &.as_s || ""
description_html = desc_item.try &.["runs"]?.try &.as_a
.try { |run| content_to_comment_html(run).try &.to_s } || "<p></p>"
thumbnail = playlist_info["thumbnailRenderer"]?.try &.["playlistVideoThumbnailRenderer"]? thumbnail = playlist_info["thumbnailRenderer"]?.try &.["playlistVideoThumbnailRenderer"]?
.try &.["thumbnail"]["thumbnails"][0]["url"]?.try &.as_s .try &.["thumbnail"]["thumbnails"][0]["url"]?.try &.as_s
@ -415,7 +419,8 @@ def fetch_playlist(plid, locale)
author: author, author: author,
author_thumbnail: author_thumbnail, author_thumbnail: author_thumbnail,
ucid: ucid, ucid: ucid,
description: description, description: description_txt,
description_html: description_html,
video_count: video_count, video_count: video_count,
views: views, views: views,
updated: updated, updated: updated,