From d420741cc15dce656da641f5143120ec88e59bc8 Mon Sep 17 00:00:00 2001
From: chunky programmer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:59:06 -0400
Subject: [PATCH 1/2] Allow channel urls to be displayed in YT description

---
 src/invidious/videos/description.cr | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/invidious/videos/description.cr b/src/invidious/videos/description.cr
index 2017955dc..0a9d84f88 100644
--- a/src/invidious/videos/description.cr
+++ b/src/invidious/videos/description.cr
@@ -6,13 +6,19 @@ def parse_command(command : JSON::Any?, string : String) : String?
 
   # 3rd party URL, extract original URL from YouTube tracking URL
   if url_endpoint = on_tap.try &.["urlEndpoint"]?
-    youtube_url = URI.parse url_endpoint["url"].as_s
-
-    original_url = youtube_url.query_params["q"]?
-    if original_url.nil?
-      return ""
+    if url_endpoint["url"].as_s.includes? "youtube.com/redirect"
+      youtube_url = URI.parse url_endpoint["url"].as_s
+      original_url = youtube_url.query_params["q"]?
+      if original_url.nil?
+        return ""
+      else
+        return "<a href=\"#{original_url}\">#{original_url}</a>"
+      end
     else
-      return "<a href=\"#{original_url}\">#{original_url}</a>"
+      # not a redirect url, some first party url
+      # see https://github.com/iv-org/invidious/issues/3751
+      first_party_url = url_endpoint["url"].as_s
+      return "<a href=\"#{first_party_url.sub("https://www.youtube.com", "")}\">#{first_party_url}</a>"
     end
     # 1st party watch URL
   elsif watch_endpoint = on_tap.try &.["watchEndpoint"]?

From 1b10446e5ecfb50d84fae88b6b8953ed19bfe1fb Mon Sep 17 00:00:00 2001
From: chunky programmer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Mon, 24 Apr 2023 17:40:58 -0400
Subject: [PATCH 2/2] move url parsing to utils method

---
 src/invidious/comments.cr           | 51 +------------------------
 src/invidious/helpers/utils.cr      | 53 ++++++++++++++++++++++++++
 src/invidious/videos/description.cr | 59 +++--------------------------
 src/invidious/videos/parser.cr      |  2 +-
 4 files changed, 62 insertions(+), 103 deletions(-)

diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index fd2be73d4..0c8639773 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -635,55 +635,8 @@ def content_to_comment_html(content, video_id : String? = "")
 
     text = HTML.escape(run["text"].as_s)
 
