From d7696574f4a281d7450176097c87bca08705734a Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 1 Aug 2023 08:55:23 -0700
Subject: [PATCH 1/2] Playlist: Use subtitle when author is missing
---
src/invidious/playlists.cr | 5 +++++
src/invidious/views/playlist.ecr | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/invidious/playlists.cr b/src/invidious/playlists.cr
index 013be268..955e0855 100644
--- a/src/invidious/playlists.cr
+++ b/src/invidious/playlists.cr
@@ -89,6 +89,7 @@ struct Playlist
property views : Int64
property updated : Time
property thumbnail : String?
+ property subtitle : String?
def to_json(offset, json : JSON::Builder, video_id : String? = nil)
json.object do
@@ -100,6 +101,7 @@ struct Playlist
json.field "author", self.author
json.field "authorId", self.ucid
json.field "authorUrl", "/channel/#{self.ucid}"
+ json.field "subtitle", self.subtitle
json.field "authorThumbnails" do
json.array do
@@ -356,6 +358,8 @@ def fetch_playlist(plid : String)
updated = Time.utc
video_count = 0
+ subtitle = extract_text(initial_data.dig?("header", "playlistHeaderRenderer", "subtitle"))
+
playlist_info["stats"]?.try &.as_a.each do |stat|
text = stat["runs"]?.try &.as_a.map(&.["text"].as_s).join("") || stat["simpleText"]?.try &.as_s
next if !text
@@ -397,6 +401,7 @@ def fetch_playlist(plid : String)
views: views,
updated: updated,
thumbnail: thumbnail,
+ subtitle: subtitle,
})
end
diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr
index ee9ba87b..3bc7596e 100644
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -70,7 +70,11 @@
<% else %>
- <%= author %> |
+ <% if !author.empty? %>
+ <%= author %> |
+ <% elsif !playlist.subtitle.nil? %>
+ <%= playlist.subtitle.try &.split(" • ")[0] %> |
+ <% end %>
<%= translate_count(locale, "generic_videos_count", playlist.video_count) %> |
<%= translate(locale, "Updated `x` ago", recode_date(playlist.updated, locale)) %>
From afb04c3bdaa29f19db44f6560ce7954bc656d791 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Mon, 7 Aug 2023 11:58:20 -0700
Subject: [PATCH 2/2] HTMLl.Escape the playlist subtitle
---
src/invidious/views/playlist.ecr | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr
index 3bc7596e..24ba437d 100644
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -73,7 +73,8 @@
<% if !author.empty? %>
<%= author %> |
<% elsif !playlist.subtitle.nil? %>
- <%= playlist.subtitle.try &.split(" • ")[0] %> |
+ <% subtitle = playlist.subtitle || "" %>
+ <%= HTML.escape(subtitle[0..subtitle.rindex(" • ") || subtitle.size]) %> |
<% end %>
<%= translate_count(locale, "generic_videos_count", playlist.video_count) %> |
<%= translate(locale, "Updated `x` ago", recode_date(playlist.updated, locale)) %>