From 420c458b6adab8a6e35a7612c9eb6a0ba2382440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9ry=20Mathieu=20=28Mathius=29?=
 <ferymathieuy@gmail.com>
Date: Fri, 25 Feb 2022 21:07:12 +0100
Subject: [PATCH] Update links related to youtube.com

Following comment at :
- https://github.com/iv-org/invidious/pull/2936#discussion_r814435888
---
 src/invidious/comments.cr | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index e2c7b3a0..ae8f052a 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -573,10 +573,11 @@ def content_to_comment_html(content)
 
     if run["navigationEndpoint"]?
       if url = run["navigationEndpoint"]["urlEndpoint"]?.try &.["url"].as_s
+        base_url = URI.parse(url)
         url = URI.parse(url)
 
         if url.host == "youtu.be"
-          url = "/watch?v=#{url.request_target.lstrip('/')}"
+          url = "youtube.com/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
@@ -587,7 +588,12 @@ def content_to_comment_html(content)
           end
         end
 
-        text = %(<a href="#{url}">#{reduce_uri(url)}</a>)
+        if base_url.host.not_nil!.ends_with?("youtube.com") && base_url.path != "/redirect"
+          displayed_url = "youtube.com#{base_url.request_target}"
+        else
+          displayed_url = url
+        end
+        text = %(<a href="#{url}">#{reduce_uri(displayed_url)}</a>)
       elsif watch_endpoint = run["navigationEndpoint"]["watchEndpoint"]?
         length_seconds = watch_endpoint["startTimeSeconds"]?
         video_id = watch_endpoint["videoId"].as_s
@@ -595,7 +601,7 @@ def content_to_comment_html(content)
         if length_seconds && length_seconds.as_i > 0
           text = %(<a href="javascript:void(0)" data-onclick="jump_to_time" data-jump-time="#{length_seconds}">#{text}</a>)
         else
-          text = %(<a href="/watch?v=#{video_id}">#{reduce_uri("/watch?v=#{video_id}")}</a>)
+          text = %(<a href="/watch?v=#{video_id}">#{reduce_uri("youtube.com/watch?v=#{video_id}")}</a>)
         end
       elsif url = run.dig?("navigationEndpoint", "commandMetadata", "webCommandMetadata", "url").try &.as_s
         text = %(<a href="#{url}">#{reduce_uri(url)}</a>)