diff --git a/src/invidious/channels/about.cr b/src/invidious/channels/about.cr index f49aa91d6..bf7ccaaed 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, @@ -168,7 +168,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| @@ -179,9 +179,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") } @@ -191,14 +191,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 a51cfebe3..a1400664b 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 291db366d..3f08b8b7b 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 %>