From 79aaac1aa87ff8fa273b49dee300f3f67c1f0297 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 18 Jul 2023 08:06:50 -0700
Subject: [PATCH] Search: Parse channel handle and hide video count  when
 channel handle exists

---
 src/invidious/helpers/serialized_yt_data.cr | 2 ++
 src/invidious/views/components/item.ecr     | 2 +-
 src/invidious/yt_backend/extractors.cr      | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/invidious/helpers/serialized_yt_data.cr b/src/invidious/helpers/serialized_yt_data.cr
index 7c12ad0e36..57f4b14741 100644
--- a/src/invidious/helpers/serialized_yt_data.cr
+++ b/src/invidious/helpers/serialized_yt_data.cr
@@ -186,6 +186,7 @@ struct SearchChannel
   property author_thumbnail : String
   property subscriber_count : Int32
   property video_count : Int32
+  property channel_handle : String?
   property description_html : String
   property auto_generated : Bool
   property author_verified : Bool
@@ -214,6 +215,7 @@ struct SearchChannel
       json.field "autoGenerated", self.auto_generated
       json.field "subCount", self.subscriber_count
       json.field "videoCount", self.video_count
+      json.field "channelHandle", self.channel_handle
 
       json.field "description", html_to_content(self.description_html)
       json.field "descriptionHtml", self.description_html
diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
index 7ffd2d937a..1c6188732d 100644
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -27,7 +27,7 @@
             </div>
 
             <p><%= translate_count(locale, "generic_subscribers_count", item.subscriber_count, NumberFormatting::Separator) %></p>
-            <% if !item.auto_generated %><p><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p><% end %>
+            <% if !item.auto_generated && item.channel_handle.nil? %><p><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p><% end %>
             <h5><%= item.description_html %></h5>
         <% when SearchPlaylist, InvidiousPlaylist %>
             <%-
diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr
index e5029dc5c3..24f3204b3e 100644
--- a/src/invidious/yt_backend/extractors.cr
+++ b/src/invidious/yt_backend/extractors.cr
@@ -175,7 +175,10 @@ private module Parsers
       # TODO change default value to nil
 
       subscriber_count = item_contents.dig?("subscriberCountText", "simpleText")
-
+      channel_handle = nil
+      if subscriber_count.try &.as_s.starts_with?("@")
+        channel_handle = subscriber_count.try &.as_s
+      end
       # Since youtube added channel handles, `VideoCountText` holds the number of
       # subscribers and `subscriberCountText` holds the handle, except when the
       # channel doesn't have a handle (e.g: some topic music channels).
@@ -191,6 +194,7 @@ private module Parsers
       auto_generated = item_contents["videoCountText"]?.nil?
 
       video_count = HelperExtractors.get_video_count(item_contents)
+
       description_html = item_contents["descriptionSnippet"]?.try { |t| parse_content(t) } || ""
 
       SearchChannel.new({
@@ -199,6 +203,7 @@ private module Parsers
         author_thumbnail: author_thumbnail,
         subscriber_count: subscriber_count,
         video_count:      video_count,
+        channel_handle:   channel_handle,
         description_html: description_html,
         auto_generated:   auto_generated,
         author_verified:  author_verified,