diff --git a/assets/css/default.css b/assets/css/default.css index ff07bdb4..8bf58e49 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 537aa034..4a46b2ba 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 f8060342..0a3ac44b 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 97a2d7da..b01f3c97 100644 --- a/src/invidious/views/components/channel_info.ecr +++ b/src/invidious/views/components/channel_info.ecr @@ -12,10 +12,17 @@