-    if run["navigationEndpoint"]?
-      if url = run["navigationEndpoint"]["urlEndpoint"]?.try &.["url"].as_s
-        url = URI.parse(url)
-        displayed_url = text
-
-        if url.host == "youtu.be"
-          url = "/watch?v=#{url.request_target.lstrip('/')}"
-        elsif url.host.nil? || url.host.not_nil!.ends_with?("youtube.com")
-          if url.path == "/redirect"
-            # Sometimes, links can be corrupted (why?) so make sure to fallback
-            # nicely. See https://github.com/iv-org/invidious/issues/2682
-            url = url.query_params["q"]? || ""
-            displayed_url = url
-          else
-            url = url.request_target
-            displayed_url = "youtube.com#{url}"
-          end
-        end
-
-        text = %(<a href="#{url}">#{reduce_uri(displayed_url)}</a>)
-      elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]?
-        start_time = watch_endpoint["startTimeSeconds"]?.try &.as_i
-        link_video_id = watch_endpoint["videoId"].as_s
-
-        url = "/watch?v=#{link_video_id}"
-        url += "&t=#{start_time}" if !start_time.nil?
-
-        # If the current video ID (passed through from the caller function)
-        # is the same as the video ID in the link, add HTML attributes for
-        # the JS handler function that bypasses page reload.
-        #
-        # See: https://github.com/iv-org/invidious/issues/3063
-        if link_video_id == video_id
-          start_time ||= 0
-          text = %(<a href="#{url}" data-onclick="jump_to_time" data-jump-time="#{start_time}">#{reduce_uri(text)}</a>)
-        else
-          text = %(<a href="#{url}">#{text}</a>)
-        end
-      elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s
-        if text.starts_with?(/\s?[@#]/)
-          # Handle "pings" in comments and hasthags differently
-          # See:
-          #  - https://github.com/iv-org/invidious/issues/3038
-          #  - https://github.com/iv-org/invidious/issues/3062
-          text = %(<a href="#{url}">#{text}</a>)
-        else
-          text = %(<a href="#{url}">#{reduce_uri(url)}</a>)
-        end
-      end
+    if navigationEndpoint = run.dig?("navigationEndpoint")
+      text = parse_link_endpoint(navigationEndpoint, text, video_id)
     end
 
     text = "<b>#{text}</b>" if run["bold"]?
diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index 500a25822..bcf7c963a 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -389,3 +389,56 @@ def reduce_uri(uri : URI | String, max_length : Int32 = 50, suffix : String = "
   end
   return str
 end
+
+# Get the html link from a NavigationEndpoint or an innertubeCommand
+def parse_link_endpoint(endpoint : JSON::Any, text : String, video_id : String)
+  if url = endpoint.dig?("urlEndpoint", "url").try &.as_s
+    url = URI.parse(url)
+    displayed_url = text
+
+    if url.host == "youtu.be"
+      url = "/watch?v=#{url.request_target.lstrip('/')}"
+    elsif url.host.nil? || url.host.not_nil!.ends_with?("youtube.com")
+      if url.path == "/redirect"
+        # Sometimes, links can be corrupted (why?) so make sure to fallback
+        # nicely. See https://github.com/iv-org/invidious/issues/2682
+        url = url.query_params["q"]? || ""
+        displayed_url = url
+      else
+        url = url.request_target
+        displayed_url = "youtube.com#{url}"
+      end
+    end
+
+    text = %(<a href="#{url}">#{reduce_uri(displayed_url)}</a>)
+  elsif watch_endpoint = endpoint.dig?("watchEndpoint")
+    start_time = watch_endpoint["startTimeSeconds"]?.try &.as_i
+    link_video_id = watch_endpoint["videoId"].as_s
+
+    url = "/watch?v=#{link_video_id}"
+    url += "&t=#{start_time}" if !start_time.nil?
+
+    # If the current video ID (passed through from the caller function)
+    # is the same as the video ID in the link, add HTML attributes for
+    # the JS handler function that bypasses page reload.
+    #
+    # See: https://github.com/iv-org/invidious/issues/3063
+    if link_video_id == video_id
+      start_time ||= 0
+      text = %(<a href="#{url}" data-onclick="jump_to_time" data-jump-time="#{start_time}">#{reduce_uri(text)}</a>)
+    else
+      text = %(<a href="#{url}">#{text}</a>)
+    end
+  elsif url = endpoint.dig?("commandMetadata", "webCommandMetadata", "url").try &.as_s
+    if text.starts_with?(/\s?[@#]/)
+      # Handle "pings" in comments and hasthags differently
+      # See:
+      #  - https://github.com/iv-org/invidious/issues/3038
+      #  - https://github.com/iv-org/invidious/issues/3062
+      text = %(<a href="#{url}">#{text}</a>)
+    else
+      text = %(<a href="#{url}">#{reduce_uri(url)}</a>)
+    end
+  end
+  return text
+end
diff --git a/src/invidious/videos/description.cr b/src/invidious/videos/description.cr
index 0a9d84f88..542cb4168 100644
--- a/src/invidious/videos/description.cr
+++ b/src/invidious/videos/description.cr
@@ -1,57 +1,6 @@
 require "json"
 require "uri"
 
-def parse_command(command : JSON::Any?, string : String) : String?
-  on_tap = command.dig?("onTap", "innertubeCommand")
-
-  # 3rd party URL, extract original URL from YouTube tracking URL
-  if url_endpoint = on_tap.try &.["urlEndpoint"]?
-    if url_endpoint["url"].as_s.includes? "youtube.com/redirect"
-      youtube_url = URI.parse url_endpoint["url"].as_s
-      original_url = youtube_url.query_params["q"]?
-      if original_url.nil?
-        return ""
-      else
-        return "<a href=\"#{original_url}\">#{original_url}</a>"
-      end
-    else
-      # not a redirect url, some first party url
-      # see https://github.com/iv-org/invidious/issues/3751
-      first_party_url = url_endpoint["url"].as_s
-      return "<a href=\"#{first_party_url.sub("https://www.youtube.com", "")}\">#{first_party_url}</a>"
-    end
-    # 1st party watch URL
-  elsif watch_endpoint = on_tap.try &.["watchEndpoint"]?
-    video_id = watch_endpoint["videoId"].as_s
-    time = watch_endpoint["startTimeSeconds"].as_i
-
-    url = "/watch?v=#{video_id}&t=#{time}s"
-
-    # if string is a timestamp, use the string instead
-    # this is a lazy regex for validating timestamps
-    if /(?:\d{1,2}:){1,2}\d{2}/ =~ string
-      return "<a href=\"#{url}\">#{string}</a>"
-    else
-      return "<a href=\"#{url}\">#{url}</a>"
-    end
-    # hashtag/other browse URLs
-  elsif browse_endpoint = on_tap.try &.dig?("commandMetadata", "webCommandMetadata")
-    url = browse_endpoint["url"].try &.as_s
-
-    # remove unnecessary character in a channel name
-    if browse_endpoint["webPageType"]?.try &.as_s == "WEB_PAGE_TYPE_CHANNEL"
-      name = string.match(/@[\w\d.-]+/)
-      if name.try &.[0]?
-        return "<a href=\"#{url}\">#{name.try &.[0]}</a>"
-      end
-    end
-
-    return "<a href=\"#{url}\">#{string}</a>"
-  end
-
-  return "(unknown YouTube desc command)"
-end
-
 private def copy_string(str : String::Builder, iter : Iterator, count : Int) : Int
   copied = 0
   while copied < count
@@ -68,7 +17,7 @@ private def copy_string(str : String::Builder, iter : Iterator, count : Int) : I
   return copied
 end
 
-def parse_description(desc : JSON::Any?) : String?
+def parse_description(desc, video_id : String) : String?
   return "" if desc.nil?
 
   content = desc["content"].as_s
@@ -100,7 +49,11 @@ def parse_description(desc : JSON::Any?) : String?
         copy_string(str2, iter, cmd_length)
       end
 
-      str << parse_command(command, cmd_content)
+      link = cmd_content
+      if on_tap = command.dig?("onTap", "innertubeCommand")
+        link = parse_link_endpoint(on_tap, cmd_content, video_id)
+      end
+      str << link
       index += cmd_length
     end
 
diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr
index 1c6d118d9..2e8eecc34 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -287,7 +287,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
   # description_html = video_secondary_renderer.try &.dig?("description", "runs")
   #  .try &.as_a.try { |t| content_to_comment_html(t, video_id) }
 
-  description_html = parse_description(video_secondary_renderer.try &.dig?("attributedDescription"))
+  description_html = parse_description(video_secondary_renderer.try &.dig?("attributedDescription"), video_id)
 
   # Video metadata