From 3540bfde478c268a3070a7c972c2a45ffdb4dad0 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 20 Feb 2026 01:25:37 -0300 Subject: [PATCH 1/5] Parse channel handle and display it on channel page It also fixes some inconsistencies with the CSS and HTML that was introduced in https://github.com/iv-org/invidious/pull/5617 but I didn't really noticed about because it looked fine in the Invidious frontend. I also added a comment about the `break` statement in the metadata_rows row iteration because I didn't get why that `break` was there. Closes https://github.com/iv-org/invidious/issues/5638 --- assets/css/default.css | 7 +++---- src/invidious/channels/about.cr | 18 +++++++++++++++--- src/invidious/routes/api/v1/channels.cr | 1 + .../views/components/channel_info.ecr | 13 ++++++++++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/assets/css/default.css b/assets/css/default.css index ff07bdb48..8bf58e497 100644 --- a/assets/css/default.css +++ b/assets/css/default.css @@ -75,12 +75,11 @@ body { height: auto; } -.channel-profile > .channel-name-pronouns { +.channel-profile > .channel-info { display: inline-block; } -.channel-profile > .channel-name-pronouns > .channel-pronouns { - font-style: italic; +.channel-profile > .channel-info > .channel-metadata > .channel-metadata-item { font-size: .8em; font-weight: lighter; } @@ -418,7 +417,7 @@ p.channel-name { margin: 0; overflow-wrap: anywhere;} p.video-data { margin: 0; font-weight: bold; font-size: 80%; } .channel-profile > .channel-name, -.channel-profile > .channel-name-pronouns > .channel-name +.channel-profile > .channel-info > .channel-metadata > .channel-metadata-item { overflow-wrap: anywhere; } diff --git a/src/invidious/channels/about.cr b/src/invidious/channels/about.cr index 537aa0340..4a46b2bad 100644 --- a/src/invidious/channels/about.cr +++ b/src/invidious/channels/about.cr @@ -2,6 +2,7 @@ record AboutChannel, ucid : String, author : String, + author_handle : String?, auto_generated : Bool, author_url : String, author_thumbnail : String, @@ -162,26 +163,37 @@ def get_about_info(ucid, locale) : AboutChannel sub_count = 0 pronouns = nil + author_handle = nil if (metadata_rows = initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows").try &.as_a) metadata_rows.each do |row| - subscribe_metadata_part = row.dig?("metadataParts").try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("subscribers") } + metadata_parts = row.dig?("metadataParts") + + subscribe_metadata_part = metadata_parts.try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("subscribers") } if !subscribe_metadata_part.nil? sub_count = short_text_to_number(subscribe_metadata_part.dig("text", "content").as_s.split(" ")[0]).to_i32 end - pronoun_metadata_part = row.dig?("metadataParts").try &.as_a.find { |i| i.dig?("tooltip").try &.as_s.includes?("Pronouns") } + author_handle_part = metadata_parts.try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("@") } + if !author_handle_part.nil? + author_handle = author_handle_part.dig("text", "content").as_s + end + + pronoun_metadata_part = metadata_parts.try &.as_a.find { |i| i.dig?("tooltip").try &.as_s.includes?("Pronouns") } if !pronoun_metadata_part.nil? pronouns = pronoun_metadata_part.dig("text", "content").as_s end - break if sub_count != 0 && !pronouns.nil? + # This is to prevent processing more metadata parts if we already have + # all the parts we care about, which are the ones bellow + break if sub_count != 0 && !pronouns.nil? && !author_handle.nil? end end AboutChannel.new( ucid: ucid, author: author, + author_handle: author_handle, auto_generated: auto_generated, author_url: author_url, author_thumbnail: author_thumbnail, diff --git a/src/invidious/routes/api/v1/channels.cr b/src/invidious/routes/api/v1/channels.cr index f8060342c..0a3ac44b6 100644 --- a/src/invidious/routes/api/v1/channels.cr +++ b/src/invidious/routes/api/v1/channels.cr @@ -48,6 +48,7 @@ module Invidious::Routes::API::V1::Channels # TODO: Refactor into `to_json` for InvidiousChannel json.object do json.field "author", channel.author + json.field "authorHandle", channel.author_handle json.field "authorId", channel.ucid json.field "authorUrl", channel.author_url diff --git a/src/invidious/views/components/channel_info.ecr b/src/invidious/views/components/channel_info.ecr index 97a2d7da2..b01f3c97c 100644 --- a/src/invidious/views/components/channel_info.ecr +++ b/src/invidious/views/components/channel_info.ecr @@ -12,10 +12,17 @@
-
+ <%= author %><% if !channel.verified.nil? && channel.verified %> <% end %> - <% if !channel.pronouns.nil? %>
<%= channel.pronouns %><% end %> -
+ +
+ <% if !channel.author_handle.nil? %> + <%= channel.author_handle %> + • + <% end %> + <% if !channel.pronouns.nil? %><%= channel.pronouns %><% end %> + +
From 55f5bde69e452337ed29544fb082817723e9ee23 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Fri, 20 Feb 2026 18:41:44 -0300 Subject: [PATCH 2/5] Update src/invidious/channels/about.cr Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> --- src/invidious/channels/about.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/invidious/channels/about.cr b/src/invidious/channels/about.cr index 4a46b2bad..388378077 100644 --- a/src/invidious/channels/about.cr +++ b/src/invidious/channels/about.cr @@ -185,7 +185,7 @@ def get_about_info(ucid, locale) : AboutChannel end # This is to prevent processing more metadata parts if we already have - # all the parts we care about, which are the ones bellow + # all the parts we care about, which are the ones below break if sub_count != 0 && !pronouns.nil? && !author_handle.nil? end end From 2c5076b97c58a5f3a59491d73bf21e086d6b162d Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 23 Feb 2026 18:32:20 -0300 Subject: [PATCH 3/5] rename author_handle to channel_handle --- src/invidious/channels/about.cr | 14 +++++++------- src/invidious/routes/api/v1/channels.cr | 2 +- src/invidious/views/components/channel_info.ecr | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/invidious/channels/about.cr b/src/invidious/channels/about.cr index 388378077..e9bd8597e 100644 --- a/src/invidious/channels/about.cr +++ b/src/invidious/channels/about.cr @@ -2,7 +2,7 @@ record AboutChannel, ucid : String, author : String, - author_handle : String?, + channel_handle : String?, auto_generated : Bool, author_url : String, author_thumbnail : String, @@ -163,7 +163,7 @@ def get_about_info(ucid, locale) : AboutChannel sub_count = 0 pronouns = nil - author_handle = nil + channel_handle = nil if (metadata_rows = initdata.dig?("header", "pageHeaderRenderer", "content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows").try &.as_a) metadata_rows.each do |row| @@ -174,9 +174,9 @@ def get_about_info(ucid, locale) : AboutChannel sub_count = short_text_to_number(subscribe_metadata_part.dig("text", "content").as_s.split(" ")[0]).to_i32 end - author_handle_part = metadata_parts.try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("@") } - if !author_handle_part.nil? - author_handle = author_handle_part.dig("text", "content").as_s + channel_handle_part = metadata_parts.try &.as_a.find { |i| i.dig?("text", "content").try &.as_s.includes?("@") } + if !channel_handle_part.nil? + channel_handle = channel_handle_part.dig("text", "content").as_s end pronoun_metadata_part = metadata_parts.try &.as_a.find { |i| i.dig?("tooltip").try &.as_s.includes?("Pronouns") } @@ -186,14 +186,14 @@ def get_about_info(ucid, locale) : AboutChannel # This is to prevent processing more metadata parts if we already have # all the parts we care about, which are the ones below - break if sub_count != 0 && !pronouns.nil? && !author_handle.nil? + break if sub_count != 0 && !pronouns.nil? && !channel_handle.nil? end end AboutChannel.new( ucid: ucid, author: author, - author_handle: author_handle, + channel_handle: channel_handle, auto_generated: auto_generated, author_url: author_url, author_thumbnail: author_thumbnail, diff --git a/src/invidious/routes/api/v1/channels.cr b/src/invidious/routes/api/v1/channels.cr index 0a3ac44b6..d32b0f214 100644 --- a/src/invidious/routes/api/v1/channels.cr +++ b/src/invidious/routes/api/v1/channels.cr @@ -48,7 +48,7 @@ module Invidious::Routes::API::V1::Channels # TODO: Refactor into `to_json` for InvidiousChannel json.object do json.field "author", channel.author - json.field "authorHandle", channel.author_handle + json.field "channelHandle", channel.channel_handle json.field "authorId", channel.ucid json.field "authorUrl", channel.author_url diff --git a/src/invidious/views/components/channel_info.ecr b/src/invidious/views/components/channel_info.ecr index b01f3c97c..b36fba0da 100644 --- a/src/invidious/views/components/channel_info.ecr +++ b/src/invidious/views/components/channel_info.ecr @@ -16,8 +16,8 @@ <%= author %><% if !channel.verified.nil? && channel.verified %> <% end %>
- <% if !channel.author_handle.nil? %> - <%= channel.author_handle %> + <% if !channel.channel_handle.nil? %> + <%= channel.channel_handle %> • <% end %> <% if !channel.pronouns.nil? %><%= channel.pronouns %><% end %> From 9c73bd3f0b4ce1abe3515d0e4a557ab5ee537e29 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 23 Feb 2026 18:40:23 -0300 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20trailing=20`=E2=80=A2`=20when=20there?= =?UTF-8?q?=20is=20no=20pronouns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/invidious/views/components/channel_info.ecr | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/invidious/views/components/channel_info.ecr b/src/invidious/views/components/channel_info.ecr index b36fba0da..c6841524e 100644 --- a/src/invidious/views/components/channel_info.ecr +++ b/src/invidious/views/components/channel_info.ecr @@ -18,9 +18,11 @@
<% if !channel.channel_handle.nil? %> <%= channel.channel_handle %> - • <% end %> - <% if !channel.pronouns.nil? %><%= channel.pronouns %><% end %> + <% if !channel.pronouns.nil? %> + • + <%= channel.pronouns %> + <% end %> From 17e98d398797aca9c1b18e4b6416852720be8fa9 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 23 Feb 2026 18:41:30 -0300 Subject: [PATCH 5/5] fix .channel-profile > .channel-name child --- assets/css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/default.css b/assets/css/default.css index 8bf58e497..1c5650599 100644 --- a/assets/css/default.css +++ b/assets/css/default.css @@ -416,7 +416,7 @@ input[type="search"]::-webkit-search-cancel-button { p.channel-name { margin: 0; overflow-wrap: anywhere;} p.video-data { margin: 0; font-weight: bold; font-size: 80%; } -.channel-profile > .channel-name, +.channel-profile > .channel-info > .channel-name, .channel-profile > .channel-info > .channel-metadata > .channel-metadata-item { overflow-wrap: anywhere; @@ -901,4 +901,4 @@ h1, h2, h3, h4, h5, p, .error-issue-template { padding: 20px; background: rgba(0, 0, 0, 0.12345); -} \ No newline at end of file +}